CMakeified almost everything. Test code in python/ and apps other than uhd_modes.py still need minor updating.

include/CMakeLists.txt

@@ -0,0 +1,29 @@
+# Copyright 2011 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+
+########################################################################
+# Install public header files
+########################################################################
+install(FILES
+    air_modes_preamble.h
+    air_modes_slicer.h
+    air_modes_types.h
+    air_modes_api.h
+    DESTINATION include/gr-air-modes
+)

include/air_modes_api.h

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2011 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_AIR_MODES_API_H
+#define INCLUDED_AIR_MODES_API_H
+
+#include <gruel/attributes.h>
+
+#ifdef AIR_MODES_EXPORTS
+#  define AIR_MODES_API __GR_ATTR_EXPORT
+#else
+#  define AIR_MODES_API __GR_ATTR_IMPORT
+#endif
+
+#endif /* INCLUDED_AIR_MODES_API_H */

include/air_modes_int_and_dump.h

@@ -0,0 +1,54 @@
+/*
+# Copyright 2010 Nick Foster
+# 
+# This file is part of gr-air-modes
+# 
+# gr-air-modes is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+# 
+# gr-air-modes is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with gr-air-modes; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+# 
+*/
+
+#ifndef INCLUDED_AIR_MODES_int_and_dump_H
+#define INCLUDED_AIR_MODES_int_and_dump_H
+
+#include <gr_block.h>
+
+class air_modes_int_and_dump;
+typedef boost::shared_ptr<air_modes_int_and_dump> air_modes_int_and_dump_sptr;
+
+air_modes_int_and_dump_sptr air_make_modes_int_and_dump(int samples_per_chip);
+
+/*!
+ * \brief mode select int_and_dump filter
+ * \ingroup block
+ */
+class air_modes_int_and_dump : public gr_block
+{
+private:
+    friend air_modes_int_and_dump_sptr air_make_modes_int_and_dump(int samples_per_chip);
+    air_modes_int_and_dump(int samples_per_chip);
+
+	int d_samples_per_chip;
+    float d_acc;
+    float d_pos;
+
+public:
+    int general_work (int noutput_items,
+              gr_vector_int &ninput_items,
+              gr_vector_const_void_star &input_items,
+              gr_vector_void_star &output_items);
+};
+
+#endif /* INCLUDED_AIR_MODES_int_and_dump_H */

include/air_modes_preamble.h

@@ -0,0 +1,61 @@
+/*
+# Copyright 2010 Nick Foster
+# 
+# This file is part of gr-air-modes
+# 
+# gr-air-modes is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+# 
+# gr-air-modes is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with gr-air-modes; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+# 
+*/
+
+#ifndef INCLUDED_AIR_MODES_PREAMBLE_H
+#define INCLUDED_AIR_MODES_PREAMBLE_H
+
+#include <gr_block.h>
+
+class air_modes_preamble;
+typedef boost::shared_ptr<air_modes_preamble> air_modes_preamble_sptr;
+
+air_modes_preamble_sptr air_make_modes_preamble(int channel_rate, float threshold_db);
+
+/*!
+ * \brief mode select preamble detection
+ * \ingroup block
+ */
+class air_modes_preamble : public gr_block
+{
+private:
+    friend air_modes_preamble_sptr air_make_modes_preamble(int channel_rate, float threshold_db);
+    air_modes_preamble(int channel_rate, float threshold_db);
+
+	int d_check_width;
+	int d_chip_rate;
+	float d_preamble_length_us;
+	int d_samples_per_chip;
+	int d_samples_per_symbol;
+	float d_threshold_db;
+	float d_threshold;
+	pmt::pmt_t d_me, d_key;
+	gr_tag_t d_timestamp;
+	double d_secs_per_sample;
+
+public:
+    int general_work (int noutput_items,
+              gr_vector_int &ninput_items,
+              gr_vector_const_void_star &input_items,
+              gr_vector_void_star &output_items);
+};
+
+#endif /* INCLUDED_AIR_MODES_PREAMBLE_H */

include/air_modes_slicer.h

@@ -0,0 +1,57 @@
+/*
+# Copyright 2010 Nick Foster
+# 
+# This file is part of gr-air-modes
+# 
+# gr-air-modes is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+# 
+# gr-air-modes is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with gr-air-modes; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+# 
+*/
+
+#ifndef INCLUDED_AIR_MODES_slicer_H
+#define INCLUDED_AIR_MODES_slicer_H
+
+#include <gr_sync_block.h>
+#include <gr_msg_queue.h>
+
+class air_modes_slicer;
+typedef boost::shared_ptr<air_modes_slicer> air_modes_slicer_sptr;
+
+air_modes_slicer_sptr air_make_modes_slicer(int channel_rate, gr_msg_queue_sptr queue);
+
+/*!
+ * \brief mode select slicer detection
+ * \ingroup block
+ */
+class air_modes_slicer : public gr_sync_block
+{
+private:
+    friend air_modes_slicer_sptr air_make_modes_slicer(int channel_rate, gr_msg_queue_sptr queue);
+    air_modes_slicer(int channel_rate, gr_msg_queue_sptr queue);
+
+    int d_check_width;
+    int d_chip_rate;
+    int d_samples_per_chip;
+    int d_samples_per_symbol;
+    gr_msg_queue_sptr d_queue;
+    std::ostringstream d_payload;
+
+public:
+    int work (int noutput_items,
+              gr_vector_const_void_star &input_items,
+              gr_vector_void_star &output_items);
+};
+
+#endif /* INCLUDED_AIR_MODES_slicer_H */

include/air_modes_types.h

@@ -0,0 +1,47 @@
+/*
+# Copyright 2010 Nick Foster
+# 
+# This file is part of gr-air-modes
+# 
+# gr-air-modes is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+# 
+# gr-air-modes is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with gr-air-modes; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+# 
+*/
+
+#ifndef AIR_MODES_TYPES_H
+#define AIR_MODES_TYPES_H
+
+typedef enum { No_Packet = 0, Short_Packet = 1, Fruited_Packet = 2, Long_Packet = 3 } framer_packet_type;
+typedef enum { No_Error = 0, Solution_Found, Too_Many_LCBs, No_Solution, Multiple_Solutions } bruteResultTypeDef;
+
+struct modes_packet {
+	unsigned char data[14];
+//	unsigned char confidence[14]; //112 bits of boolean high/low confidence data for each bit
+	unsigned char lowconfbits[24]; //positions of low confidence bits within the packet
+
+	unsigned long parity;
+	unsigned int numlowconf;
+	framer_packet_type type; //what length packet are we
+	unsigned int message_type;
+	float reference_level;
+	double timestamp;
+};
+
+struct slice_result_t {
+	bool decision;
+	bool confidence;
+};
+
+#endif

include/modes_parity.h

@@ -0,0 +1,30 @@
+/*
+# Copyright 2010 Nick Foster
+# 
+# This file is part of gr-air-modes
+# 
+# gr-air-modes is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+# 
+# gr-air-modes is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with gr-air-modes; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+# 
+*/
+
+#ifndef INCLUDED_MODES_PARITY_H
+#define INCLUDED_MODES_PARITY_H
+extern const unsigned int modes_parity_table[112];
+int modes_check_parity(unsigned char data[], int length);
+bruteResultTypeDef modes_ec_brute(modes_packet &err_packet);
+unsigned next_set_of_n_elements(unsigned x);
+
+#endif