Temp commit. Not yet working.

GUI interface still not quite working. Two issues:
* PyQt4.QtSql's SQLite interface doesn't appear to return the same results as the SQLite browser. This is probably me depending on a bad data ordering assumption. * QSqlQueryModel isn't set up to have the db change from underneath it, AFAIK -- have to add the ability to notify it there's new data.
2013-07-21 17:57:37 -07:00 · 2013-07-21 17:41:26 -07:00 · 2013-07-21 17:41:26 -07:00
47 changed files with 1278 additions and 2099 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,27 +1,28 @@
-# Copyright 2011,2012,2014 Free Software Foundation, Inc.
-#
+# Copyright 2011,2013 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.

+
 ########################################################################
 # Project setup
 ########################################################################
 cmake_minimum_required(VERSION 2.6)
-project(gr-gr-air-modes CXX C)
+project(gr-gr-air-modes CXX)
 set(gr-gr-air-modes_VERSION_MAJOR 0)
 set(gr-gr-air-modes_VERSION_MINOR 0)
 enable_testing()
@@ -33,8 +34,7 @@ if(NOT CMAKE_BUILD_TYPE)
 endif(NOT CMAKE_BUILD_TYPE)
 set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "")

-#make sure our local CMake Modules path comes first
-list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/Modules)
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules)

 ########################################################################
 # Compiler specific setup
@@ -47,23 +47,7 @@ endif()
 ########################################################################
 # Find boost
 ########################################################################
-if(UNIX AND EXISTS "/usr/lib64")
-    list(APPEND BOOST_LIBRARYDIR "/usr/lib64") #fedora 64-bit fix
-endif(UNIX AND EXISTS "/usr/lib64")
-set(Boost_ADDITIONAL_VERSIONS
-    "1.35.0" "1.35" "1.36.0" "1.36" "1.37.0" "1.37" "1.38.0" "1.38" "1.39.0" "1.39"
-    "1.40.0" "1.40" "1.41.0" "1.41" "1.42.0" "1.42" "1.43.0" "1.43" "1.44.0" "1.44"
-    "1.45.0" "1.45" "1.46.0" "1.46" "1.47.0" "1.47" "1.48.0" "1.48" "1.49.0" "1.49"
-    "1.50.0" "1.50" "1.51.0" "1.51" "1.52.0" "1.52" "1.53.0" "1.53" "1.54.0" "1.54"
-    "1.55.0" "1.55" "1.56.0" "1.56" "1.57.0" "1.57" "1.58.0" "1.58" "1.59.0" "1.59"
-    "1.60.0" "1.60" "1.61.0" "1.61" "1.62.0" "1.62" "1.63.0" "1.63" "1.64.0" "1.64"
-    "1.65.0" "1.65" "1.66.0" "1.66" "1.67.0" "1.67" "1.68.0" "1.68" "1.69.0" "1.69"
-)
-find_package(Boost "1.35" COMPONENTS filesystem system)
-
-if(NOT Boost_FOUND)
-    message(FATAL_ERROR "Boost required to compile air-modes")
-endif()
+include(GrBoost)

 ########################################################################
 # Install directories
@@ -71,7 +55,7 @@ endif()
 include(GrPlatform) #define LIB_SUFFIX
 set(GR_RUNTIME_DIR      bin)
 set(GR_LIBRARY_DIR      lib${LIB_SUFFIX})
-set(GR_INCLUDE_DIR      include/gr_air_modes)
+set(GR_INCLUDE_DIR      include)
 set(GR_DATA_DIR         share)
 set(GR_PKG_DATA_DIR     ${GR_DATA_DIR}/${CMAKE_PROJECT_NAME})
 set(GR_DOC_DIR          ${GR_DATA_DIR}/doc)
@@ -82,68 +66,26 @@ set(GR_LIBEXEC_DIR      libexec)
 set(GR_PKG_LIBEXEC_DIR  ${GR_LIBEXEC_DIR}/${CMAKE_PROJECT_NAME})
 set(GRC_BLOCKS_DIR      ${GR_PKG_DATA_DIR}/grc/blocks)

-########################################################################
-# On Apple only, set install name and use rpath correctly, if not already set
-########################################################################
-if(APPLE)
-    if(NOT CMAKE_INSTALL_NAME_DIR)
-        set(CMAKE_INSTALL_NAME_DIR
-            ${CMAKE_INSTALL_PREFIX}/${GR_LIBRARY_DIR} CACHE
-            PATH "Library Install Name Destination Directory" FORCE)
-    endif(NOT CMAKE_INSTALL_NAME_DIR)
-    if(NOT CMAKE_INSTALL_RPATH)
-        set(CMAKE_INSTALL_RPATH
-            ${CMAKE_INSTALL_PREFIX}/${GR_LIBRARY_DIR} CACHE
-            PATH "Library Install RPath" FORCE)
-    endif(NOT CMAKE_INSTALL_RPATH)
-    if(NOT CMAKE_BUILD_WITH_INSTALL_RPATH)
-        set(CMAKE_BUILD_WITH_INSTALL_RPATH ON CACHE
-            BOOL "Do Build Using Library Install RPath" FORCE)
-    endif(NOT CMAKE_BUILD_WITH_INSTALL_RPATH)
-endif(APPLE)
-
 ########################################################################
 # Find gnuradio build dependencies
 ########################################################################
-find_package(CppUnit)
-find_package(Doxygen)
+find_package(GnuradioRuntime)

-# Search for GNU Radio and its components and versions. Add any
-# components required to the list of GR_REQUIRED_COMPONENTS (in all
-# caps such as FILTER or FFT) and change the version to the minimum
-# API compatible version required.
-set(GR_REQUIRED_COMPONENTS RUNTIME)
-find_package(Gnuradio "3.7.2" REQUIRED)
-
-if(NOT CPPUNIT_FOUND)
-    message(FATAL_ERROR "CppUnit required to compile airmodes")
+if(NOT GNURADIO_RUNTIME_FOUND)
+    message(FATAL_ERROR "GnuRadio Runtime required to compile gr-air-modes")
 endif()

-########################################################################
-# Setup doxygen option
-########################################################################
-if(DOXYGEN_FOUND)
-	option(ENABLE_DOXYGEN "Build docs using Doxygen" ON)
-else(DOXYGEN_FOUND)
-	option(ENABLE_DOXYGEN "Build docs using Doxygen" OFF)
-endif(DOXYGEN_FOUND)
-
 ########################################################################
 # Setup the include and linker paths
 ########################################################################
 include_directories(
-    ${CMAKE_SOURCE_DIR}/lib
    ${CMAKE_SOURCE_DIR}/include
-    ${CMAKE_BINARY_DIR}/lib
-    ${CMAKE_BINARY_DIR}/include
    ${Boost_INCLUDE_DIRS}
-    ${CPPUNIT_INCLUDE_DIRS}
-    ${GNURADIO_ALL_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
 )

 link_directories(
    ${Boost_LIBRARY_DIRS}
-    ${CPPUNIT_LIBRARY_DIRS}
    ${GNURADIO_RUNTIME_LIBRARY_DIRS}
 )

@@ -166,7 +108,7 @@ add_custom_target(uninstall
 ########################################################################
 # Add subdirectories
 ########################################################################
-add_subdirectory(include/gr_air_modes)
+add_subdirectory(include)
 add_subdirectory(lib)
 add_subdirectory(swig)
 add_subdirectory(python)
@@ -174,14 +116,3 @@ add_subdirectory(grc)
 add_subdirectory(apps)
 add_subdirectory(docs)
 add_subdirectory(res)
-
-########################################################################
-# Install cmake search helper for this library
-########################################################################
-if(NOT CMAKE_MODULES_DIR)
-  set(CMAKE_MODULES_DIR lib${LIB_SUFFIX}/cmake)
-endif(NOT CMAKE_MODULES_DIR)
-
-install(FILES cmake/Modules/gr_air_modesConfig.cmake
-    DESTINATION ${CMAKE_MODULES_DIR}/gr_air_modes
-)
--- a/apps/modes_gui
+++ b/apps/modes_gui
@@ -19,7 +19,7 @@
 # Boston, MA 02110-1301, USA.
 # 

-import os, sys, time, threading, datetime, math, csv, tempfile, ConfigParser
+import os, sys, time, threading, datetime, math, csv, tempfile
 from optparse import OptionParser
 from PyQt4 import QtCore,QtGui,QtWebKit
 from PyQt4.Qwt5 import Qwt
@@ -48,45 +48,27 @@ class mainwindow(QtGui.QMainWindow):
        #populate antenna, rate combo boxes based on source
        self.populate_source_options()

-        defaults = self.get_defaults()
-
        #should round to actual achieved gain
-        self.ui.line_gain.insert(defaults["gain"])
+        self.ui.line_gain.insert("30")

        #default to 5dB
-        self.ui.line_threshold.insert(defaults["threshold"])
+        self.ui.line_threshold.insert("5")

-        if defaults["pmf"] is not None:
-            self.ui.check_pmf.setChecked(bool(defaults["pmf"]))
-        if defaults["dcblock"] is not None:
-            self.ui.check_dcblock.setChecked(bool(defaults["dcblock"]))
-        if defaults["samplerate"] is not None:
-            if defaults["samplerate"] in self.rates:
-                self.ui.combo_rate.setCurrentIndex(self.rates.index(int(defaults["samplerate"])))
+        self.ui.prog_rssi.setMinimum(0)
+        self.ui.prog_rssi.setMaximum(40)

-        self.ui.prog_rssi.setMinimum(-60)
-        self.ui.prog_rssi.setMaximum(0)
-
-        if defaults["antenna"] is None:
-            self.ui.combo_ant.setCurrentIndex(self.ui.combo_ant.findText("RX2"))
-        else:
-            self.ui.combo_ant.setCurrentIndex(self.ui.combo_ant.findText(defaults["antenna"]))
+        self.ui.combo_ant.setCurrentIndex(self.ui.combo_ant.findText("RX2"))

        #check KML by default, leave the rest unchecked.
-        self.ui.check_sbs1.setChecked(bool(defaults["sbs1"] == "1"))
-        self.ui.check_raw.setChecked(bool(defaults["raw"] == "1"))
-        self.ui.check_fgfs.setChecked(bool(defaults["fgfs"] == "1"))
-        self.ui.check_kml.setChecked(bool(defaults["kml"] == "1"))
+        self.ui.check_sbs1.setCheckState(QtCore.Qt.Unchecked)
+        self.ui.check_raw.setCheckState(QtCore.Qt.Unchecked)
+        self.ui.check_fgfs.setCheckState(QtCore.Qt.Unchecked)
+        self.ui.check_kml.setCheckState(QtCore.Qt.Checked)

-        self.ui.line_sbs1port.insert(defaults["sbs1port"])#"30003")
-        self.ui.line_rawport.insert(defaults["rawport"])#"9988")
-        self.ui.line_fgfsport.insert(defaults["fgfsport"])#"5500")
-        self.ui.line_kmlfilename.insert(defaults["kmlfile"])#"modes.kml")
-
-        if defaults["latitude"] is not None:
-            self.ui.line_my_lat.insert(defaults["latitude"])
-        if defaults["longitude"] is not None:
-            self.ui.line_my_lon.insert(defaults["longitude"])
+        self.ui.line_sbs1port.insert("30003")
+        self.ui.line_rawport.insert("9988")
+        self.ui.line_fgfsport.insert("5500")
+        self.ui.line_kmlfilename.insert("modes.kml")

        #disable by default
        self.ui.check_adsbonly.setCheckState(QtCore.Qt.Unchecked)
@@ -95,12 +77,12 @@ class mainwindow(QtGui.QMainWindow):
        self.queue = gr.msg_queue(10)
        self.running = False
        self.kmlgen = None #necessary bc we stop its thread in shutdown
-        self.dbname = "air_modes.db"
+        self.dbname = "adsb.db"
        self.num_reports = 0
        self.last_report = 0
        self.context = zmq.Context(1)

-        self.datamodel = dashboard_data_model(None)
+        self.datamodel = dashboard_sql_model(None)
        self.ui.list_aircraft.setModel(self.datamodel)
        self.ui.list_aircraft.setModelColumn(0)

@@ -114,15 +96,16 @@ class mainwindow(QtGui.QMainWindow):
        self.dashboard_mapper.setModel(self.datamodel)
        self.dashboard_mapper.addMapping(self.ui.line_icao, 0)
        #self.dashboard_mapper.addMapping(self.ui.prog_rssi, 2)
-        self.dashboard_mapper.addMapping(self.ui.line_latitude, 3)
-        self.dashboard_mapper.addMapping(self.ui.line_longitude, 4)
-        self.dashboard_mapper.addMapping(self.ui.line_alt, 5)
-        self.dashboard_mapper.addMapping(self.ui.line_speed, 6)
-        #self.dashboard_mapper.addMapping(self.ui.compass_heading, 7)
-        self.dashboard_mapper.addMapping(self.ui.line_climb, 8)
-        self.dashboard_mapper.addMapping(self.ui.line_ident, 9)
-        self.dashboard_mapper.addMapping(self.ui.line_type, 10)
-        self.dashboard_mapper.addMapping(self.ui.line_range, 11)
+        self.dashboard_mapper.addMapping(self.ui.line_latitude, 2)
+        self.dashboard_mapper.addMapping(self.ui.line_longitude, 3)
+        self.dashboard_mapper.addMapping(self.ui.line_alt, 4)
+        self.dashboard_mapper.addMapping(self.ui.line_speed, 5)
+        #self.dashboard_mapper.addMapping(self.ui.compass_heading, 6)
+        self.dashboard_mapper.addMapping(self.ui.line_climb, 7)
+        self.dashboard_mapper.addMapping(self.ui.line_ident, 8)
+        self.dashboard_mapper.addMapping(self.ui.line_type, 9)
+        #self.dashboard_mapper.addMapping(self.ui.line_range, 11)
+        #self.dashboard_mapper.addMapping(self.ui.compass_bearing, 12)

        compass_palette = QtGui.QPalette()
        compass_palette.setColor(QtGui.QPalette.Foreground, QtCore.Qt.white)
@@ -132,7 +115,8 @@ class mainwindow(QtGui.QMainWindow):
        self.ui.compass_heading.setNeedle(Qwt.QwtDialSimpleNeedle(Qwt.QwtDialSimpleNeedle.Ray, False, QtCore.Qt.black))
        self.ui.compass_bearing.setNeedle(Qwt.QwtDialSimpleNeedle(Qwt.QwtDialSimpleNeedle.Ray, False, QtCore.Qt.black))

-        #hook up the update signal
+        #hook up the update signals which are explicitly necessary
+        #most of the dashboard_mapper and list_aircraft stuff is implicitly done already
        self.ui.list_aircraft.selectionModel().currentRowChanged.connect(self.dashboard_mapper.setCurrentModelIndex)
        self.ui.list_aircraft.selectionModel().currentRowChanged.connect(self.update_heading_widget)
        self.ui.list_aircraft.selectionModel().currentRowChanged.connect(self.update_bearing_widget)
@@ -140,51 +124,33 @@ class mainwindow(QtGui.QMainWindow):
        self.ui.list_aircraft.selectionModel().currentRowChanged.connect(self.update_map_highlight)
        self.datamodel.dataChanged.connect(self.unmapped_widgets_dataChanged)

-        #hook up parameter-changed signals so we can change gain, rate, etc. while running
-        self.ui.combo_rate.currentIndexChanged['QString'].connect(self.update_sample_rate)
-        self.ui.line_gain.editingFinished.connect(self.update_gain)
-        self.ui.combo_source.currentIndexChanged['QString'].connect(self.populate_source_options)
-
        #hook up live data text box update signal
        self.live_data_changed_signal.connect(self.on_append_live_data)

-        self._last_live_data_update = time.time()
-        self._pending_msgstr = ""
-
-        self.prefs = None
-
-    def update_sample_rate(self, rate):
-        if self.running:
-            self._radio.set_rate(int(float(rate)*1e6))
-
-    def update_gain(self):
-        if self.running:
-            self._radio.set_gain(float(self.ui.line_gain.text()))
-
 ############ widget update functions for non-mapped widgets ############
    def update_heading_widget(self, index):
        if index.model() is not None:
-            heading = index.model().data(index.model().index(index.row(), self.datamodel._colnames.index("heading"))).toDouble()[0]
+            heading = index.model().data(index.model().index(index.row(), 6)).toDouble()[0]
            self.ui.compass_heading.setValue(heading)

    def update_bearing_widget(self, index):
        if index.model() is not None:
-            bearing = index.model().data(index.model().index(index.row(), self.datamodel._colnames.index("bearing"))).toDouble()[0]
+            bearing = 0#index.model().data(index.model().index(index.row(), 12)).toDouble()[0]
            self.ui.compass_bearing.setValue(bearing)

    def unmapped_widgets_dataChanged(self, startIndex, endIndex):
        index = self.ui.list_aircraft.selectionModel().currentIndex()
        if index.row() in range(startIndex.row(), endIndex.row()+1): #the current aircraft was affected
-            if self.datamodel._colnames.index("heading") in range(startIndex.column(), endIndex.column()+1):
+            if 6 in range(startIndex.column(), endIndex.column()+1):
                self.update_heading_widget(index)
-            if self.datamodel._colnames.index("bearing") in range(startIndex.column(), endIndex.column()+1):
+            if 12 in range(startIndex.column(), endIndex.column()+1):
                self.update_bearing_widget(index)
-            if self.datamodel._colnames.index("rssi") in range(startIndex.column(), endIndex.column()+1):
+            if 2 in range(startIndex.column(), endIndex.column()+1):
                self.update_rssi_widget(index)

    def update_rssi_widget(self, index):
        if index.model() is not None:
-            rssi = index.model().data(index.model().index(index.row(), 2)).toDouble()[0]
+            rssi = 0#index.model().data(index.model().index(index.row(), 2)).toDouble()[0]
            self.ui.prog_rssi.setValue(rssi)

    def increment_reportspersec(self, msg):
@@ -232,10 +198,8 @@ class mainwindow(QtGui.QMainWindow):
        elif sourceid == "Osmocom":
            try:
                import osmosdr
-                self.src = osmosdr.source("")
-                self.rates = [rate.start() for rate in self.src.get_sample_rates()
-                             if ((rate.start() % 2.e6) == 0)
-                             or (rate.start() < 4.e6 and ((rate.start()%0.2e6) == 0))]
+                self.src = osmosdr.source_c("")
+                self.rates = [rate.start() for rate in self.src.get_sample_rates() if (rate.start() % 2.e6) == 0]
                self.antennas = ["RX"]
                self.src = None
                self.ui.combo_ant.setEnabled(False)
@@ -264,17 +228,11 @@ class mainwindow(QtGui.QMainWindow):
        self.ui.combo_ant.addItems(self.antennas)

        #set up recommended sample rate
-        if len(self.rates) > 1:
-            if max(self.rates) > 4.e6:
-                recommended_rate = min(x for x in self.rates if x >= 4e6 and
-                                      max(self.rates) % x == 0)
-            else:
-                recommended_rate = max(self.rates)
-            if recommended_rate >= 8.e6:
-                self.ui.check_pmf.setChecked(True)
-            else:
-                self.ui.check_pmf.setChecked(False)
-            self.ui.combo_rate.setCurrentIndex(self.rates.index(recommended_rate))
+        recommended_rate = min(x for x in self.rates if x >= 4e6 and
+                             max(self.rates) % x == 0)
+        if recommended_rate >= 8.e6:
+            self.ui.check_pmf.setChecked(True)
+        self.ui.combo_rate.setCurrentIndex(self.rates.index(recommended_rate))

 ################ action handlers ####################
    def on_combo_source_currentIndexChanged(self, index):
@@ -303,8 +261,7 @@ class mainwindow(QtGui.QMainWindow):
            options.antenna = str(self.ui.combo_ant.currentText())
            options.gain = float(self.ui.line_gain.text())
            options.threshold = float(self.ui.line_threshold.text())
-            options.pmf = self.ui.check_pmf.isChecked()
-            options.dcblock = self.ui.check_dcblock.isChecked()
+            options.pmf = self.ui.check_pmf.checkState()

            self._servers = ["inproc://modes-radio-pub"] #TODO ADD REMOTES
            self._relay = air_modes.zmq_pubsub_iface(self.context, subaddr=self._servers, pubaddr=None)
@@ -322,8 +279,7 @@ class mainwindow(QtGui.QMainWindow):
                my_position = None

            self._cpr_dec = air_modes.cpr_decoder(my_position)
-
-            self.datamodelout = dashboard_output(self._cpr_dec, self.datamodel, self._publisher)
+#            self.datamodelout = dashboard_output(self._cpr_dec, self.datamodel, self._publisher)

            self.lock = threading.Lock() #grab a lock to ensure sql and kml don't step on each other

@@ -382,35 +338,12 @@ class mainwindow(QtGui.QMainWindow):
            self.ui.button_start.setText("Stop")
            self.running = True

-            #grab prefs and save them
-            self.prefs = {}
-            self.prefs["samplerate"] = options.rate
-            self.prefs["antenna"] = options.antenna
-            self.prefs["gain"] = options.gain
-            self.prefs["pmf"] = "1" if options.pmf else "0"
-            self.prefs["dcblock"] = "1" if options.dcblock else "0"
-            self.prefs["source"] = self.ui.combo_source.currentText()
-            self.prefs["threshold"] = options.threshold
-            self.prefs["sbs1"] = "1" if self.ui.check_sbs1.isChecked() else "0"
-            self.prefs["sbs1port"] = int(self.ui.line_sbs1port.text())
-            self.prefs["fgfs"] = "1" if self.ui.check_fgfs.isChecked() else "0"
-            self.prefs["fgfsport"] = int(self.ui.line_fgfsport.text())
-            self.prefs["raw"] = "1" if self.ui.check_raw.isChecked() else "0"
-            self.prefs["rawport"] = int(self.ui.line_rawport.text())
-            self.prefs["kml"] = "1" if self.ui.check_kml.isChecked() else "0"
-            self.prefs["kmlfile"] = self.ui.line_kmlfilename.text()
-            try:
-                self.prefs["latitude"] = float(self.ui.line_my_lat.text())
-                self.prefs["longitude"] = float(self.ui.line_my_lon.text())
-            except:
-                pass
-
    def on_quit(self):
        if self.running is True:
-            self._radio.close()
-            self._radio = None
            self._relay.close()
+            self._radio.close()
            self._relay = None
+            self._radio = None
            self._rps_timer = None
            try:
                self.kmlgen.done = True
@@ -420,19 +353,9 @@ class mainwindow(QtGui.QMainWindow):
            except:
                pass

-        if self.prefs is not None:
-            self.write_defaults(self.prefs)
-
    #slot to catch signal emitted by output_live_data (necessary for
    #thread safety since output_live_data is called by another thread)
    def on_append_live_data(self, msgstr):
-        self._pending_msgstr += msgstr + "\n"
-        if time.time() - self._last_live_data_update >= 0.1:
-            self._last_live_data_update = time.time()
-            self.update_live_data(self._pending_msgstr)
-            self._pending_msgstr = ""
-
-    def update_live_data(self, msgstr):
        #limit scrollback buffer size -- is there a faster way?
        if(self.ui.text_livedata.document().lineCount() > 500):
            cursor = self.ui.text_livedata.textCursor()
@@ -443,56 +366,6 @@ class mainwindow(QtGui.QMainWindow):
        self.ui.text_livedata.append(msgstr)
        self.ui.text_livedata.verticalScrollBar().setSliderPosition(self.ui.text_livedata.verticalScrollBar().maximum())

-    opt_file = "~/.gr-air-modes/prefs"
-    def get_defaults(self):
-        defaults = {}
-        defaults["samplerate"] = None #let app pick it
-        defaults["pmf"] = None
-        defaults["dcblock"] = None
-        defaults["antenna"] = None
-        defaults["gain"] = "25"
-        defaults["kml"] = "1"
-        defaults["kmlfile"] = "modes.kml"
-        defaults["sbs1"] = "0"
-        defaults["sbs1port"] = "30003"
-        defaults["raw"] = "0"
-        defaults["rawport"] = "9988"
-        defaults["fgfs"] = "0"
-        defaults["fgfsport"] = "5500"
-        defaults["source"] = "UHD"
-        defaults["threshold"] = "5"
-        defaults["latitude"] = None
-        defaults["longitude"] = None
-
-        prefs = ConfigParser.ConfigParser(defaults)
-        prefs.optionxform = str
-
-        try:
-            prefs.read(os.path.expanduser(self.opt_file))
-            for item in prefs.items("GUI"):
-                defaults[item[0]] = item[1]
-        except (IOError, ConfigParser.NoSectionError):
-            print "No preferences file %s found, creating..." % os.path.expanduser(self.opt_file)
-            self.write_defaults(defaults)
-
-        return defaults
-
-
-    def write_defaults(self, defaults):
-        config = ConfigParser.RawConfigParser()
-        config.add_section('GUI')
-
-        for item in defaults:
-            config.set('GUI', item, str(defaults[item]))
-
-        dirname = os.path.dirname(os.path.expanduser(self.opt_file))
-        if not os.path.exists(dirname):
-            os.makedirs(dirname)
-
-        with open(os.path.expanduser(self.opt_file), 'wb') as prefsfile:
-            config.write(prefsfile)
-
-
 if __name__ == '__main__':
    app = QtGui.QApplication(sys.argv)
    window = mainwindow()
--- a/apps/modes_rx
+++ b/apps/modes_rx
@@ -86,9 +86,8 @@ def main():
    sbs1port = air_modes.output_sbs1(cpr_dec, 30003, publisher)

  tb.run()
-  time.sleep(0.2)
  tb.close()
-  time.sleep(0.2)
+
  relay.close()

  if options.kml is not None:
--- a/cmake/Modules/FindCppUnit.cmake
+++ b/cmake/Modules/FindCppUnit.cmake
@@ -1,39 +0,0 @@
-# http://www.cmake.org/pipermail/cmake/2006-October/011446.html
-# Modified to use pkg config and use standard var names
-
-#
-# Find the CppUnit includes and library
-#
-# This module defines
-# CPPUNIT_INCLUDE_DIR, where to find tiff.h, etc.
-# CPPUNIT_LIBRARIES, the libraries to link against to use CppUnit.
-# CPPUNIT_FOUND, If false, do not try to use CppUnit.
-
-INCLUDE(FindPkgConfig)
-PKG_CHECK_MODULES(PC_CPPUNIT "cppunit")
-
-FIND_PATH(CPPUNIT_INCLUDE_DIRS
-    NAMES cppunit/TestCase.h
-    HINTS ${PC_CPPUNIT_INCLUDE_DIR}
-    ${CMAKE_INSTALL_PREFIX}/include
-    PATHS
-    /usr/local/include
-    /usr/include
-)
-
-FIND_LIBRARY(CPPUNIT_LIBRARIES
-    NAMES cppunit
-    HINTS ${PC_CPPUNIT_LIBDIR}
-    ${CMAKE_INSTALL_PREFIX}/lib
-    ${CMAKE_INSTALL_PREFIX}/lib64
-    PATHS
-    ${CPPUNIT_INCLUDE_DIRS}/../lib
-    /usr/local/lib
-    /usr/lib
-)
-
-LIST(APPEND CPPUNIT_LIBRARIES ${CMAKE_DL_LIBS})
-
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(CPPUNIT DEFAULT_MSG CPPUNIT_LIBRARIES CPPUNIT_INCLUDE_DIRS)
-MARK_AS_ADVANCED(CPPUNIT_LIBRARIES CPPUNIT_INCLUDE_DIRS)
--- a/cmake/Modules/FindGnuradioRuntime.cmake
+++ b/cmake/Modules/FindGnuradioRuntime.cmake
@@ -1,36 +1,6 @@
 INCLUDE(FindPkgConfig)
-PKG_CHECK_MODULES(PC_GNURADIO_RUNTIME gnuradio-runtime)
-
-if(PC_GNURADIO_RUNTIME_FOUND)
-  # look for include files
-  FIND_PATH(
-    GNURADIO_RUNTIME_INCLUDE_DIRS
-    NAMES gnuradio/top_block.h
-    HINTS $ENV{GNURADIO_RUNTIME_DIR}/include
-          ${PC_GNURADIO_RUNTIME_INCLUDE_DIRS}
-          ${CMAKE_INSTALL_PREFIX}/include
-    PATHS /usr/local/include
-          /usr/include
-    )
-
-  # look for libs
-  FIND_LIBRARY(
-    GNURADIO_RUNTIME_LIBRARIES
-    NAMES gnuradio-runtime
-    HINTS $ENV{GNURADIO_RUNTIME_DIR}/lib
-          ${PC_GNURADIO_RUNTIME_LIBDIR}
-          ${CMAKE_INSTALL_PREFIX}/lib/
-          ${CMAKE_INSTALL_PREFIX}/lib64/
-    PATHS /usr/local/lib
-          /usr/local/lib64
-          /usr/lib
-          /usr/lib64
-    )
-
-  set(GNURADIO_RUNTIME_FOUND ${PC_GNURADIO_RUNTIME_FOUND})
-endif(PC_GNURADIO_RUNTIME_FOUND)
+PKG_CHECK_MODULES(GNURADIO_RUNTIME gnuradio-runtime)

 INCLUDE(FindPackageHandleStandardArgs)
-# do not check GNURADIO_RUNTIME_INCLUDE_DIRS, is not set when default include path us used.
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GNURADIO_RUNTIME DEFAULT_MSG GNURADIO_RUNTIME_LIBRARIES)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GNURADIO_RUNTIME DEFAULT_MSG GNURADIO_RUNTIME_LIBRARIES GNURADIO_RUNTIME_INCLUDE_DIRS)
 MARK_AS_ADVANCED(GNURADIO_RUNTIME_LIBRARIES GNURADIO_RUNTIME_INCLUDE_DIRS)
--- a/cmake/Modules/FindQwt.cmake
+++ b/cmake/Modules/FindQwt.cmake
@@ -0,0 +1,30 @@
+# - try to find Qwt libraries and include files
+# QWT_INCLUDE_DIR where to find qwt_plot.h, etc.
+# QWT_LIBRARIES libraries to link against
+# QWT_FOUND If false, do not try to use Qwt
+
+find_path (QWT_INCLUDE_DIRS
+	NAMES qwt_plot.h
+	PATHS
+	/usr/local/include/qwt-qt4
+	/usr/local/include/qwt
+	/usr/include/qwt-qt4
+	/usr/include/qwt
+	/opt/local/include/qwt
+	/sw/include/qwt
+)
+
+find_library (QWT_LIBRARIES
+	NAMES qwt-qt4 qwt
+	PATHS
+	/usr/local/lib
+	/usr/lib
+	/opt/local/lib
+	/sw/lib
+)
+
+# handle the QUIETLY and REQUIRED arguments and set QWT_FOUND to TRUE if
+# all listed variables are TRUE
+include ( FindPackageHandleStandardArgs )
+find_package_handle_standard_args( Qwt DEFAULT_MSG QWT_LIBRARIES QWT_INCLUDE_DIRS )
+MARK_AS_ADVANCED(QWT_LIBRARIES QWT_INCLUDE_DIRS)
--- a/cmake/Modules/FindZeroMQ.cmake
+++ b/cmake/Modules/FindZeroMQ.cmake
@@ -0,0 +1,56 @@
+# - Find zeromq libraries
+# This module finds zeromq if it is installed and determines where the
+# include files and libraries are. It also determines what the name of
+# the library is. This code sets the following variables:
+#
+#  ZEROMQ_FOUND               - have the zeromq libs been found
+#  ZEROMQ_LIBRARIES           - path to the zeromq library
+#  ZEROMQ_INCLUDE_DIRS        - path to where zmq.h is found
+#  ZEROMQ_DEBUG_LIBRARIES     - path to the debug library
+
+#INCLUDE(CMakeFindFrameworks)
+# Search for the zeromq framework on Apple.
+#CMAKE_FIND_FRAMEWORKS(ZeroMQ)
+
+IF(WIN32)
+	FIND_LIBRARY(ZEROMQ_DEBUG_LIBRARY
+		NAMES libzmq_d zmq_d
+		PATHS
+			${ZEROMQ_LIBRARIES}
+	)
+ENDIF(WIN32)
+
+FIND_LIBRARY(ZEROMQ_LIBRARY
+	NAMES libzmq zmq 
+	PATHS
+		${ZEROMQ_LIBRARIES}
+		${NSCP_LIBRARYDIR}
+)
+
+#  IF(ZeroMQ_FRAMEWORKS AND NOT ZEROMQ_INCLUDE_DIR)
+#    FOREACH(dir ${ZeroMQ_FRAMEWORKS})
+#      SET(ZEROMQ_FRAMEWORK_INCLUDES ${ZEROMQ_FRAMEWORK_INCLUDES}
+#        ${dir}/Versions/${_CURRENT_VERSION}/include/zeromq${_CURRENT_VERSION})
+#    ENDFOREACH(dir)
+#  ENDIF(ZeroMQ_FRAMEWORKS AND NOT ZEROMQ_INCLUDE_DIR)
+
+FIND_PATH(ZEROMQ_INCLUDE_DIR
+	NAMES zmq.hpp
+	PATHS
+#		${ZEROMQ_FRAMEWORK_INCLUDES}
+		${ZEROMQ_INCLUDE_DIRS}
+		${NSCP_INCLUDEDIR}
+		${ZEROMQ_INCLUDE_DIR}
+)
+
+MARK_AS_ADVANCED(
+  ZEROMQ_DEBUG_LIBRARY
+  ZEROMQ_LIBRARY
+  ZEROMQ_INCLUDE_DIR
+)
+SET(ZEROMQ_INCLUDE_DIRS "${ZEROMQ_INCLUDE_DIR}")
+SET(ZEROMQ_LIBRARIES "${ZEROMQ_LIBRARY}")
+SET(ZEROMQ_DEBUG_LIBRARIES "${ZEROMQ_DEBUG_LIBRARY}")
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZeroMQ DEFAULT_MSG ZEROMQ_LIBRARIES ZEROMQ_INCLUDE_DIRS)
--- a/cmake/Modules/GrBoost.cmake
+++ b/cmake/Modules/GrBoost.cmake
@@ -0,0 +1,99 @@
+# Copyright 2010-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.
+
+if(DEFINED __INCLUDED_GR_BOOST_CMAKE)
+    return()
+endif()
+set(__INCLUDED_GR_BOOST_CMAKE TRUE)
+
+########################################################################
+# Setup Boost and handle some system specific things
+########################################################################
+
+set(BOOST_REQUIRED_COMPONENTS
+    date_time
+    program_options
+    filesystem
+    system
+    thread
+)
+
+if(UNIX AND NOT BOOST_ROOT AND EXISTS "/usr/lib64")
+    list(APPEND BOOST_LIBRARYDIR "/usr/lib64") #fedora 64-bit fix
+endif(UNIX AND NOT BOOST_ROOT AND EXISTS "/usr/lib64")
+
+if(MSVC)
+    set(BOOST_REQUIRED_COMPONENTS ${BOOST_REQUIRED_COMPONENTS} chrono)
+
+    if (NOT DEFINED BOOST_ALL_DYN_LINK)
+        set(BOOST_ALL_DYN_LINK TRUE)
+    endif()
+    set(BOOST_ALL_DYN_LINK "${BOOST_ALL_DYN_LINK}" CACHE BOOL "boost enable dynamic linking")
+    if(BOOST_ALL_DYN_LINK)
+        add_definitions(-DBOOST_ALL_DYN_LINK) #setup boost auto-linking in msvc
+    else(BOOST_ALL_DYN_LINK)
+        unset(BOOST_REQUIRED_COMPONENTS) #empty components list for static link
+    endif(BOOST_ALL_DYN_LINK)
+endif(MSVC)
+
+find_package(Boost "1.35" COMPONENTS ${BOOST_REQUIRED_COMPONENTS})
+
+# This does not allow us to disable specific versions. It is used
+# internally by cmake to know the formation newer versions. As newer
+# Boost version beyond what is shown here are produced, we must extend
+# this list. To disable Boost versions, see below.
+set(Boost_ADDITIONAL_VERSIONS
+    "1.35.0" "1.35" "1.36.0" "1.36" "1.37.0" "1.37" "1.38.0" "1.38" "1.39.0" "1.39"
+    "1.40.0" "1.40" "1.41.0" "1.41" "1.42.0" "1.42" "1.43.0" "1.43" "1.44.0" "1.44"
+    "1.45.0" "1.45" "1.46.0" "1.46" "1.47.0" "1.47" "1.48.0" "1.48" "1.49.0" "1.49"
+    "1.50.0" "1.50" "1.51.0" "1.51" "1.52.0" "1.52" "1.53.0" "1.53" "1.54.0" "1.54"
+    "1.55.0" "1.55" "1.56.0" "1.56" "1.57.0" "1.57" "1.58.0" "1.58" "1.59.0" "1.59"
+    "1.60.0" "1.60" "1.61.0" "1.61" "1.62.0" "1.62" "1.63.0" "1.63" "1.64.0" "1.64"
+    "1.65.0" "1.65" "1.66.0" "1.66" "1.67.0" "1.67" "1.68.0" "1.68" "1.69.0" "1.69"
+)
+
+# Boost 1.52 disabled, see https://svn.boost.org/trac/boost/ticket/7669
+# Similar problems with Boost 1.46 and 1.47.
+
+OPTION(ENABLE_BAD_BOOST "Enable known bad versions of Boost" OFF)
+if(ENABLE_BAD_BOOST)
+  MESSAGE(STATUS "Enabling use of known bad versions of Boost.")
+endif(ENABLE_BAD_BOOST)
+
+# For any unsuitable Boost version, add the version number below in
+# the following format: XXYYZZ
+# Where:
+#     XX is the major version ('10' for version 1)
+#     YY is the minor version number ('46' for 1.46)
+#     ZZ is the patcher version number (typically just '00')
+set(Boost_NOGO_VERSIONS
+  104600 104601 104700 105200
+  )
+
+foreach(ver ${Boost_NOGO_VERSIONS})
+  if(${Boost_VERSION} EQUAL ${ver})
+    if(NOT ENABLE_BAD_BOOST)
+      MESSAGE(STATUS "WARNING: Found a known bad version of Boost (v${Boost_VERSION}). Disabling.")
+      set(Boost_FOUND FALSE)
+    else(NOT ENABLE_BAD_BOOST)
+      MESSAGE(STATUS "WARNING: Found a known bad version of Boost (v${Boost_VERSION}). Continuing anyway.")
+      set(Boost_FOUND TRUE)
+    endif(NOT ENABLE_BAD_BOOST)
+  endif(${Boost_VERSION} EQUAL ${ver})
+endforeach(ver)
--- a/cmake/Modules/GrMiscUtils.cmake
+++ b/cmake/Modules/GrMiscUtils.cmake
@@ -1,4 +1,4 @@
-# Copyright 2010-2011,2014 Free Software Foundation, Inc.
+# Copyright 2010-2011 Free Software Foundation, Inc.
 #
 # This file is part of GNU Radio
 #
@@ -94,13 +94,7 @@ macro(GR_ADD_CXX_COMPILER_FLAG_IF_AVAILABLE flag have)
    include(CheckCXXCompilerFlag)
    CHECK_CXX_COMPILER_FLAG(${flag} ${have})
    if(${have})
-      if(${CMAKE_VERSION} VERSION_GREATER "2.8.4")
-        STRING(FIND "${CMAKE_CXX_FLAGS}" "${flag}" flag_dup)
-        if(${flag_dup} EQUAL -1)
-          set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
-          set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${flag}")
-        endif(${flag_dup} EQUAL -1)
-      endif(${CMAKE_VERSION} VERSION_GREATER "2.8.4")
+        add_definitions(${flag})
    endif(${have})
 endmacro(GR_ADD_CXX_COMPILER_FLAG_IF_AVAILABLE)

@@ -214,312 +208,3 @@ function(GR_GEN_TARGET_DEPS name var)
        set(${var} "DEPENDS;${name};COMMAND;${name}" PARENT_SCOPE)
    endif()
 endfunction(GR_GEN_TARGET_DEPS)
-
-########################################################################
-# Control use of gr_logger
-# Usage:
-#   GR_LOGGING()
-#
-# Will set ENABLE_GR_LOG to 1 by default.
-# Can manually set with -DENABLE_GR_LOG=0|1
-########################################################################
-function(GR_LOGGING)
-  find_package(Log4cpp)
-
-  OPTION(ENABLE_GR_LOG "Use gr_logger" ON)
-  if(ENABLE_GR_LOG)
-    # If gr_logger is enabled, make it usable
-    add_definitions( -DENABLE_GR_LOG )
-
-    # also test LOG4CPP; if we have it, use this version of the logger
-    # otherwise, default to the stdout/stderr model.
-    if(LOG4CPP_FOUND)
-      SET(HAVE_LOG4CPP True CACHE INTERNAL "" FORCE)
-      add_definitions( -DHAVE_LOG4CPP )
-    else(not LOG4CPP_FOUND)
-      SET(HAVE_LOG4CPP False CACHE INTERNAL "" FORCE)
-      SET(LOG4CPP_INCLUDE_DIRS "" CACHE INTERNAL "" FORCE)
-      SET(LOG4CPP_LIBRARY_DIRS "" CACHE INTERNAL "" FORCE)
-      SET(LOG4CPP_LIBRARIES "" CACHE INTERNAL "" FORCE)
-    endif(LOG4CPP_FOUND)
-
-    SET(ENABLE_GR_LOG ${ENABLE_GR_LOG} CACHE INTERNAL "" FORCE)
-
-  else(ENABLE_GR_LOG)
-    SET(HAVE_LOG4CPP False CACHE INTERNAL "" FORCE)
-    SET(LOG4CPP_INCLUDE_DIRS "" CACHE INTERNAL "" FORCE)
-    SET(LOG4CPP_LIBRARY_DIRS "" CACHE INTERNAL "" FORCE)
-    SET(LOG4CPP_LIBRARIES "" CACHE INTERNAL "" FORCE)
-  endif(ENABLE_GR_LOG)
-
-  message(STATUS "ENABLE_GR_LOG set to ${ENABLE_GR_LOG}.")
-  message(STATUS "HAVE_LOG4CPP set to ${HAVE_LOG4CPP}.")
-  message(STATUS "LOG4CPP_LIBRARIES set to ${LOG4CPP_LIBRARIES}.")
-
-endfunction(GR_LOGGING)
-
-########################################################################
-# Run GRCC to compile .grc files into .py files.
-#
-# Usage: GRCC(filename, directory)
-#    - filenames: List of file name of .grc file
-#    - directory: directory of built .py file - usually in
-#                 ${CMAKE_CURRENT_BINARY_DIR}
-#    - Sets PYFILES: output converted GRC file names to Python files.
-########################################################################
-function(GRCC)
-  # Extract directory from list of args, remove it for the list of filenames.
-  list(GET ARGV -1 directory)
-  list(REMOVE_AT ARGV -1)
-  set(filenames ${ARGV})
-  file(MAKE_DIRECTORY ${directory})
-
-  SET(GRCC_COMMAND ${CMAKE_SOURCE_DIR}/gr-utils/python/grcc)
-
-  # GRCC uses some stuff in grc and gnuradio-runtime, so we force
-  # the known paths here
-  list(APPEND PYTHONPATHS
-    ${CMAKE_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/gnuradio-runtime/python
-    ${CMAKE_SOURCE_DIR}/gnuradio-runtime/lib/swig
-    ${CMAKE_BINARY_DIR}/gnuradio-runtime/lib/swig
-    )
-
-  if(WIN32)
-    #SWIG generates the python library files into a subdirectory.
-    #Therefore, we must append this subdirectory into PYTHONPATH.
-    #Only do this for the python directories matching the following:
-    foreach(pydir ${PYTHONPATHS})
-      get_filename_component(name ${pydir} NAME)
-      if(name MATCHES "^(swig|lib|src)$")
-        list(APPEND PYTHONPATHS ${pydir}/${CMAKE_BUILD_TYPE})
-      endif()
-    endforeach(pydir)
-  endif(WIN32)
-
-  file(TO_NATIVE_PATH "${PYTHONPATHS}" pypath)
-
-  if(UNIX)
-    list(APPEND pypath "$PYTHONPATH")
-    string(REPLACE ";" ":" pypath "${pypath}")
-    set(ENV{PYTHONPATH} ${pypath})
-  endif(UNIX)
-
-  if(WIN32)
-    list(APPEND pypath "%PYTHONPATH%")
-    string(REPLACE ";" "\\;" pypath "${pypath}")
-    #list(APPEND environs "PYTHONPATH=${pypath}")
-    set(ENV{PYTHONPATH} ${pypath})
-  endif(WIN32)
-
-  foreach(f ${filenames})
-    execute_process(
-      COMMAND ${GRCC_COMMAND} -d ${directory} ${f}
-      )
-    string(REPLACE ".grc" ".py" pyfile "${f}")
-    string(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}" pyfile "${pyfile}")
-    list(APPEND pyfiles ${pyfile})
-  endforeach(f)
-
-  set(PYFILES ${pyfiles} PARENT_SCOPE)
-endfunction(GRCC)
-
-########################################################################
-# Check if HAVE_PTHREAD_SETSCHEDPARAM and HAVE_SCHED_SETSCHEDULER
-#  should be defined
-########################################################################
-macro(GR_CHECK_LINUX_SCHED_AVAIL)
-set(CMAKE_REQUIRED_LIBRARIES -lpthread)
-    CHECK_CXX_SOURCE_COMPILES("
-        #include <pthread.h>
-        int main(){
-            pthread_t pthread;
-            pthread_setschedparam(pthread,  0, 0);
-            return 0;
-        } " HAVE_PTHREAD_SETSCHEDPARAM
-    )
-    GR_ADD_COND_DEF(HAVE_PTHREAD_SETSCHEDPARAM)
-
-    CHECK_CXX_SOURCE_COMPILES("
-        #include <sched.h>
-        int main(){
-            pid_t pid;
-            sched_setscheduler(pid, 0, 0);
-            return 0;
-        } " HAVE_SCHED_SETSCHEDULER
-    )
-    GR_ADD_COND_DEF(HAVE_SCHED_SETSCHEDULER)
-endmacro(GR_CHECK_LINUX_SCHED_AVAIL)
-
-########################################################################
-# Macros to generate source and header files from template
-########################################################################
-macro(GR_EXPAND_X_H component root)
-
-  include(GrPython)
-
-  file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py
-"#!${PYTHON_EXECUTABLE}
-
-import sys, os, re
-sys.path.append('${GR_RUNTIME_PYTHONPATH}')
-os.environ['srcdir'] = '${CMAKE_CURRENT_SOURCE_DIR}'
-os.chdir('${CMAKE_CURRENT_BINARY_DIR}')
-
-if __name__ == '__main__':
-    import build_utils
-    root, inp = sys.argv[1:3]
-    for sig in sys.argv[3:]:
-        name = re.sub ('X+', sig, root)
-        d = build_utils.standard_dict2(name, sig, '${component}')
-        build_utils.expand_template(d, inp)
-")
-
-  #make a list of all the generated headers
-  unset(expanded_files_h)
-  foreach(sig ${ARGN})
-    string(REGEX REPLACE "X+" ${sig} name ${root})
-    list(APPEND expanded_files_h ${CMAKE_CURRENT_BINARY_DIR}/${name}.h)
-  endforeach(sig)
-  unset(name)
-
-  #create a command to generate the headers
-  add_custom_command(
-    OUTPUT ${expanded_files_h}
-    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${root}.h.t
-    COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
-    ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py
-    ${root} ${root}.h.t ${ARGN}
-  )
-
-  #install rules for the generated headers
-  list(APPEND generated_includes ${expanded_files_h})
-
-endmacro(GR_EXPAND_X_H)
-
-macro(GR_EXPAND_X_CC_H component root)
-
-  include(GrPython)
-
-  file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py
-"#!${PYTHON_EXECUTABLE}
-
-import sys, os, re
-sys.path.append('${GR_RUNTIME_PYTHONPATH}')
-os.environ['srcdir'] = '${CMAKE_CURRENT_SOURCE_DIR}'
-os.chdir('${CMAKE_CURRENT_BINARY_DIR}')
-
-if __name__ == '__main__':
-    import build_utils
-    root, inp = sys.argv[1:3]
-    for sig in sys.argv[3:]:
-        name = re.sub ('X+', sig, root)
-        d = build_utils.standard_impl_dict2(name, sig, '${component}')
-        build_utils.expand_template(d, inp)
-")
-
-  #make a list of all the generated files
-  unset(expanded_files_cc)
-  unset(expanded_files_h)
-  foreach(sig ${ARGN})
-    string(REGEX REPLACE "X+" ${sig} name ${root})
-    list(APPEND expanded_files_cc ${CMAKE_CURRENT_BINARY_DIR}/${name}.cc)
-    list(APPEND expanded_files_h  ${CMAKE_CURRENT_BINARY_DIR}/${name}.h)
-  endforeach(sig)
-  unset(name)
-
-  #create a command to generate the source files
-  add_custom_command(
-    OUTPUT ${expanded_files_cc}
-    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${root}.cc.t
-    COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
-    ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py
-    ${root} ${root}.cc.t ${ARGN}
-  )
-
-  #create a command to generate the header files
-  add_custom_command(
-    OUTPUT ${expanded_files_h}
-    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${root}.h.t
-    COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
-    ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py
-    ${root} ${root}.h.t ${ARGN}
-  )
-
-  #make source files depends on headers to force generation
-  set_source_files_properties(${expanded_files_cc}
-    PROPERTIES OBJECT_DEPENDS "${expanded_files_h}"
-  )
-
-  #install rules for the generated files
-  list(APPEND generated_sources ${expanded_files_cc})
-  list(APPEND generated_headers ${expanded_files_h})
-
-endmacro(GR_EXPAND_X_CC_H)
-
-macro(GR_EXPAND_X_CC_H_IMPL component root)
-
-  include(GrPython)
-
-  file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py
-"#!${PYTHON_EXECUTABLE}
-
-import sys, os, re
-sys.path.append('${GR_RUNTIME_PYTHONPATH}')
-os.environ['srcdir'] = '${CMAKE_CURRENT_SOURCE_DIR}'
-os.chdir('${CMAKE_CURRENT_BINARY_DIR}')
-
-if __name__ == '__main__':
-    import build_utils
-    root, inp = sys.argv[1:3]
-    for sig in sys.argv[3:]:
-        name = re.sub ('X+', sig, root)
-        d = build_utils.standard_dict(name, sig, '${component}')
-        build_utils.expand_template(d, inp, '_impl')
-")
-
-  #make a list of all the generated files
-  unset(expanded_files_cc_impl)
-  unset(expanded_files_h_impl)
-  unset(expanded_files_h)
-  foreach(sig ${ARGN})
-    string(REGEX REPLACE "X+" ${sig} name ${root})
-    list(APPEND expanded_files_cc_impl ${CMAKE_CURRENT_BINARY_DIR}/${name}_impl.cc)
-    list(APPEND expanded_files_h_impl ${CMAKE_CURRENT_BINARY_DIR}/${name}_impl.h)
-    list(APPEND expanded_files_h ${CMAKE_CURRENT_BINARY_DIR}/../include/gnuradio/${component}/${name}.h)
-  endforeach(sig)
-  unset(name)
-
-  #create a command to generate the _impl.cc files
-  add_custom_command(
-    OUTPUT ${expanded_files_cc_impl}
-    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${root}_impl.cc.t
-    COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
-    ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py
-    ${root} ${root}_impl.cc.t ${ARGN}
-  )
-
-  #create a command to generate the _impl.h files
-  add_custom_command(
-    OUTPUT ${expanded_files_h_impl}
-    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${root}_impl.h.t
-    COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
-    ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py
-    ${root} ${root}_impl.h.t ${ARGN}
-  )
-
-  #make _impl.cc source files depend on _impl.h to force generation
-  set_source_files_properties(${expanded_files_cc_impl}
-    PROPERTIES OBJECT_DEPENDS "${expanded_files_h_impl}"
-  )
-
-  #make _impl.h source files depend on headers to force generation
-  set_source_files_properties(${expanded_files_h_impl}
-    PROPERTIES OBJECT_DEPENDS "${expanded_files_h}"
-  )
-
-  #install rules for the generated files
-  list(APPEND generated_sources ${expanded_files_cc_impl})
-  list(APPEND generated_headers ${expanded_files_h_impl})
-
-endmacro(GR_EXPAND_X_CC_H_IMPL)
--- a/cmake/Modules/GrPython.cmake
+++ b/cmake/Modules/GrPython.cmake
@@ -36,11 +36,11 @@ if(PYTHON_EXECUTABLE)
 else(PYTHON_EXECUTABLE)

    #use the built-in find script
-    find_package(PythonInterp 2)
+    find_package(PythonInterp)

    #and if that fails use the find program routine
    if(NOT PYTHONINTERP_FOUND)
-        find_program(PYTHON_EXECUTABLE NAMES python python2 python2.7 python2.6 python2.5)
+        find_program(PYTHON_EXECUTABLE NAMES python python2.7 python2.6 python2.5)
        if(PYTHON_EXECUTABLE)
            set(PYTHONINTERP_FOUND TRUE)
        endif(PYTHON_EXECUTABLE)
@@ -48,15 +48,8 @@ else(PYTHON_EXECUTABLE)

 endif(PYTHON_EXECUTABLE)

-if (CMAKE_CROSSCOMPILING)
-    set(QA_PYTHON_EXECUTABLE "/usr/bin/python")
-else (CMAKE_CROSSCOMPILING)
-    set(QA_PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE})
-endif(CMAKE_CROSSCOMPILING)
-
 #make the path to the executable appear in the cmake gui
 set(PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE} CACHE FILEPATH "python interpreter")
-set(QA_PYTHON_EXECUTABLE ${QA_PYTHON_EXECUTABLE} CACHE FILEPATH "python interpreter for QA tests")

 #make sure we can use -B with python (introduced in 2.6)
 if(PYTHON_EXECUTABLE)
@@ -103,13 +96,11 @@ endmacro(GR_PYTHON_CHECK_MODULE)
 ########################################################################
 # Sets the python installation directory GR_PYTHON_DIR
 ########################################################################
-if(NOT DEFINED GR_PYTHON_DIR)
 execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "
 from distutils import sysconfig
 print sysconfig.get_python_lib(plat_specific=True, prefix='')
 " OUTPUT_VARIABLE GR_PYTHON_DIR OUTPUT_STRIP_TRAILING_WHITESPACE
 )
-endif()
 file(TO_CMAKE_PATH ${GR_PYTHON_DIR} GR_PYTHON_DIR)

 ########################################################################
@@ -192,7 +183,7 @@ function(GR_PYTHON_INSTALL)
        file(TO_NATIVE_PATH ${PYTHON_EXECUTABLE} pyexe_native)

        if (CMAKE_CROSSCOMPILING)
-           set(pyexe_native "/usr/bin/env python")
+           set(pyexe_native /usr/bin/env python)
        endif()

        foreach(pyfile ${GR_PYTHON_INSTALL_PROGRAMS})
@@ -207,9 +198,8 @@ function(GR_PYTHON_INSTALL)
            add_custom_command(
                OUTPUT ${pyexefile} DEPENDS ${pyfile}
                COMMAND ${PYTHON_EXECUTABLE} -c
-                "open('${pyexefile}','w').write('\#!${pyexe_native}\\n'+open('${pyfile}').read())"
+                \"open('${pyexefile}', 'w').write('\#!${pyexe_native}\\n'+open('${pyfile}').read())\"
                COMMENT "Shebangin ${pyfile_name}"
-                VERBATIM
            )

            #on windows, python files need an extension to execute
--- a/cmake/Modules/GrSwig.cmake
+++ b/cmake/Modules/GrSwig.cmake
@@ -39,7 +39,7 @@ function(GR_SWIG_MAKE_DOCS output_file)
        set(input_files)
        unset(INPUT_PATHS)
        foreach(input_path ${ARGN})
-            if(IS_DIRECTORY ${input_path}) #when input path is a directory
+            if (IS_DIRECTORY ${input_path}) #when input path is a directory
                file(GLOB input_path_h_files ${input_path}/*.h)
            else() #otherwise its just a file, no glob
                set(input_path_h_files ${input_path})
@@ -105,35 +105,23 @@ endfunction(GR_SWIG_MAKE_DOCS)
 macro(GR_SWIG_MAKE name)
    set(ifiles ${ARGN})

-    # Shimming this in here to take care of a SWIG bug with handling
-    # vector<size_t> and vector<unsigned int> (on 32-bit machines) and
-    # vector<long unsigned int> (on 64-bit machines). Use this to test
-    # the size of size_t, then set SIZE_T_32 if it's a 32-bit machine
-    # or not if it's 64-bit. The logic in gr_type.i handles the rest.
-    INCLUDE(CheckTypeSize)
-    CHECK_TYPE_SIZE("size_t" SIZEOF_SIZE_T)
-    CHECK_TYPE_SIZE("unsigned int" SIZEOF_UINT)
-    if(${SIZEOF_SIZE_T} EQUAL ${SIZEOF_UINT})
-      list(APPEND GR_SWIG_FLAGS -DSIZE_T_32)
-    endif(${SIZEOF_SIZE_T} EQUAL ${SIZEOF_UINT})
+    list(APPEND GR_SWIG_TARGET_DEPS ${GR_SWIG_LIBRARIES})

    #do swig doc generation if specified
-    if(GR_SWIG_DOC_FILE)
+    if (GR_SWIG_DOC_FILE)
        set(GR_SWIG_DOCS_SOURCE_DEPS ${GR_SWIG_SOURCE_DEPS})
-        list(APPEND GR_SWIG_DOCS_TARGET_DEPS ${GR_SWIG_TARGET_DEPS})
+        set(GR_SWIG_DOCS_TAREGT_DEPS ${GR_SWIG_TARGET_DEPS})
        GR_SWIG_MAKE_DOCS(${GR_SWIG_DOC_FILE} ${GR_SWIG_DOC_DIRS})
        add_custom_target(${name}_swig_doc DEPENDS ${GR_SWIG_DOC_FILE})
-        list(APPEND GR_SWIG_TARGET_DEPS ${name}_swig_doc ${GR_RUNTIME_SWIG_DOC_FILE})
+        list(APPEND GR_SWIG_TARGET_DEPS ${name}_swig_doc)
    endif()

    #append additional include directories
-    find_package(PythonLibs 2)
+    find_package(PythonLibs)
    list(APPEND GR_SWIG_INCLUDE_DIRS ${PYTHON_INCLUDE_PATH}) #deprecated name (now dirs)
    list(APPEND GR_SWIG_INCLUDE_DIRS ${PYTHON_INCLUDE_DIRS})
-
-    #prepend local swig directories
-    list(INSERT GR_SWIG_INCLUDE_DIRS 0 ${CMAKE_CURRENT_SOURCE_DIR})
-    list(INSERT GR_SWIG_INCLUDE_DIRS 0 ${CMAKE_CURRENT_BINARY_DIR})
+    list(APPEND GR_SWIG_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR})
+    list(APPEND GR_SWIG_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR})

    #determine include dependencies for swig file
    execute_process(
@@ -172,9 +160,6 @@ macro(GR_SWIG_MAKE name)
    include(UseSWIG)
    SWIG_ADD_MODULE(${name} python ${ifiles})
    SWIG_LINK_LIBRARIES(${name} ${PYTHON_LIBRARIES} ${GR_SWIG_LIBRARIES})
-    if(${name} STREQUAL "runtime_swig")
-        SET_TARGET_PROPERTIES(${SWIG_MODULE_runtime_swig_REAL_NAME} PROPERTIES DEFINE_SYMBOL "gnuradio_runtime_EXPORTS")
-    endif(${name} STREQUAL "runtime_swig")

 endmacro(GR_SWIG_MAKE)

@@ -222,25 +207,21 @@ file(WRITE ${CMAKE_BINARY_DIR}/get_swig_deps.py "

 import os, sys, re

-i_include_matcher = re.compile('%(include|import)\\s*[<|\"](.*)[>|\"]')
-h_include_matcher = re.compile('#(include)\\s*[<|\"](.*)[>|\"]')
+include_matcher = re.compile('[#|%]include\\s*[<|\"](.*)[>|\"]')
 include_dirs = sys.argv[2].split(';')

 def get_swig_incs(file_path):
-    if file_path.endswith('.i'): matcher = i_include_matcher
-    else: matcher = h_include_matcher
    file_contents = open(file_path, 'r').read()
-    return matcher.findall(file_contents, re.MULTILINE)
+    return include_matcher.findall(file_contents, re.MULTILINE)

 def get_swig_deps(file_path, level):
    deps = [file_path]
    if level == 0: return deps
-    for keyword, inc_file in get_swig_incs(file_path):
+    for inc_file in get_swig_incs(file_path):
        for inc_dir in include_dirs:
            inc_path = os.path.join(inc_dir, inc_file)
            if not os.path.exists(inc_path): continue
            deps.extend(get_swig_deps(inc_path, level-1))
-            break #found, we dont search in lower prio inc dirs
    return deps

 if __name__ == '__main__':
--- a/cmake/Modules/GrTest.cmake
+++ b/cmake/Modules/GrTest.cmake
@@ -30,7 +30,6 @@ set(__INCLUDED_GR_TEST_CMAKE TRUE)
 # GR_TEST_TARGET_DEPS  - built targets for the library path
 # GR_TEST_LIBRARY_DIRS - directories for the library path
 # GR_TEST_PYTHON_DIRS  - directories for the python path
-# GR_TEST_ENVIRONS  - other environment key/value pairs
 ########################################################################
 function(GR_ADD_TEST test_name)

@@ -66,8 +65,7 @@ function(GR_ADD_TEST test_name)
    file(TO_NATIVE_PATH "${GR_TEST_LIBRARY_DIRS}" libpath) #ok to use on dir list?
    file(TO_NATIVE_PATH "${GR_TEST_PYTHON_DIRS}" pypath) #ok to use on dir list?

-    set(environs "VOLK_GENERIC=1" "GR_DONT_LOAD_PREFS=1" "srcdir=${srcdir}")
-    list(APPEND environs ${GR_TEST_ENVIRONS})
+    set(environs "GR_DONT_LOAD_PREFS=1" "srcdir=${srcdir}")

    #http://www.cmake.org/pipermail/cmake/2009-May/029464.html
    #Replaced this add test + set environs code with the shell script generation.
@@ -91,11 +89,7 @@ function(GR_ADD_TEST test_name)
        list(APPEND environs "PATH=${binpath}" "${LD_PATH_VAR}=${libpath}" "PYTHONPATH=${pypath}")

        #generate a bat file that sets the environment and runs the test
-	if (CMAKE_CROSSCOMPILING)
-                set(SHELL "/bin/sh")
-        else(CMAKE_CROSSCOMPILING)
-                find_program(SHELL sh)
-        endif(CMAKE_CROSSCOMPILING)
+        find_program(SHELL sh)
        set(sh_file ${CMAKE_CURRENT_BINARY_DIR}/${test_name}_test.sh)
        file(WRITE ${sh_file} "#!${SHELL}\n")
        #each line sets an environment variable
--- a/cmake/Modules/UseSWIG.cmake
+++ b/cmake/Modules/UseSWIG.cmake
@@ -1,304 +0,0 @@
-# - SWIG module for CMake
-# Defines the following macros:
-#   SWIG_ADD_MODULE(name language [ files ])
-#     - Define swig module with given name and specified language
-#   SWIG_LINK_LIBRARIES(name [ libraries ])
-#     - Link libraries to swig module
-# All other macros are for internal use only.
-# To get the actual name of the swig module,
-# use: ${SWIG_MODULE_${name}_REAL_NAME}.
-# Set Source files properties such as CPLUSPLUS and SWIG_FLAGS to specify
-# special behavior of SWIG. Also global CMAKE_SWIG_FLAGS can be used to add
-# special flags to all swig calls.
-# Another special variable is CMAKE_SWIG_OUTDIR, it allows one to specify
-# where to write all the swig generated module (swig -outdir option)
-# The name-specific variable SWIG_MODULE_<name>_EXTRA_DEPS may be used
-# to specify extra dependencies for the generated modules.
-# If the source file generated by swig need some special flag you can use
-# set_source_files_properties( ${swig_generated_file_fullname}
-#        PROPERTIES COMPILE_FLAGS "-bla")
-
-
-#=============================================================================
-# Copyright 2004-2009 Kitware, Inc.
-# Copyright 2009 Mathieu Malaterre <mathieu.malaterre@gmail.com>
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-#  License text for the above reference.)
-
-set(SWIG_CXX_EXTENSION "cxx")
-set(SWIG_EXTRA_LIBRARIES "")
-
-set(SWIG_PYTHON_EXTRA_FILE_EXTENSION "py")
-
-#
-# For given swig module initialize variables associated with it
-#
-macro(SWIG_MODULE_INITIALIZE name language)
-  string(TOUPPER "${language}" swig_uppercase_language)
-  string(TOLOWER "${language}" swig_lowercase_language)
-  set(SWIG_MODULE_${name}_LANGUAGE "${swig_uppercase_language}")
-  set(SWIG_MODULE_${name}_SWIG_LANGUAGE_FLAG "${swig_lowercase_language}")
-
-  set(SWIG_MODULE_${name}_REAL_NAME "${name}")
-  if("${SWIG_MODULE_${name}_LANGUAGE}" STREQUAL "UNKNOWN")
-    message(FATAL_ERROR "SWIG Error: Language \"${language}\" not found")
-  elseif("${SWIG_MODULE_${name}_LANGUAGE}" STREQUAL "PYTHON")
-    # when swig is used without the -interface it will produce in the module.py
-    # a 'import _modulename' statement, which implies having a corresponding
-    # _modulename.so (*NIX), _modulename.pyd (Win32).
-    set(SWIG_MODULE_${name}_REAL_NAME "_${name}")
-  elseif("${SWIG_MODULE_${name}_LANGUAGE}" STREQUAL "PERL")
-    set(SWIG_MODULE_${name}_EXTRA_FLAGS "-shadow")
-  endif()
-endmacro()
-
-#
-# For a given language, input file, and output file, determine extra files that
-# will be generated. This is internal swig macro.
-#
-
-macro(SWIG_GET_EXTRA_OUTPUT_FILES language outfiles generatedpath infile)
-  set(${outfiles} "")
-  get_source_file_property(SWIG_GET_EXTRA_OUTPUT_FILES_module_basename
-    ${infile} SWIG_MODULE_NAME)
-  if(SWIG_GET_EXTRA_OUTPUT_FILES_module_basename STREQUAL "NOTFOUND")
-    get_filename_component(SWIG_GET_EXTRA_OUTPUT_FILES_module_basename "${infile}" NAME_WE)
-  endif()
-  foreach(it ${SWIG_${language}_EXTRA_FILE_EXTENSION})
-    set(${outfiles} ${${outfiles}}
-      "${generatedpath}/${SWIG_GET_EXTRA_OUTPUT_FILES_module_basename}.${it}")
-  endforeach()
-endmacro()
-
-#
-# Take swig (*.i) file and add proper custom commands for it
-#
-macro(SWIG_ADD_SOURCE_TO_MODULE name outfiles infile)
-  set(swig_full_infile ${infile})
-  get_filename_component(swig_source_file_path "${infile}" PATH)
-  get_filename_component(swig_source_file_name_we "${infile}" NAME_WE)
-  get_source_file_property(swig_source_file_generated ${infile} GENERATED)
-  get_source_file_property(swig_source_file_cplusplus ${infile} CPLUSPLUS)
-  get_source_file_property(swig_source_file_flags ${infile} SWIG_FLAGS)
-  if("${swig_source_file_flags}" STREQUAL "NOTFOUND")
-    set(swig_source_file_flags "")
-  endif()
-  set(swig_source_file_fullname "${infile}")
-  if(${swig_source_file_path} MATCHES "^${CMAKE_CURRENT_SOURCE_DIR}")
-    string(REGEX REPLACE
-      "^${CMAKE_CURRENT_SOURCE_DIR}" ""
-      swig_source_file_relative_path
-      "${swig_source_file_path}")
-  else()
-    if(${swig_source_file_path} MATCHES "^${CMAKE_CURRENT_BINARY_DIR}")
-      string(REGEX REPLACE
-        "^${CMAKE_CURRENT_BINARY_DIR}" ""
-        swig_source_file_relative_path
-        "${swig_source_file_path}")
-      set(swig_source_file_generated 1)
-    else()
-      set(swig_source_file_relative_path "${swig_source_file_path}")
-      if(swig_source_file_generated)
-        set(swig_source_file_fullname "${CMAKE_CURRENT_BINARY_DIR}/${infile}")
-      else()
-        set(swig_source_file_fullname "${CMAKE_CURRENT_SOURCE_DIR}/${infile}")
-      endif()
-    endif()
-  endif()
-
-  set(swig_generated_file_fullname
-    "${CMAKE_CURRENT_BINARY_DIR}")
-  if(swig_source_file_relative_path)
-    set(swig_generated_file_fullname
-      "${swig_generated_file_fullname}/${swig_source_file_relative_path}")
-  endif()
-  # If CMAKE_SWIG_OUTDIR was specified then pass it to -outdir
-  if(CMAKE_SWIG_OUTDIR)
-    set(swig_outdir ${CMAKE_SWIG_OUTDIR})
-  else()
-    set(swig_outdir ${CMAKE_CURRENT_BINARY_DIR})
-  endif()
-  SWIG_GET_EXTRA_OUTPUT_FILES(${SWIG_MODULE_${name}_LANGUAGE}
-    swig_extra_generated_files
-    "${swig_outdir}"
-    "${infile}")
-  set(swig_generated_file_fullname
-    "${swig_generated_file_fullname}/${swig_source_file_name_we}")
-  # add the language into the name of the file (i.e. TCL_wrap)
-  # this allows for the same .i file to be wrapped into different languages
-  set(swig_generated_file_fullname
-    "${swig_generated_file_fullname}${SWIG_MODULE_${name}_LANGUAGE}_wrap")
-
-  if(swig_source_file_cplusplus)
-    set(swig_generated_file_fullname
-      "${swig_generated_file_fullname}.${SWIG_CXX_EXTENSION}")
-  else()
-    set(swig_generated_file_fullname
-      "${swig_generated_file_fullname}.c")
-  endif()
-
-  # Shut up some warnings from poor SWIG code generation that we
-  # can do nothing about, when this flag is available
-  include(CheckCXXCompilerFlag)
-  check_cxx_compiler_flag("-Wno-unused-but-set-variable" HAVE_WNO_UNUSED_BUT_SET_VARIABLE)
-  if(HAVE_WNO_UNUSED_BUT_SET_VARIABLE)
-    set_source_files_properties(${swig_generated_file_fullname}
-      PROPERTIES COMPILE_FLAGS "-Wno-unused-but-set-variable")
-  endif(HAVE_WNO_UNUSED_BUT_SET_VARIABLE)
-
-  get_directory_property(cmake_include_directories INCLUDE_DIRECTORIES)
-  set(swig_include_dirs)
-  foreach(it ${cmake_include_directories})
-    set(swig_include_dirs ${swig_include_dirs} "-I${it}")
-  endforeach()
-
-  set(swig_special_flags)
-  # default is c, so add c++ flag if it is c++
-  if(swig_source_file_cplusplus)
-    set(swig_special_flags ${swig_special_flags} "-c++")
-  endif()
-  set(swig_extra_flags)
-  if(SWIG_MODULE_${name}_EXTRA_FLAGS)
-    set(swig_extra_flags ${swig_extra_flags} ${SWIG_MODULE_${name}_EXTRA_FLAGS})
-  endif()
-
-  # hack to work around CMake bug in add_custom_command with multiple OUTPUT files
-
-  file(RELATIVE_PATH reldir ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR})
-  execute_process(
-    COMMAND ${PYTHON_EXECUTABLE} -c "import re, hashlib
-unique = hashlib.md5('${reldir}${ARGN}').hexdigest()[:5]
-print(re.sub('\\W', '_', '${name} ${reldir} ' + unique))"
-    OUTPUT_VARIABLE _target OUTPUT_STRIP_TRAILING_WHITESPACE
-  )
-
-  file(
-    WRITE ${CMAKE_CURRENT_BINARY_DIR}/${_target}.cpp.in
-   "int main(void){return 0;}\n"
-  )
-
-  # create dummy dependencies
-  add_custom_command(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_target}.cpp
-    COMMAND ${CMAKE_COMMAND} -E copy
-        ${CMAKE_CURRENT_BINARY_DIR}/${_target}.cpp.in
-        ${CMAKE_CURRENT_BINARY_DIR}/${_target}.cpp
-    DEPENDS "${swig_source_file_fullname}" ${SWIG_MODULE_${name}_EXTRA_DEPS}
-    COMMENT ""
-  )
-
-  # create the dummy target
-  add_executable(${_target} ${CMAKE_CURRENT_BINARY_DIR}/${_target}.cpp)
-
-  # add a custom command to the dummy target
-  add_custom_command(
-    TARGET ${_target}
-    # Let's create the ${swig_outdir} at execution time, in case dir contains $(OutDir)
-    COMMAND ${CMAKE_COMMAND} -E make_directory ${swig_outdir}
-    COMMAND "${SWIG_EXECUTABLE}"
-    ARGS "-${SWIG_MODULE_${name}_SWIG_LANGUAGE_FLAG}"
-    ${swig_source_file_flags}
-    ${CMAKE_SWIG_FLAGS}
-    -outdir ${swig_outdir}
-    ${swig_special_flags}
-    ${swig_extra_flags}
-    ${swig_include_dirs}
-    -o "${swig_generated_file_fullname}"
-    "${swig_source_file_fullname}"
-    COMMENT "Swig source"
-  )
-
-  #add dummy independent dependencies from the _target to each file
-  #that will be generated by the SWIG command above
-
-  set(${outfiles} "${swig_generated_file_fullname}" ${swig_extra_generated_files})
-
-  foreach(swig_gen_file ${${outfiles}})
-    add_custom_command(
-      OUTPUT ${swig_gen_file}
-      COMMAND ""
-      DEPENDS ${_target}
-      COMMENT ""
-    )
-  endforeach()
-
-  set_source_files_properties(
-    ${outfiles} PROPERTIES GENERATED 1
-  )
-
-endmacro()
-
-#
-# Create Swig module
-#
-macro(SWIG_ADD_MODULE name language)
-  SWIG_MODULE_INITIALIZE(${name} ${language})
-  set(swig_dot_i_sources)
-  set(swig_other_sources)
-  foreach(it ${ARGN})
-    if(${it} MATCHES ".*\\.i$")
-      set(swig_dot_i_sources ${swig_dot_i_sources} "${it}")
-    else()
-      set(swig_other_sources ${swig_other_sources} "${it}")
-    endif()
-  endforeach()
-
-  set(swig_generated_sources)
-  foreach(it ${swig_dot_i_sources})
-    SWIG_ADD_SOURCE_TO_MODULE(${name} swig_generated_source ${it})
-    set(swig_generated_sources ${swig_generated_sources} "${swig_generated_source}")
-  endforeach()
-  get_directory_property(swig_extra_clean_files ADDITIONAL_MAKE_CLEAN_FILES)
-  set_directory_properties(PROPERTIES
-    ADDITIONAL_MAKE_CLEAN_FILES "${swig_extra_clean_files};${swig_generated_sources}")
-  add_library(${SWIG_MODULE_${name}_REAL_NAME}
-    MODULE
-    ${swig_generated_sources}
-    ${swig_other_sources})
-  string(TOLOWER "${language}" swig_lowercase_language)
-  if ("${swig_lowercase_language}" STREQUAL "java")
-    if (APPLE)
-        # In java you want:
-        #      System.loadLibrary("LIBRARY");
-        # then JNI will look for a library whose name is platform dependent, namely
-        #   MacOS  : libLIBRARY.jnilib
-        #   Windows: LIBRARY.dll
-        #   Linux  : libLIBRARY.so
-        set_target_properties (${SWIG_MODULE_${name}_REAL_NAME} PROPERTIES SUFFIX ".jnilib")
-      endif ()
-  endif ()
-  if ("${swig_lowercase_language}" STREQUAL "python")
-    # this is only needed for the python case where a _modulename.so is generated
-    set_target_properties(${SWIG_MODULE_${name}_REAL_NAME} PROPERTIES PREFIX "")
-    # Python extension modules on Windows must have the extension ".pyd"
-    # instead of ".dll" as of Python 2.5.  Older python versions do support
-    # this suffix.
-    # http://docs.python.org/whatsnew/ports.html#SECTION0001510000000000000000
-    # <quote>
-    # Windows: .dll is no longer supported as a filename extension for extension modules.
-    # .pyd is now the only filename extension that will be searched for.
-    # </quote>
-    if(WIN32 AND NOT CYGWIN)
-      set_target_properties(${SWIG_MODULE_${name}_REAL_NAME} PROPERTIES SUFFIX ".pyd")
-    endif()
-  endif ()
-endmacro()
-
-#
-# Like TARGET_LINK_LIBRARIES but for swig modules
-#
-macro(SWIG_LINK_LIBRARIES name)
-  if(SWIG_MODULE_${name}_REAL_NAME)
-    target_link_libraries(${SWIG_MODULE_${name}_REAL_NAME} ${ARGN})
-  else()
-    message(SEND_ERROR "Cannot find Swig library \"${name}\".")
-  endif()
-endmacro()
--- a/docs/doxygen/Doxyfile.in
+++ b/docs/doxygen/Doxyfile.in
@@ -261,6 +261,22 @@ SUBGROUPING            = YES

 TYPEDEF_HIDES_STRUCT   = NO

+# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to 
+# determine which symbols to keep in memory and which to flush to disk.
+# When the cache is full, less often used symbols will be written to disk.
+# For small to medium size projects (<1000 input files) the default value is 
+# probably good enough. For larger projects a too small cache size can cause 
+# doxygen to be busy swapping symbols to and from disk most of the time 
+# causing a significant performance penality. 
+# If the system has enough physical memory increasing the cache will improve the 
+# performance by keeping more symbols in memory. Note that the value works on 
+# a logarithmic scale so increasing the size by one will rougly double the 
+# memory usage. The cache size is given by this formula: 
+# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, 
+# corresponding to a cache size of 2^16 = 65536 symbols
+
+SYMBOL_CACHE_SIZE      = 4
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -439,6 +455,12 @@ MAX_INITIALIZER_LINES  = 30

 SHOW_USED_FILES        = YES

+# If the sources in your project are distributed over multiple directories 
+# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
+# in the documentation. The default is NO.
+
+SHOW_DIRECTORIES       = NO
+
 # Set the SHOW_FILES tag to NO to disable the generation of the Files page.
 # This will remove the Files entry from the Quick Index and from the 
 # Folder Tree View (if specified). The default is YES.
@@ -785,6 +807,12 @@ HTML_FOOTER            =

 HTML_STYLESHEET        = 

+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
+# files or namespaces will be aligned in HTML using tables. If set to 
+# NO a bullet list will be used.
+
+HTML_ALIGN_MEMBERS     = YES
+
 # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML 
 # documentation will contain sections that can be hidden and shown after the 
 # page has loaded. For this to work a browser that supports 
@@ -1099,6 +1127,18 @@ GENERATE_XML           = @enable_xml_docs@

 XML_OUTPUT             = xml

+# The XML_SCHEMA tag can be used to specify an XML schema, 
+# which can be used by a validating XML parser to check the 
+# syntax of the XML files.
+
+XML_SCHEMA             = 
+
+# The XML_DTD tag can be used to specify an XML DTD, 
+# which can be used by a validating XML parser to check the 
+# syntax of the XML files.
+
+XML_DTD                = 
+
 # If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
 # dump the program listings (including syntax highlighting 
 # and cross-referencing information) to the XML output. Note that 
@@ -1304,7 +1344,7 @@ HAVE_DOT               = @HAVE_DOT@
 # DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory 
 # containing the font.

-#DOT_FONTNAME           = FreeSans
+DOT_FONTNAME           = FreeSans

 # The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. 
 # The default size is 10pt.
--- a/include/gr_air_modes/CMakeLists.txt
+++ b/include/gr_air_modes/CMakeLists.txt
@@ -21,9 +21,9 @@
 # Install public header files
 ########################################################################
 install(FILES
-    preamble.h
-    slicer.h
-    types.h
-    api.h
-    DESTINATION include/gr_air_modes
+    air_modes_preamble.h
+    air_modes_slicer.h
+    air_modes_types.h
+    air_modes_api.h
+    DESTINATION include/gr-air-modes
 )
--- a/include/gr_air_modes/api.h
+++ b/include/gr_air_modes/api.h
--- a/include/air_modes_int_and_dump.h
+++ b/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 */
--- a/include/air_modes_preamble.h
+++ b/include/air_modes_preamble.h
@@ -0,0 +1,66 @@
+/*
+# 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 <gnuradio/block.h>
+#include <air_modes_api.h>
+
+class air_modes_preamble;
+typedef boost::shared_ptr<air_modes_preamble> air_modes_preamble_sptr;
+
+AIR_MODES_API air_modes_preamble_sptr air_make_modes_preamble(int channel_rate, float threshold_db);
+
+/*!
+ * \brief mode select preamble detection
+ * \ingroup block
+ */
+class AIR_MODES_API 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);
+
+    void set_rate(int channel_rate);
+    void set_threshold(float threshold_db);
+    float get_threshold(void);
+};
+
+#endif /* INCLUDED_AIR_MODES_PREAMBLE_H */
--- a/include/air_modes_slicer.h
+++ b/include/air_modes_slicer.h
@@ -1,5 +1,5 @@
 /*
-# Copyright 2013 Nick Foster
+# Copyright 2010 Nick Foster
 # 
 # This file is part of gr-air-modes
 # 
@@ -20,20 +20,28 @@
 # 
 */

-#ifndef INCLUDED_AIR_MODES_SLICER_IMPL_H
-#define INCLUDED_AIR_MODES_SLICER_IMPL_H
+#ifndef INCLUDED_AIR_MODES_slicer_H
+#define INCLUDED_AIR_MODES_slicer_H

 #include <gnuradio/sync_block.h>
 #include <gnuradio/msg_queue.h>
-#include <gr_air_modes/api.h>
-#include <gr_air_modes/slicer.h>
+#include <air_modes_api.h>

-namespace gr {
-namespace air_modes {
+class air_modes_slicer;
+typedef boost::shared_ptr<air_modes_slicer> air_modes_slicer_sptr;

-class AIR_MODES_API slicer_impl : public slicer
+AIR_MODES_API 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_API 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;
@@ -42,14 +50,9 @@ private:
    std::ostringstream d_payload;

 public:
-    slicer_impl(gr::msg_queue::sptr queue);
-
    int work (int noutput_items,
              gr_vector_const_void_star &input_items,
              gr_vector_void_star &output_items);
 };

-} //namespace air_modes
-} //namespace gr
-
-#endif /* INCLUDED_AIR_MODES_SLICER_IMPL_H */
+#endif /* INCLUDED_AIR_MODES_slicer_H */
--- a/include/gr_air_modes/types.h
+++ b/include/gr_air_modes/types.h
--- a/include/gr_air_modes/preamble.h
+++ b/include/gr_air_modes/preamble.h
@@ -1,51 +0,0 @@
-/*
-# Copyright 2013 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 <gnuradio/block.h>
-#include <gr_air_modes/api.h>
-
-namespace gr {
-namespace air_modes {
-
-/*!
- * \brief mode select preamble detection
- * \ingroup block
- */
-class AIR_MODES_API preamble : virtual public gr::block
-{
-public:
-    typedef boost::shared_ptr<preamble> sptr;
-    static sptr make(int channel_rate, float threshold_db);
-
-    virtual void set_rate(int channel_rate) = 0;
-    virtual void set_threshold(float threshold_db) = 0;
-    virtual int get_rate(void) = 0;
-    virtual float get_threshold(void) = 0;
-};
-
-} // namespace air_modes
-} // namespace gr
-
-#endif /* INCLUDED_AIR_MODES_PREAMBLE_H */
--- a/include/gr_air_modes/slicer.h
+++ b/include/gr_air_modes/slicer.h
@@ -1,47 +0,0 @@
-/*
-# Copyright 2013 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 <gnuradio/block.h>
-#include <gr_air_modes/api.h>
-#include <gnuradio/msg_queue.h>
-
-namespace gr {
-namespace air_modes {
-
-/*!
- * \brief mode select slicer
- * \ingroup block
- */
-class AIR_MODES_API slicer : virtual public gr::sync_block
-{
-public:
-    typedef boost::shared_ptr<slicer> sptr;
-    static sptr make(gr::msg_queue::sptr queue);
-};
-
-} //namespace air_modes
-} //namespace gr
-
-#endif /* INCLUDED_AIR_MODES_SLICER_H */
--- a/include/gr_air_modes/modes_crc.h
+++ b/include/gr_air_modes/modes_crc.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_MODES_CRC_H
 #define INCLUDED_MODES_CRC_H
 extern const unsigned int modes_crc_table[112];
-unsigned int modes_check_crc(unsigned char data[], int length);
+int modes_check_crc(unsigned char data[], int length);
 bruteResultTypeDef modes_ec_brute(modes_packet &err_packet);
 unsigned next_set_of_n_elements(unsigned x);

--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -23,8 +23,8 @@
 include(GrPlatform) #define LIB_SUFFIX

 add_library(air_modes SHARED
-    preamble_impl.cc
-    slicer_impl.cc
+    air_modes_preamble.cc
+    air_modes_slicer.cc
    modes_crc.cc
 )
 target_link_libraries(air_modes ${Boost_LIBRARIES} ${GNURADIO_RUNTIME_LIBRARIES})
--- a/lib/air_modes_int_and_dump.cc
+++ b/lib/air_modes_int_and_dump.cc
@@ -0,0 +1,89 @@
+/*
+# 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.
+# 
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <air_modes_int_and_dump.h>
+#include <gr_io_signature.h>
+#include <string.h>
+#include <iostream>
+
+air_modes_int_and_dump_sptr air_make_modes_int_and_dump(int samples_per_symbol)
+{
+	return air_modes_int_and_dump_sptr (new air_modes_int_and_dump(samples_per_symbol));
+}
+
+air_modes_int_and_dump::air_modes_int_and_dump(int samps_per_chip) :
+    gr_block ("modes_int_and_dump",
+                   gr_make_io_signature (1, 1, sizeof(float)),
+                   gr_make_io_signature (1, 1, sizeof(float)))
+{
+    d_samples_per_symbol = samples_per_symbol;
+	set_output_multiple(d_samples_per_symbol);
+    set_history(d_samples_per_symbol);
+    
+    d_acc = 0;
+    d_pos = 0;
+}
+
+int air_modes_int_and_dump::general_work(int noutput_items,
+                          gr_vector_int &ninput_items,
+                          gr_vector_const_void_star &input_items,
+		                  gr_vector_void_star &output_items)
+{
+	const float *in = (const float *) input_items[0];
+	float *out = (float *) output_items[0];
+
+    int input_items = std::min(ninput_items[0], ninput_items[1]); //just in case
+
+    //ok first of all we look for "preamble_found" tags in our input range.
+    //get a vector of these tags, then every time we hit one
+    //reset the integrator position and accumulator
+    std::vector<pmt::pmt_t> tags;
+	uint64_t abs_sample_cnt = nitems_read(0);
+	get_tags_in_range(tags, 0, abs_sample_cnt, abs_sample_cnt + ninput_items, pmt::pmt_string_to_symbol("preamble_found"));
+
+    int out_items = 0;
+
+    int offset = gr_tags::get_nitems(&tags[0]) - abs_sample_cnt;
+
+    for(int i=0; i<120*2; i++) { //for each symbol in a potential long packet
+        out[out_items] = 0;
+        for(int j=0; j<d_samples_per_symbol; j++) { //for each sample in the symbol
+            out[out_items] += in[offset+i+j]; //integrate
+        }
+        out_items++;
+    }
+
+    //insert tag here
+    add_item_tag(0, //stream ID
+                 nitems_written(0), //sample number
+                 pmt::pmt_string_to_symbol("preamble_found");
+                 pmt::PMT_T,
+                 pmt::pmt_string_to_symbol(unique_id());
+                );
+
+    consume_each(wat);
+    return out_items;
+}
--- a/lib/air_modes_preamble.cc
+++ b/lib/air_modes_preamble.cc
@@ -0,0 +1,216 @@
+/*
+# Copyright 2010 Nick Foster
+# Copyright 2013 Nicholas Corgan
+# 
+# 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.
+# 
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <ciso646>
+#include <air_modes_preamble.h>
+#include <gnuradio/io_signature.h>
+#include <string.h>
+#include <iostream>
+#include <gnuradio/tags.h>
+
+air_modes_preamble_sptr air_make_modes_preamble(int channel_rate, float threshold_db)
+{
+	return air_modes_preamble_sptr (new air_modes_preamble(channel_rate, threshold_db));
+}
+
+air_modes_preamble::air_modes_preamble(int channel_rate, float threshold_db) :
+        gr::block ("modes_preamble",
+	       gr::io_signature::make2 (2, 2, sizeof(float), sizeof(float)), //stream 0 is received data, stream 1 is moving average for reference
+	       gr::io_signature::make (1, 1, sizeof(float))) //the output packets
+{
+	d_chip_rate = 2000000; //2Mchips per second
+	d_samples_per_chip = channel_rate / d_chip_rate; //must be integer number of samples per chip to work
+	d_samples_per_symbol = d_samples_per_chip * 2;
+	d_check_width = 120 * d_samples_per_symbol; //only search to this far from the end of the stream buffer
+	d_threshold_db = threshold_db;
+	d_threshold = powf(10., threshold_db/20.); //the level that the sample must be above the moving average in order to qualify as a pulse
+	d_secs_per_sample = 1.0 / channel_rate;
+	set_output_multiple(1+d_check_width*2);
+	
+	std::stringstream str;
+	str << name() << unique_id();
+	d_me = pmt::string_to_symbol(str.str());
+	d_key = pmt::string_to_symbol("preamble_found");
+	set_history(d_samples_per_symbol);
+}
+
+static void integrate_and_dump(float *out, const float *in, int chips, int samps_per_chip) {
+	for(int i=0; i<chips; i++) {
+		float acc = 0;
+		for(int j=0; j<samps_per_chip; j++) {
+			acc += in[i*samps_per_chip+j];
+		}
+		out[i] = acc;
+	}
+}
+
+//the preamble pattern in bits
+//fixme goes in .h
+static const bool preamble_bits[] = {1, 0, 1, 0, 0, 0, 0, 1, 0, 1};
+static double correlate_preamble(const float *in, int samples_per_chip) {
+	double corr = 0.0;
+	for(int i=0; i<10; i++) {
+		for(int j=0; j<samples_per_chip;j++)
+			if(preamble_bits[i]) corr += in[i*samples_per_chip+j];
+	}
+	return corr;
+}
+
+//todo: make it return a pair of some kind, otherwise you can lose precision
+static double tag_to_timestamp(gr::tag_t tstamp, uint64_t abs_sample_cnt, double secs_per_sample) {
+	uint64_t ts_sample, last_whole_stamp;
+	double last_frac_stamp;
+
+	if(tstamp.key == NULL || pmt::symbol_to_string(tstamp.key) != "rx_time") return 0;
+
+	last_whole_stamp = pmt::to_uint64(pmt::tuple_ref(tstamp.value, 0));
+	last_frac_stamp = pmt::to_double(pmt::tuple_ref(tstamp.value, 1));
+	ts_sample = tstamp.offset;
+	
+	double tstime = double(abs_sample_cnt * secs_per_sample) + last_whole_stamp + last_frac_stamp;
+	if(0) std::cout << "HEY WE GOT A STAMP AT " << tstime << " TICKS AT SAMPLE " << ts_sample << " ABS SAMPLE CNT IS " << abs_sample_cnt << std::endl;
+	return tstime;
+}
+
+int air_modes_preamble::general_work(int noutput_items,
+						  gr_vector_int &ninput_items,
+                          gr_vector_const_void_star &input_items,
+		                  gr_vector_void_star &output_items)
+{
+	const float *in = (const float *) input_items[0];
+	const float *inavg = (const float *) input_items[1];
+
+	int mininputs = std::min(ninput_items[0], ninput_items[1]); //they should be matched but let's be safe
+	//round number of input samples down to nearest d_samples_per_chip
+	//we also subtract off d_samples_per_chip to allow the bit center finder some leeway
+	const int ninputs = std::max(mininputs - (mininputs % d_samples_per_chip) - d_samples_per_chip, 0);
+	if (ninputs <= 0) { consume_each(0); return 0; }
+	
+	float *out = (float *) output_items[0];
+
+	if(0) std::cout << "Preamble called with " << ninputs << " samples" << std::endl;
+
+	//fixme move into .h
+	const int pulse_offsets[4] = {    0,
+	                              int(2 * d_samples_per_chip),
+	                              int(7 * d_samples_per_chip),
+	                              int(9 * d_samples_per_chip)
+	                             };
+
+	uint64_t abs_sample_cnt = nitems_read(0);
+	std::vector<gr::tag_t> tstamp_tags;
+	get_tags_in_range(tstamp_tags, 0, abs_sample_cnt, abs_sample_cnt + ninputs, pmt::string_to_symbol("rx_time"));
+	//tags.back() is the most recent timestamp, then.
+	if(tstamp_tags.size() > 0) {
+		d_timestamp = tstamp_tags.back();
+	}
+	
+	for(int i=0; i < ninputs; i++) {
+		float pulse_threshold = inavg[i] * d_threshold;
+		if(in[i] > pulse_threshold) { //hey we got a candidate
+			if(in[i+1] > in[i]) continue; //wait for the peak
+			//check to see the rest of the pulses are there
+			if( in[i+pulse_offsets[1]] < pulse_threshold ) continue;
+			if( in[i+pulse_offsets[2]] < pulse_threshold ) continue;
+			if( in[i+pulse_offsets[3]] < pulse_threshold ) continue;
+
+			//get a more accurate bit center by finding the correlation peak across all four preamble bits
+			bool late, early;
+			int how_late = 0;
+			do {
+				double now_corr = correlate_preamble(in+i, d_samples_per_chip);
+				double late_corr = correlate_preamble(in+i+1, d_samples_per_chip);
+				double early_corr = correlate_preamble(in+i-1, d_samples_per_chip);
+				late = (late_corr > now_corr);
+				//early = (early_corr > now_corr);
+				if(late) { i++; how_late++; }
+				//if(early && i>0) { std::cout << "EARLY " << i << std::endl; i--; }
+			} while(late and how_late < d_samples_per_chip);// xor early);
+
+			if(0) std::cout << "We were " << how_late << " samples late" << std::endl;
+
+			//now check to see that the non-peak symbols in the preamble
+			//are below the peaks by threshold dB
+			float avgpeak = ( in[i+pulse_offsets[0]]
+			                + in[i+pulse_offsets[1]]
+			                + in[i+pulse_offsets[2]]
+			                + in[i+pulse_offsets[3]]) / 4.0;
+
+			float space_threshold = inavg[i] + (avgpeak - inavg[i])/d_threshold;
+			bool valid_preamble = true; //f'in c++
+			for( int j=1.5*d_samples_per_symbol; j<=3*d_samples_per_symbol; j++)
+				if(in[i+j] > space_threshold) valid_preamble = false;
+			for( int j=5*d_samples_per_symbol; j<=7.5*d_samples_per_symbol; j++)
+				if(in[i+j] > space_threshold) valid_preamble = false;
+			if(!valid_preamble) continue;
+
+			//be sure we've got enough room in the input buffer to copy out a whole packet
+			if(ninputs-i < 240*d_samples_per_chip) {
+				consume_each(std::max(i-1,0));
+				if(0) std::cout << "Preamble consumed " << std::max(i-1,0) << ", returned 0 (no room)" << std::endl;
+				return 0;
+			}
+
+			//all right i'm prepared to call this a preamble			
+			//let's integrate and dump the output
+			//FIXME: disable and use center sample
+			bool life_sucks = true;
+			if(life_sucks) {
+				for(int j=0; j<240; j++) {
+					out[j] = in[i+j*d_samples_per_chip];
+				}
+			} else {
+				i -= d_samples_per_chip-1;
+				integrate_and_dump(out, &in[i], 240, d_samples_per_chip);
+			}
+
+			//get the timestamp of the preamble
+			double tstamp = tag_to_timestamp(d_timestamp, abs_sample_cnt + i, d_secs_per_sample);
+
+			//now tag the preamble
+			add_item_tag(0, //stream ID
+					 nitems_written(0), //sample
+					 d_key,      //frame_info
+			         pmt::from_double(tstamp),
+			         d_me        //block src id
+			        );
+					 
+			//std::cout << "PREAMBLE" << std::endl;
+			
+			//produce only one output per work call -- TODO this should probably change
+			if(0) std::cout << "Preamble consumed " << i+240*d_samples_per_chip << "with i=" << i << ", returned 240" << std::endl;
+
+			consume_each(i+240*d_samples_per_chip);
+			return 240;
+		}
+	}
+	
+	//didn't get anything this time
+	if(0) std::cout << "Preamble consumed " << ninputs << ", returned 0" << std::endl;
+	consume_each(ninputs);
+	return 0;
+}
--- a/lib/air_modes_slicer.cc
+++ b/lib/air_modes_slicer.cc
@@ -0,0 +1,197 @@
+/*
+# Copyright 2010 Nick Foster
+# Copyright 2013 Nicholas Corgan
+# 
+# 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.
+# 
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <ciso646>
+#include <air_modes_slicer.h>
+#include <gnuradio/io_signature.h>
+#include <air_modes_types.h>
+#include <sstream>
+#include <iomanip>
+#include <modes_crc.h>
+#include <iostream>
+#include <gnuradio/tags.h>
+
+extern "C"
+{
+#include <stdio.h>
+#include <string.h>
+}
+
+air_modes_slicer_sptr air_make_modes_slicer(int channel_rate, gr::msg_queue::sptr queue)
+{
+	return air_modes_slicer_sptr (new air_modes_slicer(channel_rate, queue));
+}
+
+air_modes_slicer::air_modes_slicer(int channel_rate, gr::msg_queue::sptr queue) :
+  gr::sync_block ("modes_slicer",
+		  gr::io_signature::make (1, 1, sizeof(float)), //stream 0 is received data, stream 1 is binary preamble detector output
+                  gr::io_signature::make (0, 0, 0) )
+{
+	//initialize private data here
+	d_chip_rate = 2000000; //2Mchips per second
+	d_samples_per_chip = 2;//FIXME this is constant now channel_rate / d_chip_rate;
+	d_samples_per_symbol = d_samples_per_chip * 2;
+	d_check_width = 120 * d_samples_per_symbol; //how far you will have to look ahead
+	d_queue = queue;
+
+	set_output_multiple(d_check_width*2); //how do you specify buffer size for sinks?
+}
+
+//this slicer is courtesy of Lincoln Labs. supposedly it is more resistant to mode A/C FRUIT.
+//see http://adsb.tc.faa.gov/WG3_Meetings/Meeting8/Squitter-Lon.pdf
+static slice_result_t slicer(const float bit0, const float bit1, const float ref) {
+	slice_result_t result;
+
+	//3dB limits for bit slicing and confidence measurement
+	float highlimit=ref*1.414;
+	float lowlimit=ref*0.707;
+	
+	bool firstchip_inref  = ((bit0 > lowlimit) && (bit0 < highlimit));
+	bool secondchip_inref = ((bit1 > lowlimit) && (bit1 < highlimit));
+
+	if(firstchip_inref && !secondchip_inref) {
+		result.decision = 1;
+		result.confidence = 1;
+	}
+	else if(secondchip_inref && !firstchip_inref) {
+		result.decision = 0;
+		result.confidence = 1;
+	} 
+	else if(firstchip_inref && secondchip_inref) {
+		result.decision = bit0 > bit1;
+		result.confidence = 0;
+	}
+	else {//if(!firstchip_inref && !secondchip_inref) {
+		result.decision = bit0 > bit1;
+		if(result.decision) {
+			if(bit1 < lowlimit * 0.5) result.confidence = 1;
+			else result.confidence = 0;
+		} else {
+			if(bit0 < lowlimit * 0.5) result.confidence = 1;
+			else result.confidence = 0;
+		}
+	}
+	return result;
+}
+
+int air_modes_slicer::work(int noutput_items,
+                          gr_vector_const_void_star &input_items,
+		                  gr_vector_void_star &output_items)
+{
+	const float *in = (const float *) input_items[0];
+	int size = noutput_items - d_check_width; //since it's a sync block, i assume that it runs with ninput_items = noutput_items
+
+	if(0) std::cout << "Slicer called with " << size << " samples" << std::endl;
+	
+	std::vector<gr::tag_t> tags;
+	uint64_t abs_sample_cnt = nitems_read(0);
+	get_tags_in_range(tags, 0, abs_sample_cnt, abs_sample_cnt + size, pmt::string_to_symbol("preamble_found"));
+	std::vector<gr::tag_t>::iterator tag_iter;
+
+	for(tag_iter = tags.begin(); tag_iter != tags.end(); tag_iter++) {
+		uint64_t i = tag_iter->offset - abs_sample_cnt;
+		modes_packet rx_packet;
+
+		memset(&rx_packet.data, 0x00, 14 * sizeof(unsigned char));
+		memset(&rx_packet.lowconfbits, 0x00, 24 * sizeof(unsigned char));
+		rx_packet.numlowconf = 0;
+
+		//let's use the preamble to get a reference level for the packet
+		//fixme: a better thing to do is create a bi-level avg 1 and avg 0
+		//through simple statistics, then take the median for your slice level
+		//this won't improve decoding but will improve confidence
+		rx_packet.reference_level = (in[i]
+								   + in[i+2]
+								   + in[i+7]
+								   + in[i+9]) / 4.0;
+
+		i += 16; //move on up to the first bit of the packet data
+		//now let's slice the header so we can determine if it's a short pkt or a long pkt
+		unsigned char pkt_hdr = 0;
+		for(int j=0; j < 5; j++) {
+			slice_result_t slice_result = slicer(in[i+j*2], in[i+j*2+1], rx_packet.reference_level);
+			if(slice_result.decision) pkt_hdr += 1 << (4-j);
+		}
+		if(pkt_hdr == 16 or pkt_hdr == 17 or pkt_hdr == 20 or pkt_hdr == 21) rx_packet.type = Long_Packet;
+		else rx_packet.type = Short_Packet;
+		int packet_length = (rx_packet.type == framer_packet_type(Short_Packet)) ? 56 : 112;
+
+		//it's slice time!
+		//TODO: don't repeat your work here, you already have the first 5 bits
+		for(int j = 0; j < packet_length; j++) {
+			slice_result_t slice_result = slicer(in[i+j*2], in[i+j*2+1], rx_packet.reference_level);
+
+			//put the data into the packet
+			if(slice_result.decision) {
+				rx_packet.data[j/8] += 1 << (7-(j%8));
+			}
+			//put the confidence decision into the packet
+			if(slice_result.confidence) {
+				//rx_packet.confidence[j/8] += 1 << (7-(j%8));
+			} else {
+				if(rx_packet.numlowconf < 24) rx_packet.lowconfbits[rx_packet.numlowconf++] = j;
+			}
+		}
+			
+		/******************** BEGIN TIMESTAMP BS ******************/
+		rx_packet.timestamp = pmt::to_double(tag_iter->value);
+		/******************* END TIMESTAMP BS *********************/
+			
+		//increment for the next round
+
+		//here you might want to traverse the whole packet and if you find all 0's, just toss it. don't know why these packets turn up, but they pass ECC.
+		bool zeroes = 1;
+		for(int m = 0; m < 14; m++) {
+			if(rx_packet.data[m]) zeroes = 0;
+		}
+		if(zeroes) {continue;} //toss it
+
+		rx_packet.message_type = (rx_packet.data[0] >> 3) & 0x1F; //get the message type to make decisions on ECC methods
+
+		if(rx_packet.type == Short_Packet && rx_packet.message_type != 11 && rx_packet.numlowconf > 0) {continue;}
+		if(rx_packet.message_type == 11 && rx_packet.numlowconf >= 10) {continue;}
+			
+		rx_packet.crc = modes_check_crc(rx_packet.data, packet_length);
+
+		//crc for packets that aren't type 11 or type 17 is encoded with the transponder ID, which we don't know
+		//therefore we toss 'em if there's syndrome
+		//crc for the other short packets is usually nonzero, so they can't really be trusted that far
+		if(rx_packet.crc && (rx_packet.message_type == 11 || rx_packet.message_type == 17)) {continue;}
+
+		d_payload.str("");
+		for(int m = 0; m < packet_length/8; m++) {
+			d_payload << std::hex << std::setw(2) << std::setfill('0') << unsigned(rx_packet.data[m]);
+		}
+
+		d_payload << " " << std::setw(6) << rx_packet.crc << " " << std::dec << rx_packet.reference_level
+		          << " " << std::setprecision(10) << std::setw(10) << rx_packet.timestamp;
+		gr::message::sptr msg = gr::message::make_from_string(std::string(d_payload.str()));
+		d_queue->handle(msg);
+	}
+	if(0) std::cout << "Slicer consumed " << size << ", returned " << size << std::endl;
+	return size;
+}
--- a/lib/modes_crc.cc
+++ b/lib/modes_crc.cc
@@ -1,63 +1,165 @@
 /*
- * Copyright 2013 Nick Foster
+ * Copyright 2007 Free Software Foundation, Inc.
 *
- * This file is part of gr-air-modes
+ * This file is part of GNU Radio
 *
- * gr-air-modes is free software; you can redistribute it and/or modify
+ * 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 2, or (at your option)
 * any later version.
 *
- * gr-air-modes is distributed in the hope that it will be useful,
+ * 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 gr-air-modes; see the file COPYING.  If not, write to
+ * 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.
 */

+//this is copied almost verbatim from Eric Cottrell's gr-air platform.

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

 #include <stdio.h>
-#include <gr_air_modes/types.h>
-#include <gr_air_modes/modes_crc.h>
+#include <air_modes_types.h>
+#include <modes_crc.h>
 #include <math.h>
 #include <stdlib.h>

-unsigned int crc_table[256];
-const unsigned int POLY=0xFFF409;
-
-//generate a bytewise lookup CRC table
-
-void generate_crc_table(void)
+/*  Mode S Parity Table
+ *   Index is bit position with bit 0 being the first bit after preamble
+ *   On short frames an offset of 56 is used.
+*/
+const unsigned int modes_crc_table[112] =
 {
-    unsigned int crc = 0;
-    for(int n=0; n<256; n++) {
-        crc = n<<16;
-        for(int k=0; k<8; k++) {
-            if(crc & 0x800000) {
-                crc = ((crc<<1) ^ POLY) & 0xFFFFFF;
-            } else {
-                crc = (crc<<1) & 0xFFFFFF;
-            }
-        }
-        crc_table[n] = crc & 0xFFFFFF;
-    }
-}
+    0x3935ea,  // Start of Long Frame CRC
+    0x1c9af5,
+    0xf1b77e,
+    0x78dbbf,
+    0xc397db,
+    0x9e31e9,
+    0xb0e2f0,
+    0x587178,
+    0x2c38bc,
+    0x161c5e,
+    0x0b0e2f,
+    0xfa7d13,
+    0x82c48d,
+    0xbe9842,
+    0x5f4c21,
+    0xd05c14,
+    0x682e0a,
+    0x341705,
+    0xe5f186,
+    0x72f8c3,
+    0xc68665,
+    0x9cb936,
+    0x4e5c9b,
+    0xd8d449,
+    0x939020,
+    0x49c810,
+    0x24e408,
+    0x127204,
+    0x093902,
+    0x049c81,
+    0xfdb444,
+    0x7eda22,
+    0x3f6d11, // Extended 56 bit field
+    0xe04c8c,
+    0x702646,
+    0x381323,
+    0xe3f395,
+    0x8e03ce,
+    0x4701e7,
+    0xdc7af7,
+    0x91c77f,
+    0xb719bb,
+    0xa476d9,
+    0xadc168,
+    0x56e0b4,
+    0x2b705a,
+    0x15b82d,
+    0xf52612,
+    0x7a9309,
+    0xc2b380,
+    0x6159c0,
+    0x30ace0,
+    0x185670,
+    0x0c2b38,
+    0x06159c,
+    0x030ace,
+    0x018567,
+    0xff38b7,  // Start of Short Frame CRC
+    0x80665f,
+    0xbfc92b,
+    0xa01e91,
+    0xaff54c,
+    0x57faa6,
+    0x2bfd53,
+    0xea04ad,
+    0x8af852,
+    0x457c29,
+    0xdd4410,
+    0x6ea208,
+    0x375104,
+    0x1ba882,
+    0x0dd441,
+    0xf91024,
+    0x7c8812,
+    0x3e4409,
+    0xe0d800,
+    0x706c00,
+    0x383600,
+    0x1c1b00,
+    0x0e0d80,
+    0x0706c0,
+    0x038360,
+    0x01c1b0,
+    0x00e0d8,
+    0x00706c,
+    0x003836,
+    0x001c1b,
+    0xfff409,
+    0x800000,   // 24 PI or PA bits
+    0x400000,
+    0x200000,
+    0x100000,
+    0x080000,
+    0x040000,
+    0x020000,
+    0x010000,
+    0x008000,
+    0x004000,
+    0x002000,
+    0x001000,
+    0x000800,
+    0x000400,
+    0x000200,
+    0x000100,
+    0x000080,
+    0x000040,
+    0x000020,
+    0x000010,
+    0x000008,
+    0x000004,
+    0x000002,
+    0x000001,
+};

-//Perform a bytewise CRC check
-unsigned int modes_check_crc(unsigned char data[], int length)
+int modes_check_crc(unsigned char data[], int length)
 {
-    if(crc_table[1] != POLY) generate_crc_table();
-    unsigned int crc=0;
-    for(int i=0; i<length; i++) {
-        crc = crc_table[((crc>>16) ^ data[i]) & 0xff] ^ (crc << 8);
-    }
-    return crc & 0xFFFFFF;
+	int crc=0, i;
+	for(i = 0; i < length; i++)
+	{
+		if(data[i/8] & (1 << (7-(i%8))))
+		{
+			crc ^= modes_crc_table[i+(112-length)];
+		}
+	}
+    return crc;
 }
--- a/lib/preamble_impl.cc
+++ b/lib/preamble_impl.cc
@@ -1,227 +0,0 @@
-/*
-# Copyright 2010 Nick Foster
-# Copyright 2013 Nicholas Corgan
-# 
-# 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.
-# 
-*/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <ciso646>
-#include "preamble_impl.h"
-#include <gnuradio/io_signature.h>
-#include <string.h>
-#include <iostream>
-#include <gnuradio/tags.h>
-
-namespace gr {
-
-air_modes::preamble::sptr air_modes::preamble::make(int channel_rate, float threshold_db) {
-    return gnuradio::get_initial_sptr(new air_modes::preamble_impl(channel_rate, threshold_db));
-}
-
-air_modes::preamble_impl::preamble_impl(int channel_rate, float threshold_db) :
-        gr::block ("preamble",
-           gr::io_signature::make2 (2, 2, sizeof(float), sizeof(float)), //stream 0 is received data, stream 1 is moving average for reference
-           gr::io_signature::make (1, 1, sizeof(float))) //the output soft symbols
-{
-    d_chip_rate = 2000000; //2Mchips per second
-    set_rate(channel_rate);
-    set_threshold(threshold_db);
-
-    std::stringstream str;
-    str << name() << unique_id();
-    d_me = pmt::string_to_symbol(str.str());
-    d_key = pmt::string_to_symbol("preamble_found");
-}
-
-void air_modes::preamble_impl::set_rate(int channel_rate) {
-    d_samples_per_chip = channel_rate / d_chip_rate;
-    d_samples_per_symbol = d_samples_per_chip * 2;
-    d_check_width = 120 * d_samples_per_symbol;
-    d_secs_per_sample = 1.0/channel_rate;
-    set_output_multiple(1+d_check_width*2);
-    set_history(d_samples_per_symbol);
-}
-
-void air_modes::preamble_impl::set_threshold(float threshold_db) {
-    d_threshold_db = threshold_db;
-    d_threshold = powf(10., threshold_db/20.); //the level that the sample must be above the moving average in order to qualify as a pulse
-}
-
-float air_modes::preamble_impl::get_threshold(void) {
-    return d_threshold_db;
-}
-
-int air_modes::preamble_impl::get_rate(void) {
-    return d_samples_per_chip * d_chip_rate;
-}
-
-static void integrate_and_dump(float *out, const float *in, int chips, int samps_per_chip) {
-    for(int i=0; i<chips; i++) {
-        float acc = 0;
-        for(int j=0; j<samps_per_chip; j++) {
-            acc += in[i*samps_per_chip+j];
-        }
-        out[i] = acc;
-    }
-}
-
-//the preamble pattern in bits
-//fixme goes in .h
-static const bool preamble_bits[] = {1, 0, 1, 0, 0, 0, 0, 1, 0, 1};
-static double correlate_preamble(const float *in, int samples_per_chip) {
-    double corr = 0.0;
-    for(int i=0; i<10; i++) {
-        for(int j=0; j<samples_per_chip;j++)
-            if(preamble_bits[i]) corr += in[i*samples_per_chip+j];
-    }
-    return corr;
-}
-
-//todo: make it return a pair of some kind, otherwise you can lose precision
-static double tag_to_timestamp(gr::tag_t tstamp, uint64_t abs_sample_cnt, double secs_per_sample) {
-    uint64_t ts_sample, last_whole_stamp;
-    double last_frac_stamp;
-
-    if(tstamp.key == NULL || pmt::symbol_to_string(tstamp.key) != "rx_time") return 0;
-
-    last_whole_stamp = pmt::to_uint64(pmt::tuple_ref(tstamp.value, 0));
-    last_frac_stamp = pmt::to_double(pmt::tuple_ref(tstamp.value, 1));
-    ts_sample = tstamp.offset;
-
-    double tstime = double(abs_sample_cnt * secs_per_sample) + last_whole_stamp + last_frac_stamp;
-    if(0) std::cout << "HEY WE GOT A STAMP AT " << tstime << " TICKS AT SAMPLE " << ts_sample << " ABS SAMPLE CNT IS " << abs_sample_cnt << std::endl;
-    return tstime;
-}
-
-int air_modes::preamble_impl::general_work(int noutput_items,
-                          gr_vector_int &ninput_items,
-                          gr_vector_const_void_star &input_items,
-                          gr_vector_void_star &output_items)
-{
-    const float *in = (const float *) input_items[0];
-    const float *inavg = (const float *) input_items[1];
-
-    int mininputs = std::min(ninput_items[0], ninput_items[1]); //they should be matched but let's be safe
-    //round number of input samples down to nearest d_samples_per_chip
-    //we also subtract off d_samples_per_chip to allow the bit center finder some leeway
-    const int ninputs = std::max(mininputs - (mininputs % d_samples_per_chip) - d_samples_per_chip, 0);
-    if (ninputs <= 0) { consume_each(0); return 0; }
-
-    float *out = (float *) output_items[0];
-
-    if(0) std::cout << "Preamble called with " << ninputs << " samples" << std::endl;
-
-    //fixme move into .h
-    const int pulse_offsets[4] = {    0,
-                                  int(2 * d_samples_per_chip),
-                                  int(7 * d_samples_per_chip),
-                                  int(9 * d_samples_per_chip)
-                                 };
-
-    uint64_t abs_sample_cnt = nitems_read(0);
-    std::vector<gr::tag_t> tstamp_tags;
-    get_tags_in_range(tstamp_tags, 0, abs_sample_cnt, abs_sample_cnt + ninputs, pmt::string_to_symbol("rx_time"));
-    //tags.back() is the most recent timestamp, then.
-    if(tstamp_tags.size() > 0) {
-        d_timestamp = tstamp_tags.back();
-    }
-
-    for(int i=0; i < ninputs; i++) {
-        float pulse_threshold = inavg[i] * d_threshold;
-        if(in[i] > pulse_threshold) { //hey we got a candidate
-            if(in[i+1] > in[i]) continue; //wait for the peak
-            //check to see the rest of the pulses are there
-            if( in[i+pulse_offsets[1]] < pulse_threshold ) continue;
-            if( in[i+pulse_offsets[2]] < pulse_threshold ) continue;
-            if( in[i+pulse_offsets[3]] < pulse_threshold ) continue;
-
-            //get a more accurate bit center by finding the correlation peak across all four preamble bits
-            bool late, early;
-            int how_late = 0;
-            do {
-                double now_corr = correlate_preamble(in+i, d_samples_per_chip);
-                double late_corr = correlate_preamble(in+i+1, d_samples_per_chip);
-                double early_corr = correlate_preamble(in+i-1, d_samples_per_chip);
-                late = (late_corr > now_corr);
-                //early = (early_corr > now_corr);
-                if(late) { i++; how_late++; }
-                //if(early && i>0) { std::cout << "EARLY " << i << std::endl; i--; }
-            } while(late and how_late < d_samples_per_chip);// xor early);
-
-            if(0) std::cout << "We were " << how_late << " samples late" << std::endl;
-
-            //now check to see that the non-peak symbols in the preamble
-            //are below the peaks by threshold dB
-            float avgpeak = ( in[i+pulse_offsets[0]]
-                            + in[i+pulse_offsets[1]]
-                            + in[i+pulse_offsets[2]]
-                            + in[i+pulse_offsets[3]]) / 4.0;
-
-            float space_threshold = inavg[i] + (avgpeak - inavg[i])/d_threshold;
-            bool valid_preamble = true; //f'in c++
-            for( int j=1.5*d_samples_per_symbol; j<=3*d_samples_per_symbol; j++)
-                if(in[i+j] > space_threshold) valid_preamble = false;
-            for( int j=5*d_samples_per_symbol; j<=7.5*d_samples_per_symbol; j++)
-                if(in[i+j] > space_threshold) valid_preamble = false;
-            if(!valid_preamble) continue;
-
-            //be sure we've got enough room in the input buffer to copy out a whole packet
-            if(ninputs-i < 240*d_samples_per_chip) {
-                consume_each(std::max(i-1,0));
-                if(0) std::cout << "Preamble consumed " << std::max(i-1,0) << ", returned 0 (no room)" << std::endl;
-                return 0;
-            }
-
-            //all right i'm prepared to call this a preamble
-            for(int j=0; j<240; j++) {
-                out[j] = in[i+j*d_samples_per_chip] - inavg[i];
-            }
-
-            //get the timestamp of the preamble
-            double tstamp = tag_to_timestamp(d_timestamp, abs_sample_cnt + i, d_secs_per_sample);
-
-            //now tag the preamble
-            add_item_tag(0, //stream ID
-                     nitems_written(0), //sample
-                     d_key,      //frame_info
-                     pmt::from_double(tstamp),
-                     d_me        //block src id
-                    );
-
-            //std::cout << "PREAMBLE" << std::endl;
-
-            //produce only one output per work call -- TODO this should probably change
-            if(0) std::cout << "Preamble consumed " << i+240*d_samples_per_chip << "with i=" << i << ", returned 240" << std::endl;
-
-            consume_each(i+240*d_samples_per_chip);
-            return 240;
-        }
-    }
-
-    //didn't get anything this time
-    if(0) std::cout << "Preamble consumed " << ninputs << ", returned 0" << std::endl;
-    consume_each(ninputs);
-    return 0;
-}
-
-} //namespace gr
--- a/lib/preamble_impl.h
+++ b/lib/preamble_impl.h
@@ -1,43 +0,0 @@
-
-#ifndef _AIR_MODES_PREAMBLE_IMPL_H_
-#define _AIR_MODES_PREAMBLE_IMPL_H_
-
-#include <gnuradio/block.h>
-#include <gr_air_modes/api.h>
-#include <gr_air_modes/preamble.h>
-
-namespace gr {
-namespace air_modes {
-
-class AIR_MODES_API preamble_impl : public preamble
-{
-private:
-    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:
-    preamble_impl(int channel_rate, float threshold_db);
-
-    int general_work (int noutput_items,
-              gr_vector_int &ninput_items,
-              gr_vector_const_void_star &input_items,
-              gr_vector_void_star &output_items);
-
-    void set_rate(int channel_rate);
-    void set_threshold(float threshold_db);
-    float get_threshold(void);
-    int get_rate(void);
-};
-
-} //namespace air_modes
-} //namespace gr
-
-#endif //_AIR_MODES_PREAMBLE_IMPL_H_
--- a/lib/slicer_impl.cc
+++ b/lib/slicer_impl.cc
@@ -1,200 +0,0 @@
-/*
-# Copyright 2010 Nick Foster
-# Copyright 2013 Nicholas Corgan
-# 
-# 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.
-# 
-*/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <ciso646>
-#include "slicer_impl.h"
-#include <gnuradio/io_signature.h>
-#include <gr_air_modes/types.h>
-#include <sstream>
-#include <iomanip>
-#include <gr_air_modes/modes_crc.h>
-#include <iostream>
-#include <gnuradio/tags.h>
-
-extern "C"
-{
-#include <stdio.h>
-#include <string.h>
-}
-
-namespace gr {
-
-air_modes::slicer::sptr air_modes::slicer::make(gr::msg_queue::sptr queue) {
-    return gnuradio::get_initial_sptr(new air_modes::slicer_impl(queue));
-}
-
-air_modes::slicer_impl::slicer_impl(gr::msg_queue::sptr queue) :
-  gr::sync_block ("slicer",
-                  gr::io_signature::make (1, 1, sizeof(float)),
-                  gr::io_signature::make (0, 0, 0) )
-{
-    //initialize private data here
-    d_chip_rate = 2000000; //2Mchips per second
-    d_samples_per_chip = 2;//FIXME this is constant now channel_rate / d_chip_rate;
-    d_samples_per_symbol = d_samples_per_chip * 2;
-    d_check_width = 120 * d_samples_per_symbol; //how far you will have to look ahead
-    d_queue = queue;
-
-    set_output_multiple(d_check_width*2); //how do you specify buffer size for sinks?
-}
-
-//this slicer is courtesy of Lincoln Labs. supposedly it is more resistant to mode A/C FRUIT.
-//see http://adsb.tc.faa.gov/WG3_Meetings/Meeting8/Squitter-Lon.pdf
-static slice_result_t llslicer(const float bit0, const float bit1, const float ref) {
-    slice_result_t result;
-
-    //3dB limits for bit slicing and confidence measurement
-    float highlimit=ref*1.414;
-    float lowlimit=ref*0.707;
-
-    bool firstchip_inref  = ((bit0 > lowlimit) && (bit0 < highlimit));
-    bool secondchip_inref = ((bit1 > lowlimit) && (bit1 < highlimit));
-
-    if(firstchip_inref && !secondchip_inref) {
-        result.decision = 1;
-        result.confidence = 1;
-    }
-    else if(secondchip_inref && !firstchip_inref) {
-        result.decision = 0;
-        result.confidence = 1;
-    } 
-    else if(firstchip_inref && secondchip_inref) {
-        result.decision = bit0 > bit1;
-        result.confidence = 0;
-    }
-    else {//if(!firstchip_inref && !secondchip_inref) {
-        result.decision = bit0 > bit1;
-        if(result.decision) {
-            if(bit1 < lowlimit * 0.5) result.confidence = 1;
-            else result.confidence = 0;
-        } else {
-            if(bit0 < lowlimit * 0.5) result.confidence = 1;
-            else result.confidence = 0;
-        }
-    }
-    return result;
-}
-
-int air_modes::slicer_impl::work(int noutput_items,
-                          gr_vector_const_void_star &input_items,
-                          gr_vector_void_star &output_items)
-{
-    const float *in = (const float *) input_items[0];
-    int size = noutput_items - d_check_width; //since it's a sync block, i assume that it runs with ninput_items = noutput_items
-
-    if(0) std::cout << "Slicer called with " << size << " samples" << std::endl;
-
-    std::vector<gr::tag_t> tags;
-    uint64_t abs_sample_cnt = nitems_read(0);
-    get_tags_in_range(tags, 0, abs_sample_cnt, abs_sample_cnt + size, pmt::string_to_symbol("preamble_found"));
-    std::vector<gr::tag_t>::iterator tag_iter;
-
-    for(tag_iter = tags.begin(); tag_iter != tags.end(); tag_iter++) {
-        uint64_t i = tag_iter->offset - abs_sample_cnt;
-        modes_packet rx_packet;
-
-        memset(&rx_packet.data, 0x00, 14 * sizeof(unsigned char));
-        memset(&rx_packet.lowconfbits, 0x00, 24 * sizeof(unsigned char));
-        rx_packet.numlowconf = 0;
-
-        //let's use the preamble to get a reference level for the packet
-        //fixme: a better thing to do is create a bi-level avg 1 and avg 0
-        //through simple statistics, then take the median for your slice level
-        //this won't improve decoding but will improve confidence
-        rx_packet.reference_level = (in[i]
-                                   + in[i+2]
-                                   + in[i+7]
-                                   + in[i+9]) / 4.0;
-
-        i += 16; //move on up to the first bit of the packet data
-        //now let's slice the header so we can determine if it's a short pkt or a long pkt
-        unsigned char pkt_hdr = 0;
-        for(int j=0; j < 5; j++) {
-            slice_result_t slice_result = llslicer(in[i+j*2], in[i+j*2+1], rx_packet.reference_level);
-            if(slice_result.decision) pkt_hdr += 1 << (4-j);
-        }
-        if(pkt_hdr == 16 or pkt_hdr == 17 or pkt_hdr == 20 or pkt_hdr == 21) rx_packet.type = Long_Packet;
-        else rx_packet.type = Short_Packet;
-        int packet_length = (rx_packet.type == framer_packet_type(Short_Packet)) ? 56 : 112;
-
-        //it's slice time!
-        //TODO: don't repeat your work here, you already have the first 5 bits
-        for(int j = 0; j < packet_length; j++) {
-            slice_result_t slice_result = llslicer(in[i+j*2], in[i+j*2+1], rx_packet.reference_level);
-
-            //put the data into the packet
-            if(slice_result.decision) {
-                rx_packet.data[j/8] += 1 << (7-(j%8));
-            }
-            //put the confidence decision into the packet
-            if(slice_result.confidence) {
-                //rx_packet.confidence[j/8] += 1 << (7-(j%8));
-            } else {
-                if(rx_packet.numlowconf < 24) rx_packet.lowconfbits[rx_packet.numlowconf++] = j;
-            }
-        }
-
-        rx_packet.timestamp = pmt::to_double(tag_iter->value);
-
-        //here you might want to traverse the whole packet and if you find all 0's, just toss it. don't know why these packets turn up, but they pass ECC.
-        bool zeroes = 1;
-        for(int m = 0; m < 14; m++) {
-            if(rx_packet.data[m]) zeroes = 0;
-        }
-        if(zeroes) {continue;} //toss it
-
-        rx_packet.message_type = (rx_packet.data[0] >> 3) & 0x1F; //get the message type to make decisions on ECC methods
-
-        if(rx_packet.type == Short_Packet && rx_packet.message_type != 11 && rx_packet.numlowconf > 0) {continue;}
-        if(rx_packet.message_type == 11 && rx_packet.numlowconf >= 10) {continue;}
-
-        rx_packet.crc = modes_check_crc(rx_packet.data, (packet_length/8)-3);
-        unsigned int ap = rx_packet.data[packet_length/8-3] << 16
-                        | rx_packet.data[packet_length/8-2] << 8
-                        | rx_packet.data[packet_length/8-1] << 0;
-        rx_packet.crc ^= ap;
-
-        //crc for packets that aren't type 11 or type 17 is encoded with the transponder ID, which we don't know
-        //therefore we toss 'em if there's syndrome
-        //crc for the other short packets is usually nonzero, so they can't really be trusted that far
-        if(rx_packet.crc && (rx_packet.message_type == 11 || rx_packet.message_type == 17)) {continue;}
-
-        d_payload.str("");
-        for(int m = 0; m < packet_length/8; m++) {
-            d_payload << std::hex << std::setw(2) << std::setfill('0') << unsigned(rx_packet.data[m]);
-        }
-
-        d_payload << " " << std::setw(6) << rx_packet.crc << " " << std::dec << rx_packet.reference_level
-                  << " " << std::setprecision(10) << std::setw(10) << rx_packet.timestamp;
-        gr::message::sptr msg = gr::message::make_from_string(std::string(d_payload.str()));
-        d_queue->handle(msg);
-    }
-    if(0) std::cout << "Slicer consumed " << size << ", returned " << size << std::endl;
-    return size;
-}
-
-} //namespace gr
--- a/python/init.py
+++ b/python/init.py
@@ -51,12 +51,6 @@ from air_modes_swig import *

 # import any pure python here
 #
-
-try:
-    import zmq
-except ImportError:
-    raise RuntimeError("PyZMQ not found! Please install libzmq and PyZMQ to run gr-air-modes")
-
 from rx_path import rx_path
 from zmq_socket import zmq_pubsub_iface
 from parse import *
--- a/python/az_map.py
+++ b/python/az_map.py
@@ -27,7 +27,7 @@ import threading
 import math
 import air_modes
 from air_modes.exceptions import *
-import numpy as np
+

 # model has max range vs. azimuth in n-degree increments
 # contains separate max range for a variety of altitudes so
@@ -53,7 +53,7 @@ class az_map_model(QtCore.QObject):

    def data(self, row, col):
        return self._data[row][col]
-
+    
    def addRecord(self, bearing, altitude, distance):
        with self.lock:
            #round up to nearest altitude in altitudes list
@@ -85,15 +85,18 @@ class az_map_model(QtCore.QObject):

 # the azimuth map widget
 class az_map(QtGui.QWidget):
-    maxrange = 200
+    maxrange = 450
+    ringsize = 100
    bgcolor = QtCore.Qt.black
    ringpen =  QtGui.QPen(QtGui.QColor(0,   96,  127, 255), 1.3)
-
+    #rangepen = QtGui.QPen(QtGui.QColor(255, 255, 0,   255), 1.0)
+    
    def __init__(self, parent=None):
        super(az_map, self).__init__(parent)
        self._model = None
        self._paths = []
        self.maxrange = az_map.maxrange
+        self.ringsize = az_map.ringsize

    def minimumSizeHint(self):
        return QtCore.QSize(50, 50)
@@ -115,7 +118,7 @@ class az_map(QtGui.QWidget):

        #set background
        painter.fillRect(event.rect(), QtGui.QBrush(az_map.bgcolor))
-
+        
        #draw the range rings
        self.drawRangeRings(painter)
        for i in range(len(self._paths)):
@@ -133,12 +136,12 @@ class az_map(QtGui.QWidget):
                    bearing = (i+0.5) * 360./az_map_model.npoints
                    distance = self._model._data[i][alt]
                    radius = min(self.width(), self.height()) / 2.0
-                    scale = radius * distance / self.get_range()
+                    scale = radius * distance / self.maxrange
                    #convert bearing,distance to x,y
                    xpts = scale * math.sin(bearing * math.pi / 180)
                    ypts = scale * math.cos(bearing * math.pi / 180)
                    #get the bounding rectangle of the arc
-
+                    
                    arcrect = QtCore.QRectF(QtCore.QPointF(0-scale, 0-scale),
                                            QtCore.QPointF(scale, scale))

@@ -150,55 +153,44 @@ class az_map(QtGui.QWidget):

                self._paths.append(path)

-    #this is just to add a little buffer space for showing the ring & range
-    def get_range(self):
-        return int(self.maxrange * 1.1)
-
    def drawRangeRings(self, painter):
        painter.translate(self.width()/2, self.height()/2)
-        #choose intelligent range step -- keep it between 3-5 rings
-        rangestep = 100
-        while self.get_range() / rangestep < 3:
-            rangestep /= 2.0
-        for i in np.arange(rangestep, self.get_range(), rangestep): 
-            diameter = (float(i) / self.get_range()) * min(self.width(), self.height())
-            painter.setPen(az_map.ringpen)
+        painter.setPen(az_map.ringpen)
+        for i in range(0, self.maxrange, self.ringsize):
+            diameter = (float(i) / az_map.maxrange) * min(self.width(), self.height())
            painter.drawEllipse(QtCore.QRectF(-diameter / 2.0,
                                -diameter / 2.0, diameter, diameter))
-            painter.setPen(QtGui.QColor(255,127,0,255))
-
-            painter.drawText(0-70/2.0, diameter/2.0, 70, 30, QtCore.Qt.AlignHCenter,
-                             "%.1fnm" % i)

    def setMaxRange(self, maxrange):
-        maxrange = max(3.25, maxrange)
-        maxrange = min(500., maxrange)
        self.maxrange = maxrange
-        self.repaint()
+        self.drawPath()

-    def wheelEvent(self, event):
-        self.setMaxRange(self.maxrange + (event.delta()/120.)*self.maxrange/4.)
+    def setRingSize(self, ringsize):
+        self.ringsize = ringsize
+        self.drawPath()

 class az_map_output:
    def __init__(self, cprdec, model, pub):
        self._cpr = cprdec
        self.model = model
        pub.subscribe("type17_dl", self.output)
-
+        
    def output(self, msg):
        try:
+            msgtype = msg.data["df"]
            now = time.time()
-
-            icao = msg.data["aa"]
-            subtype = msg.data["ftc"]
-            distance, altitude, bearing = [0,0,0]
-            if 5 <= subtype <= 8:
-                (ground_track, decoded_lat, decoded_lon, distance, bearing) = air_modes.parseBDS06(msg.data, self._cpr)
-                altitude = 0
-            elif 9 <= subtype <= 18:
+        
+            if msgtype == 17:
+                icao = msg.data["aa"]
+                subtype = msg.data["ftc"]
+                distance, altitude, bearing = [0,0,0]
+                if 5 <= subtype <= 8:
+                    (ground_track, decoded_lat, decoded_lon, distance, bearing) = air_modes.parseBDS06(msg.data, self._cpr)
+                    altitude = 0
+                elif 9 <= subtype <= 18:
                    (altitude, decoded_lat, decoded_lon, distance, bearing) = air_modes.parseBDS05(msg.data, self._cpr)

-            self.model.addRecord(bearing, altitude, distance)
+                self.model.addRecord(bearing, altitude, distance)
        except ADSBError:
            pass

--- a/python/flightgear.py
+++ b/python/flightgear.py
@@ -18,6 +18,7 @@ class output_flightgear:
    def __init__(self, cprdec, hostname, port, pub):
        self.hostname = hostname
        self.port = port
+        self.localpos = localpos
        self.positions = {}
        self.velocities = {}
        self.callsigns = {}
@@ -25,41 +26,42 @@ class output_flightgear:

        self.sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
        self.sock.connect((self.hostname, self.port))
-        pub.subscribe("type17_dl", self.output)
+        pub.subscribe("type17_dl", output)

    def output(self, msg):
+        
        try:
            msgtype = msg.data["df"]
            if msgtype == 17: #ADS-B report
                icao24 = msg.data["aa"]
                bdsreg = msg.data["me"].get_type()
                if bdsreg == 0x08: #ident packet
-                    (ident, actype) = air_modes.parseBDS08(msg.data)
+                    (ident, actype) = air_modes.parseBDS08(data)
                    #select model based on actype
                    self.callsigns[icao24] = [ident, actype]
-
+                    
                elif bdsreg == 0x06: #BDS0,6 pos
-                    [ground_track, decoded_lat, decoded_lon, rnge, bearing] = air_modes.parseBDS06(msg.data, self._cpr)
+                    [ground_track, decoded_lat, decoded_lon, rnge, bearing] = air_modes.parseBDS06(data, self._cpr)
                    self.positions[icao24] = [decoded_lat, decoded_lon, 0]
                    self.update(icao24)

                elif bdsreg == 0x05: #BDS0,5 pos
-                    [altitude, decoded_lat, decoded_lon, rnge, bearing] = air_modes.parseBDS05(msg.data, self._cpr)
+                    [altitude, decoded_lat, decoded_lon, rnge, bearing] = air_modes.parseBDS05(data, self._cpr)
                    self.positions[icao24] = [decoded_lat, decoded_lon, altitude]
                    self.update(icao24)

                elif bdsreg == 0x09: #velocity
-                    subtype = msg.data["bds09"].get_type()
+                    subtype = data["bds09"].get_type()
                    if subtype == 0:
-                      [velocity, heading, vert_spd, turnrate] = air_modes.parseBDS09_0(msg.data)
+                      [velocity, heading, vert_spd, turnrate] = air_modes.parseBDS09_0(data)
                    elif subtype == 1:
-                      [velocity, heading, vert_spd] = air_modes.parseBDS09_1(msg.data)
+                      [velocity, heading, vert_spd] = air_modes.parseBDS09_1(data)
                      turnrate = 0
                    else:
                        return

                    self.velocities[icao24] = [velocity, heading, vert_spd, turnrate]
-
+                    
        except ADSBError:
            pass

--- a/python/get_uniq.py
+++ b/python/get_uniq.py
@@ -1,21 +0,0 @@
-#!/usr/bin/env python
-
-import sys, re
-
-if __name__== '__main__':
-    data = sys.stdin.readlines()
-    icaos = []
-    num_icaos = 0
-    for line in data:
-        match = re.match(".*from (\w+)", line)
-        if match is not None:
-            icao = int(match.group(1), 16)
-            icaos.append(icao)
-
-    #get dupes
-    dupes = sorted([icao for icao in set(icaos) if icaos.count(icao) > 1])
-    for icao in dupes:        
-        print "%x" % icao
-    print "Found non-unique replies from %i aircraft" % len(dupes)
-
-
--- a/python/gui_model.py
+++ b/python/gui_model.py
@@ -22,10 +22,11 @@
 # This file contains data models, view delegates, and associated classes
 # for handling the GUI back end data model.

-from PyQt4 import QtCore, QtGui
+from PyQt4 import QtCore, QtGui, QtSql
 import air_modes
 import threading, math, time
 from air_modes.exceptions import *
+from gnuradio.gr.pubsub import pubsub

 #fades the ICAOs out as their last report gets older,
 #and display ident if available, ICAO otherwise
@@ -37,12 +38,16 @@ class ICAOViewDelegate(QtGui.QStyledItemDelegate):
            painter.drawRect(option.rect)

        #if there's an ident available, use it. otherwise print the ICAO
-        if index.model().data(index.model().index(index.row(), 9)) != QtCore.QVariant():
-            paintstr = index.model().data(index.model().index(index.row(), 9)).toString()
+        if index.model().data(index.model().index(index.row(), 8)) != QtCore.QVariant():
+            paintstr = index.model().data(index.model().index(index.row(), 8)).toString()
        else:
            paintstr = index.model().data(index.model().index(index.row(), 0)).toString()
-        last_report = index.model().data(index.model().index(index.row(), 1)).toDouble()[0]
-        age = (time.time() - last_report)
+
+        #FIXME this is kind of heinous, find out how you got int data out of it last time
+        last_report = time.strptime(str(index.model().data(index.model().index(index.row(), 1)).toString()), "%Y-%m-%d %H:%M:%S")
+        age = (time.mktime(time.gmtime()) - time.mktime(last_report)) - 3600.*time.daylight
+        print age
+
        max_age = 60. #age at which it grays out
        #minimum alpha is 0x40 (oldest), max is 0xFF (newest)
        age = min(age, max_age)
@@ -50,152 +55,36 @@ class ICAOViewDelegate(QtGui.QStyledItemDelegate):
        painter.setPen(QtGui.QColor(0, 0, 0, alpha))
        painter.drawText(option.rect.left()+3, option.rect.top(), option.rect.width(), option.rect.height(), option.displayAlignment, paintstr)

-#the data model used to display dashboard data.
-class dashboard_data_model(QtCore.QAbstractTableModel):
+#class dashboard_sql_model(QtCore.QAbstractTableModel):
+#    def __init__(self, parent):
+#        QtCore.QAbstractTableModel.__init__(self, parent)
+
+#    def update(self, icao):
+
+#TODO must add libqt4-sql, libqt4-sql-sqlite, python-qt4-sql to dependencies
+#TODO looks like you're going to have to either integrate this into sql.py (ugh!) or find a way to keep it in sync
+#seems like it wants to have control over maintaining data currency
+#worst case is you make your own damn SQL query model based on abstracttablemodel.
+class dashboard_sql_model(QtSql.QSqlQueryModel):
    def __init__(self, parent):
-        QtCore.QAbstractTableModel.__init__(self, parent)
-        self._data = []
-        self.lock = threading.Lock()
-        self._colnames = ["icao", "seen", "rssi", "latitude", "longitude", "altitude", "speed", "heading", "vertical", "ident", "type", "range", "bearing"]
-        #custom precision limits for display
-        self._precisions = [None, None, None, 6, 6, 0, 0, 0, 0, None, None, 2, 0]
-        for field in self._colnames:
-            self.setHeaderData(self._colnames.index(field), QtCore.Qt.Horizontal, field)
-    def rowCount(self, parent=QtCore.QVariant()):
-        return len(self._data)
-    def columnCount(self, parent=QtCore.QVariant()):
-        return len(self._colnames)
-    def data(self, index, role=QtCore.Qt.DisplayRole):
-        if not index.isValid():
-            return QtCore.QVariant()
-        if index.row() >= self.rowCount():
-            return QtCore.QVariant()
-        if index.column() >= self.columnCount():
-            return QtCore.QVariant()
-        if (role != QtCore.Qt.DisplayRole) and (role != QtCore.Qt.EditRole):
-            return QtCore.QVariant()
-        if self._data[index.row()][index.column()] is None:
-            return QtCore.QVariant()
-        else:
-            #if there's a dedicated precision for that column, print it out with the specified precision.
-            #this only works well if you DON'T have other views/widgets that depend on numeric data coming out.
-            #i don't like this, but it works for now. unfortunately it seems like Qt doesn't give you a
-            #good alternative.
-            if self._precisions[index.column()] is not None:
-                return QtCore.QVariant("%.*f" % (self._precisions[index.column()], self._data[index.row()][index.column()]))
-            else:
-                if self._colnames[index.column()] == "icao":
-                    return QtCore.QVariant("%06x" % self._data[index.row()][index.column()]) #return as hex string
-                else:
-                    return QtCore.QVariant(self._data[index.row()][index.column()])
-
-    def setData(self, index, value, role=QtCore.Qt.EditRole):
-        self.lock.acquire()
-        if not index.isValid():
-            return False
-        if index.row() >= self.rowCount():
-            return False
-        if index.column >= self.columnCount():
-            return False
-        if role != QtCore.Qt.EditRole:
-            return False
-        self._data[index.row()][index.column()] = value
-        self.lock.release()
-
-    #addRecord implements an upsert on self._data; that is,
-    #it updates the row if the ICAO exists, or else it creates a new row.
-    def addRecord(self, record):
-        self.lock.acquire()
-        icaos = [x[0] for x in self._data]
-        if record["icao"] in icaos:
-            row = icaos.index(record["icao"])
-            for column in record:
-                self._data[row][self._colnames.index(column)] = record[column]
-            #create index to existing row and tell the model everything's changed in this row
-            #or inside the for loop, use dataChanged on each changed field (might be better)
-            self.dataChanged.emit(self.createIndex(row, 0), self.createIndex(row, len(self._colnames)-1))
-
-        #only create records for ICAOs with ADS-B reports
-        elif ("latitude" or "speed" or "ident") in record:
-            #find new inserted row number
-            icaos.append(record["icao"])
-            newrowoffset = sorted(icaos).index(record["icao"])
-            self.beginInsertRows(QtCore.QModelIndex(), newrowoffset, newrowoffset)
-            newrecord = [None for x in xrange(len(self._colnames))]
-            for col in xrange(0, len(self._colnames)):
-                if self._colnames[col] in record:
-                    newrecord[col] = record[self._colnames[col]]
-            self._data.append(newrecord)
-            self._data = sorted(self._data, key = lambda x: x[0]) #sort by icao
-            self.endInsertRows()
-        self.lock.release()
-        self.prune()
-
-    #weeds out ICAOs older than 1 minute
-    def prune(self):
-        self.lock.acquire()
-        for (index,row) in enumerate(self._data):
-            if time.time() - row[1] >= 60:
-                self.beginRemoveRows(QtCore.QModelIndex(), index, index)
-                self._data.pop(index)
-                self.endRemoveRows()
-        self.lock.release()
-                
-class dashboard_output:
-    def __init__(self, cprdec, model, pub):
-        self.model = model
-        self._cpr = cprdec
-        pub.subscribe("modes_dl", self.output)
-    def output(self, msg):
-        try:
-            msgtype = msg.data["df"]
-            now = time.time()
-            newrow = {"rssi": msg.rssi, "seen": now}
-            if msgtype in [0, 4, 20]:
-                newrow["altitude"] = air_modes.altitude.decode_alt(msg.data["ac"], True)
-                newrow["icao"] = msg.ecc
-                self.model.addRecord(newrow)
-            
-            elif msgtype == 17:
-                icao = msg.data["aa"]
-                newrow["icao"] = icao
-                subtype = msg.data["ftc"]
-                if subtype == 4:
-                    (ident, actype) = air_modes.parseBDS08(msg.data)
-                    newrow["ident"] = ident
-                    newrow["type"] = actype
-                elif 5 <= subtype <= 8:
-                    (ground_track, decoded_lat, decoded_lon, rnge, bearing) = air_modes.parseBDS06(msg.data, self._cpr)
-                    newrow["heading"] = ground_track
-                    newrow["latitude"] = decoded_lat
-                    newrow["longitude"] = decoded_lon
-                    newrow["altitude"] = 0
-                    if rnge is not None:
-                        newrow["range"] = rnge
-                        newrow["bearing"] = bearing
-                elif 9 <= subtype <= 18:
-                    (altitude, decoded_lat, decoded_lon, rnge, bearing) = air_modes.parseBDS05(msg.data, self._cpr)
-                    newrow["altitude"] = altitude
-                    newrow["latitude"] = decoded_lat
-                    newrow["longitude"] = decoded_lon
-                    if rnge is not None:
-                        newrow["range"] = rnge
-                        newrow["bearing"] = bearing
-                elif subtype == 19:
-                    subsubtype = msg.data["sub"]
-                    velocity = None
-                    heading = None
-                    vert_spd = None
-                    if subsubtype == 0:
-                        (velocity, heading, vert_spd) = air_modes.parseBDS09_0(msg.data)
-                    elif 1 <= subsubtype <= 2:
-                        (velocity, heading, vert_spd) = air_modes.parseBDS09_1(msg.data)
-                    newrow["speed"] = velocity
-                    newrow["heading"] = heading
-                    newrow["vertical"] = vert_spd
-    
-                self.model.addRecord(newrow)
-
-        except ADSBError:
-            return
+        QtSql.QSqlQueryModel.__init__(self, parent)
+        self._query = """select tab1.icao, tab1.seen, tab1.lat, tab1.lon, tab1.alt, speed, heading, vertical, ident, type
+                         from (select * from (select * from positions order by seen desc) group by icao) tab1
+                    left join (select * from (select * from vectors order by seen desc)   group by icao) tab2
+                        on tab1.icao=tab2.icao
+                    left join (select * from (select * from ident)) tab3
+                        on tab1.icao=tab3.icao
+                    where tab1.seen > datetime('now', '-1 minute')"""
+        self._sql = None
+        self._db = QtSql.QSqlDatabase("QSQLITE")
+        self._db.setDatabaseName("adsb.db") #TODO specify this elsewhere
+        self._db.open()
+        #what is this i don't even
+        #fetches the combined data of all three tables for all ICAOs seen in the last minute.
+        #FIXME PyQt's SQLite gives you different results than the SQLite browser
+        self.setQuery(self._query, self._db)

+    #the big club
+    def update_all(self, icao):
+        self.setQuery(self._query, self._db)
+        #self.dataChanged.emit(self.createIndex(0, 0), self.createIndex(self.rowCount(), self.columnCount()))
--- a/python/html_template.py
+++ b/python/html_template.py
@@ -14,21 +14,19 @@ def html_template(my_position, json_file):
        <meta http-equiv="content-type" content="text/html;charset=utf-8" />
        <style type="text/css">
            .labels {
-                color: blue;
+                color: red;
                background-color: white;
                font-family: "Lucida Grande", "Arial", sans-serif;
-                font-size: 13px;
+                font-size: 10px;
                font-weight: bold;
                text-align: center;
-                width: 70px;
-                border: none;
+                width: 40px;
+                border: 2px solid black;
                white-space: nowrap;
            }
        </style>
        <script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false">
        </script>
-        <script type="text/javascript" src="http://google-maps-utility-library-v3.googlecode.com/svn/tags/markerwithlabel/1.1.9/src/markerwithlabel.js">
-        </script>
        <script type="text/javascript">
            var map;
            var markers = [];
@@ -53,6 +51,7 @@ def html_template(my_position, json_file):
            };

            function jsonp_callback(results) { // from JSONP
+                clearMarkers();
                airplanes = {};
                for (var i = 0; i < results.length; i++) {
                    airplanes[results[i].icao] = {
@@ -66,20 +65,10 @@ def html_template(my_position, json_file):
                        highlight: results[i].highlight
                    };
                }
-//                clearMarkers();
                refreshIcons();
            }

            function refreshIcons() {
-                //prune the list
-                for(var i = 0; i < planes.length; i++) {
-                    icao = planes[i].get("icao")
-                    if(!(icao in airplanes)) {
-                        planes[i].setMap(null)
-                        planes.splice(i, 1);
-                    };
-                };
-
                for (var airplane in airplanes) {
                    if (airplanes[airplane].highlight != 0) {
                        icon_file = "http://www.nerdnetworks.org/~bistromath/airplane_sprite_highlight.png";
@@ -94,40 +83,23 @@ def html_template(my_position, json_file):
                        //scaledSize: new google.maps.Size(4608,126)
                    };

-                    if (airplanes[airplane].ident.length != 8) {
-                        identstr = airplane;
-                    } else {
-                        identstr = airplanes[airplane].ident;
+                    identstr = airplanes[airplane].ident;
+                    if (identstr === "" || !identstr) {
+                        identstr = airplanes[airplane].icao;
                    };

                    var planeOptions = {
                        map: map,
                        position: airplanes[airplane].center,
-                        icao: airplane,
                        icon: plane_icon,
+                        //label content meaningless unless you use the MarkerWithLabel class from the Maps Utility Library
                        labelContent: identstr,
-                        labelAnchor: new google.maps.Point(35, -32),
+                        labelAnchor: new google.maps.Point(64, 0),
                        labelClass: "labels",
                        labelStyle: {opacity: 0.75}
                    };
-
-                    var i = 0;
-                    for(i; i<planes.length; i++) {
-                        if(planes[i].get("icao") == airplane) {
-                            planes[i].setPosition(airplanes[airplane].center);
-                            if(planes[i].get("icon") != plane_icon) {
-                                planes[i].setIcon(plane_icon); //handles highlight and heading
-                            };
-                            if(planes[i].get("labelContent") != identstr) {
-                                planes[i].set("labelContent", identstr);
-                            };
-                            break;
-                        };
-                    };
-                    if(i == planes.length) {
-                        planeMarker = new MarkerWithLabel(planeOptions);
-                        planes.push(planeMarker);
-                    };
+                    planeMarker = new google.maps.Marker(planeOptions);
+                    planes.push(planeMarker);
                };
            };

--- a/python/kml.py
+++ b/python/kml.py
@@ -39,8 +39,8 @@ class output_kml(threading.Thread):
    def run(self):
        self._db = sqlite3.connect(self._dbname) #read from the db
        while self.shutdown.is_set() is False:
-            time.sleep(self._timeout)
            self.writekml()
+            time.sleep(self._timeout)

        self._db.close()
        self._db = None
@@ -188,7 +188,7 @@ class output_jsonp(output_kml):
 #        retstr +=  """\t<Folder>\n\t\t<name>Aircraft locations</name>\n\t\t<open>0</open>"""

        #read the database and add KML
-        q = "select distinct icao from positions where seen > datetime('now', '-1 minute')"
+        q = "select distinct icao from positions where seen > datetime('now', '-5 minute')"
        c = self._db.cursor()
        self.locked_execute(c, q)
        icaolist = c.fetchall()
--- a/python/mlat_client.py
+++ b/python/mlat_client.py
@@ -1,87 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2012 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.
-#
-
-#multilateration client
-#outputs stamps to server, receives multilaterated outputs back
-
-import socket, pickle, time, sys
-import air_modes
-from gnuradio import gr
-
-pickle_prot = 0
-#pickle_prot = pickle.HIGHEST_PROTOCOL
-
-class client_info:
-    def __init__(self):
-        self.name = ""
-        self.position = []
-        self.offset_secs = 0
-        self.offset_frac_secs = 0.0
-        self.time_source = None  
-
-class mlat_client:
-    def __init__(self, queue, position, server_addr, time_source):
-        self._queue = queue
-        self._pos = position
-        self._name = socket.gethostname()
-        #connect to server
-        self._sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        self._sock.setblocking(1)
-        self._sock.connect((server_addr, 19005))
-        info = client_info()
-        info.name = self._name
-        info.position = self._pos
-        info.time_source = time_source #"gpsdo" or None
-        self._sock.send(pickle.dumps(info))
-        reply = self._sock.recv(1024)
-        if reply != "HELO": #i know, shut up
-            raise Exception("Invalid reply from server: %s" % reply)
-        self._sock.setblocking(0)
-        self._remnant = None
-
-    def __del__(self):
-        self._sock.close()
-
-    #send a stamped report to the server
-    def output(self, message):
-        self._sock.send(message+"\n")
-
-    #this is called from the update() method list of the main app thread
-    def get_mlat_positions(self):
-        msg = None
-        try:
-            msg = self._sock.recv(1024)
-        except socket.error:
-            pass
-        if msg:
-            for line in msg.splitlines(True):
-                if line.endswith("\n"):
-                    if self._remnant:
-                        line = self._remnant + line
-                        self._remnant = None
-                    self._queue.insert_tail(gr.message_from_string(line))
-
-                else:
-                    if self._remnant is not None:
-                        raise Exception("Malformed data: " + line)
-                    else:
-                        self._remnant = line
--- a/python/mlat_types.py
+++ b/python/mlat_types.py
@@ -1 +0,0 @@
-
--- a/python/parse.py
+++ b/python/parse.py
@@ -427,7 +427,7 @@ def make_parser(pub):
    try:
      ret = air_modes.modes_report(modes_reply(int(data, 16)),
                                   int(ecc, 16),
-                                   10.0*math.log10(max(1e-8,float(reference))),
+                                   20.0*math.log10(float(reference)),
                                   air_modes.stamp(0, float(timestamp)))
      pub["modes_dl"] = ret
      pub["type%i_dl" % ret.data.get_type()] = ret
--- a/python/radio.py
+++ b/python/radio.py
@@ -23,11 +23,10 @@
 # You pass it options, it gives you data.
 # It uses the pubsub interface to allow clients to subscribe to its data feeds.

-from gnuradio import gr, gru, eng_notation, filter, blocks
+from gnuradio import gr, gru, eng_notation, filter
 from gnuradio.filter import optfir
 from gnuradio.eng_option import eng_option
 from gnuradio.gr.pubsub import pubsub
-from gnuradio.filter import pfb
 from optparse import OptionParser, OptionGroup
 import air_modes
 import zmq
@@ -46,15 +45,7 @@ class modes_radio (gr.top_block, pubsub):
    self._resample = None
    self._setup_source(options)

-    if self._rate < 4e6:
-        self._resample = pfb.arb_resampler_ccf(4.e6/self._rate)
-        self._rx_rate = 4e6
-    else:
-        self._rx_rate = self._rate
-
-    self._rx_path = air_modes.rx_path(self._rx_rate, options.threshold,
-                                      self._queue, options.pmf, options.dcblock)
-
+    self._rx_path = air_modes.rx_path(self._rate, options.threshold, self._queue, options.pmf)

    #now subscribe to set various options via pubsub
    self.subscribe("freq", self.set_freq)
@@ -89,7 +80,7 @@ class modes_radio (gr.top_block, pubsub):
  @staticmethod
  def add_radio_options(parser):
    group = OptionGroup(parser, "Receiver setup options")
-
+      
    #Choose source
    group.add_option("-s","--source", type="string", default="uhd",
                      help="Choose source: uhd, osmocom, <filename>, or <ip:port> [default=%default]")
@@ -111,54 +102,33 @@ class modes_radio (gr.top_block, pubsub):
    #RX path args
    group.add_option("-r", "--rate", type="eng_float", default=4e6,
                      help="set sample rate [default=%default]")
-    group.add_option("-T", "--threshold", type="eng_float", default=7.0,
+    group.add_option("-T", "--threshold", type="eng_float", default=5.0,
                      help="set pulse detection threshold above noise in dB [default=%default]")
    group.add_option("-p","--pmf", action="store_true", default=False,
                      help="Use pulse matched filtering [default=%default]")
-    group.add_option("-d","--dcblock", action="store_true", default=False,
-                      help="Use a DC blocking filter (best for HackRF Jawbreaker) [default=%default]")

    parser.add_option_group(group)

  def live_source(self):
-    return self._options.source=="uhd" or self._options.source=="osmocom"
+    return self._options.source is 'uhd' or self._options.source is 'osmocom'

  def set_freq(self, freq):
-    return self._u.set_center_freq(freq, 0) if self.live_source() else 0
+    return self._u.set_center_freq(freq, 0) if live_source() else 0

  def set_gain(self, gain):
-    if self.live_source():
-        self._u.set_gain(gain)
-        print "Gain is %f" % self.get_gain()
-    return self.get_gain()
+    return self._u.set_gain(gain) if live_source() else 0

  def set_rate(self, rate):
-    if(rate < 4e6 and self._rate > 4e6):
-        raise NotImplementedError("Lowering rate <4e6Msps not currently supported.")
-    if(rate < 4e6):
-        self._resample.set_rate(4e6/rate)
-        self._rx_rate = 4e6
-    else:
-        self._rx_rate = rate
-    self._rx_path.set_rate(self._rx_rate)
-    if self._options.source in ("osmocom"):
-        return self._u.set_sample_rate(rate)
-    if self._options.source in ("uhd"):
-        return self._u.set_rate(rate)
-    else:
-        return 0
-
-  def set_threshold(self, threshold):
-    self._rx_path.set_threshold(threshold)
+    return self._u.set_rate(rate) if live_source() else 0

  def get_freq(self, freq):
-    return self._u.get_center_freq(freq, 0) if self.live_source() else 1090e6
+    return self._u.get_center_freq(freq, 0) if live_source() else 1090e6
+    
+  def get_gain(self, gain):
+    return self._u.get_gain() if live_source() else 0

-  def get_gain(self):
-    return self._u.get_gain() if self.live_source() else 0
-
-  def get_rate(self):
-    return self._u.get_rate() if self.live_source() else self._rate
+  def get_rate(self, rate):
+    return self._u.get_rate() if live_source() else self._rate

  def _setup_source(self, options):
    if options.source == "uhd":
@@ -194,24 +164,31 @@ class modes_radio (gr.top_block, pubsub):

    #TODO: detect if you're using an RTLSDR or Jawbreaker
    #and set up accordingly.
+    #ALSO TODO: Actually set gain appropriately using gain bins in HackRF driver.
+    #osmocom doesn't have gain bucket distribution like UHD does
    elif options.source == "osmocom": #RTLSDR dongle or HackRF Jawbreaker
        import osmosdr
-        self._u = osmosdr.source(options.args)
+        self._u = osmosdr.source_c(options.args)
 #        self._u.set_sample_rate(3.2e6) #fixed for RTL dongles
        self._u.set_sample_rate(options.rate)
        if not self._u.set_center_freq(options.freq):
            print "Failed to set initial frequency"

-#        self._u.set_gain_mode(0) #manual gain mode
+        self._u.set_gain_mode(0) #manual gain mode
        if options.gain is None:
            options.gain = 34
-        self._u.set_gain(options.gain)
+###DO NOT COMMIT
+        self._u.set_gain(14, "RF", 0)
+        self._u.set_gain(40, "IF", 0)
+        #self._u.set_gain(14, "BB", 0)
+###DO NOT COMMIT
+#        self._u.set_gain(options.gain)
        print "Gain is %i" % self._u.get_gain()

        #Note: this should only come into play if using an RTLSDR.
 #        lpfiltcoeffs = gr.firdes.low_pass(1, 5*3.2e6, 1.6e6, 300e3)
 #        self._resample = filter.rational_resampler_ccf(interpolation=5, decimation=4, taps=lpfiltcoeffs)
-
+                
    else:
      #semantically detect whether it's ip.ip.ip.ip:port or filename
      if ':' in options.source:
@@ -222,13 +199,10 @@ class modes_radio (gr.top_block, pubsub):
        self._u = gr.udp_source(gr.sizeof_gr_complex, ip, int(port))
        print "Using UDP source %s:%s" % (ip, port)
      else:
-        self._u = blocks.file_source(gr.sizeof_gr_complex, options.source)
+        self._u = gr.file_source(gr.sizeof_gr_complex, options.source)
        print "Using file source %s" % options.source

    print "Rate is %i" % (options.rate,)

  def close(self):
-    self.stop()
-    self.wait()
    self._sender.close()
-    self._u = None
--- a/python/rx_path.py
+++ b/python/rx_path.py
@@ -19,12 +19,12 @@
 # Boston, MA 02110-1301, USA.
 # 

-from gnuradio import gr, blocks, filter
+from gnuradio import gr, blocks
 import air_modes_swig

 class rx_path(gr.hier_block2):

-    def __init__(self, rate, threshold, queue, use_pmf=False, use_dcblock=False):
+    def __init__(self, rate, threshold, queue, use_pmf=False):
        gr.hier_block2.__init__(self, "modes_rx_path",
                                gr.io_signature(1, 1, gr.sizeof_gr_complex),
                                gr.io_signature(0,0,0))
@@ -35,15 +35,9 @@ class rx_path(gr.hier_block2):
        self._spc = int(rate/2e6)

        # Convert incoming I/Q baseband to amplitude
-        self._demod = blocks.complex_to_mag_squared()
-        if use_dcblock:
-            self._dcblock = filter.dc_blocker_cc(100*self._spc,False)
-            self.connect(self, self._dcblock, self._demod)
-        else:
-            self.connect(self, self._demod)
-            self._dcblock = None
-
+        self._demod = blocks.complex_to_mag()
        self._bb = self._demod
+
        # Pulse matched filter for 0.5us pulses
        if use_pmf:
            self._pmf = blocks.moving_average_ff(self._spc, 1.0/self._spc)#, self._rate)
@@ -54,24 +48,24 @@ class rx_path(gr.hier_block2):
        self._avg = blocks.moving_average_ff(48*self._spc, 1.0/(48*self._spc))#, self._rate) # 3 preambles

        # Synchronize to Mode-S preamble
-        self._sync = air_modes_swig.preamble(self._rate, self._threshold)
+        self._sync = air_modes_swig.modes_preamble(self._rate, self._threshold)

        # Slice Mode-S bits and send to message queue
-        self._slicer = air_modes_swig.slicer(self._queue)
+        self._slicer = air_modes_swig.modes_slicer(self._rate, self._queue)

        # Wire up the flowgraph
+        self.connect(self, self._demod)
        self.connect(self._bb, (self._sync, 0))
        self.connect(self._bb, self._avg, (self._sync, 1))
        self.connect(self._sync, self._slicer)

    def set_rate(self, rate):
-        self._sync.set_rate(int(rate))
+        self._sync.set_rate(rate)
+        self._slicer.set_rate(rate)
        self._spc = int(rate/2e6)
        self._avg.set_length_and_scale(48*self._spc, 1.0/(48*self._spc))
        if self._bb != self._demod:
            self._pmf.set_length_and_scale(self._spc, 1.0/self._spc)
-#        if self._dcblock is not None:
-#            self._dcblock.set_length(100*self._spc)

    def set_threshold(self, threshold):
        self._sync.set_threshold(threshold)
@@ -85,4 +79,4 @@ class rx_path(gr.hier_block2):

    def get_threshold(self, threshold):
        return self._sync.get_threshold()
-
+            
--- a/python/sbs1.py
+++ b/python/sbs1.py
@@ -23,7 +23,7 @@
 import time, os, sys, socket
 from string import split, join
 import air_modes
-import datetime
+from datetime import *
 from air_modes.exceptions import *
 import threading

@@ -63,7 +63,7 @@ class output_sbs1:
    #it could be cleaner if there were separate output_* fns
    #but this works
    for i in (0, 4, 5, 11, 17):
-        pub.subscribe("type%i_dl" % i, self.output)
+        pub.subscribe("type%i_dl" % i, output)

    #spawn thread to add new connections as they come in
    self._runner = dumb_task_runner(self.add_pending_conns, 0.1)
@@ -83,7 +83,7 @@ class output_sbs1:
    # dictionary is getting too large.
    if len(self._aircraft_id_map) > 1e4:
      minimum = min(self._aircraft_id_map.values()) + (len(self._aircraft_id_map) - 1e4)
-      for icao, _id in self._aircraft_id_map.iteritems():
+      for icao, _id in self._aircraft_id_map:
        if _id < minimum:
            del self._aircraft_id_map[icao]

@@ -111,7 +111,7 @@ class output_sbs1:
      pass

  def current_time(self):
-    timenow = datetime.datetime.now()
+    timenow = datetime.now()
    return [timenow.strftime("%Y/%m/%d"), timenow.strftime("%H:%M:%S.%f")[0:-3]]

  def decode_fs(self, fs):
@@ -154,7 +154,7 @@ class output_sbs1:
    [datestr, timestr] = self.current_time()
    aircraft_id = self.get_aircraft_id(ecc)
    retstr = "MSG,7,0,%i,%06X,%i,%s,%s,%s,%s,,%s,,,,,,,,,," % (aircraft_id, ecc, aircraft_id+100, datestr, timestr, datestr, timestr, air_modes.decode_alt(shortdata["ac"], True))
-    if shortdata["vs"]:
+    if vs:
      retstr += "1\r\n"
    else:
      retstr += "0\r\n"
@@ -174,7 +174,7 @@ class output_sbs1:

  def pp11(self, shortdata, ecc):
    [datestr, timestr] = self.current_time()
-    aircraft_id = self.get_aircraft_id(shortdata["aa"])
+    aircraft_id = self.get_aircraft_id(icao24)
    return "MSG,8,0,%i,%06X,%i,%s,%s,%s,%s,,,,,,,,,,,,\r\n" % (aircraft_id, shortdata["aa"], aircraft_id+100, datestr, timestr, datestr, timestr)

  def pp17(self, data):
--- a/python/sql.py
+++ b/python/sql.py
@@ -38,7 +38,7 @@ class output_sql:
    c = self._db.cursor()
    query = """CREATE TABLE IF NOT EXISTS "positions" (
              "icao" INTEGER KEY NOT NULL,
-              "seen" TEXT NOT NULL,
+              "seen" DATETIME NOT NULL,
              "alt"  INTEGER,
              "lat"  REAL,
              "lon"  REAL
@@ -46,7 +46,7 @@ class output_sql:
    c.execute(query)
    query = """CREATE TABLE IF NOT EXISTS "vectors" (
              "icao"     INTEGER KEY NOT NULL,
-              "seen"     TEXT NOT NULL,
+              "seen"     DATETIME NOT NULL,
              "speed"    REAL,
              "heading"  REAL,
              "vertical" REAL
@@ -96,42 +96,34 @@ class output_sql:

    return query

-#TODO: if there's a way to publish selective reports on upsert to distinguish,
-#for instance, between a new ICAO that's just been heard, and a refresh of an
-#existing ICAO, both of those would be useful publishers for the GUI model.
-#otherwise, worst-case you can just refresh everything every time a report
-#comes in, but it's going to use more CPU. Not likely a problem if you're only
-#looking at ADS-B (no mode S) data.
-#It's probably time to look back at the Qt SQL table model and see if it can be
-#bent into shape for you.
  def sql17(self, data):
    icao24 = data["aa"]
    bdsreg = data["me"].get_type()
    #self["bds%.2i" % bdsreg] = icao24 #publish under "bds08", "bds06", etc.

    if bdsreg == 0x08:
-      (msg, typename) = air_modes.parseBDS08(data)
-      return "INSERT OR REPLACE INTO ident (icao, ident, type) VALUES (" + "%i" % icao24 + ", '" + msg + "', '" + typename + "')"
+      (msg, typename) = self.parseBDS08(data)
+      return "INSERT OR REPLACE INTO ident (icao, ident, type) VALUES (%i, '%s', '%s')" % (icao24, msg, typename)
    elif bdsreg == 0x06:
      [ground_track, decoded_lat, decoded_lon, rnge, bearing] = air_modes.parseBDS06(data, self._cpr)
      altitude = 0
      if decoded_lat is None: #no unambiguously valid position available
        raise CPRNoPositionError
      else:
-        return "INSERT INTO positions (icao, seen, alt, lat, lon) VALUES (" + "%i" % icao24 + ", datetime('now'), " + str(altitude) + ", " + "%.6f" % decoded_lat + ", " + "%.6f" % decoded_lon + ")"
+        return "INSERT INTO positions (icao, seen, alt, lat, lon) VALUES (%i, datetime('now'), %i, %.6f, %.6f)" % (icao24, int(altitude), decoded_lat, decoded_lon)
    elif bdsreg == 0x05:
      [altitude, decoded_lat, decoded_lon, rnge, bearing] = air_modes.parseBDS05(data, self._cpr)
      if decoded_lat is None: #no unambiguously valid position available
        raise CPRNoPositionError
      else:
-        return "INSERT INTO positions (icao, seen, alt, lat, lon) VALUES (" + "%i" % icao24 + ", datetime('now'), " + str(altitude) + ", " + "%.6f" % decoded_lat + ", " + "%.6f" % decoded_lon + ")"
+        return "INSERT INTO positions (icao, seen, alt, lat, lon) VALUES (%i, datetime('now'), %i, %.6f, %.6f)" % (icao24, int(altitude), decoded_lat, decoded_lon)
    elif bdsreg == 0x09:
      subtype = data["bds09"].get_type()
      if subtype == 0:
-        [velocity, heading, vert_spd, turnrate] = air_modes.parseBDS09_0(data)
-        return "INSERT INTO vectors (icao, seen, speed, heading, vertical) VALUES (" + "%i" % icao24 + ", datetime('now'), " + "%.0f" % velocity + ", " + "%.0f" % heading + ", " + "%.0f" % vert_spd + ")"
+        [velocity, heading, vert_spd, turnrate] = self.parseBDS09_0(data)
+        return "INSERT INTO vectors (icao, seen, speed, heading, vertical) VALUES (%i, datetime('now'), %.0f, %.0f, %.0f)" % (icao24, velocity, heading, vert_spd)
      elif subtype == 1:
-        [velocity, heading, vert_spd] = air_modes.parseBDS09_1(data)
-        return "INSERT INTO vectors (icao, seen, speed, heading, vertical) VALUES (" + "%i" % icao24 + ", datetime('now'), " + "%.0f" % velocity + ", " + "%.0f" % heading + ", " + "%.0f" % vert_spd + ")"
+        [velocity, heading, vert_spd] = self.parseBDS09_1(data)
+        return "INSERT INTO vectors (icao, seen, speed, heading, vertical) VALUES (%i, datetime('now'), %.0f, %.0f, %.0f)" % (icao24, velocity, heading, vert_spd)
      else:
        raise NoHandlerError
--- a/res/modes_rx.ui
+++ b/res/modes_rx.ui
@@ -316,19 +316,6 @@
              <string>Use Pulse Matched Filtering</string>
             </property>
            </widget>
-            <widget class="QCheckBox" name="check_dcblock">
-             <property name="geometry">
-              <rect>
-               <x>10</x>
-               <y>220</y>
-               <width>221</width>
-               <height>22</height>
-              </rect>
-             </property>
-             <property name="text">
-              <string>Use DC blocking filter</string>
-             </property>
-            </widget>
           </widget>
           <widget class="QGroupBox" name="group_output">
            <property name="geometry">
@@ -848,12 +835,12 @@
             <rect>
              <x>483</x>
              <y>125</y>
-              <width>51</width>
+              <width>31</width>
              <height>17</height>
             </rect>
            </property>
            <property name="text">
-             <string>ft/min</string>
+             <string>ft/s</string>
            </property>
           </widget>
           <widget class="QLabel" name="label_31">
--- a/swig/air_modes.i
+++ b/swig/air_modes.i
@@ -1,17 +1,45 @@
 /* -*- c++ -*- */

-#define AIR_MODES_API
-
-%include "gnuradio.i"
+%include "gnuradio.i"			// the common stuff

 %{
-#include "gr_air_modes/preamble.h"
-#include "gr_air_modes/slicer.h"
+#include "air_modes_preamble.h"
+#include "air_modes_slicer.h"
+#include <gnuradio/msg_queue.h>
 %}

-%include "gr_air_modes/preamble.h"
-%include "gr_air_modes/slicer.h"
+// ----------------------------------------------------------------

-GR_SWIG_BLOCK_MAGIC2(air_modes,preamble);
-GR_SWIG_BLOCK_MAGIC2(air_modes,slicer);
+/*
+ * First arg is the package prefix.
+ * Second arg is the name of the class minus the prefix.
+ *
+ * This does some behind-the-scenes magic so we can
+ * access howto_square_ff from python as howto.square_ff
+ */
+GR_SWIG_BLOCK_MAGIC(air,modes_preamble);
+
+air_modes_preamble_sptr air_make_modes_preamble (int channel_rate, float threshold_db);
+
+class air_modes_preamble : public gr::sync_block
+{
+  set_rate(int channel_rate);
+  set_threshold(float threshold_db);
+  int get_threshold(void);
+private:
+  air_modes_preamble (int channel_rate, float threshold_db);
+};
+
+GR_SWIG_BLOCK_MAGIC(air,modes_slicer);
+
+air_modes_slicer_sptr air_make_modes_slicer (int channel_rate, gr::msg_queue::sptr queue);
+
+class air_modes_slicer : public gr::block
+{
+  set_rate(int channel_rate);
+private:
+    air_modes_slicer (int channel_rate, gr::msg_queue::sptr queue);
+};
+
+// ----------------------------------------------------------------
Author	SHA1	Message	Date
Nick Foster	c2d0ca6051	Temp commit. Not yet working.	2013-07-21 17:57:37 -07:00
Nick Foster	33349efd7f	GUI interface still not quite working. Two issues: * PyQt4.QtSql's SQLite interface doesn't appear to return the same results as the SQLite browser. This is probably me depending on a bad data ordering assumption. * QSqlQueryModel isn't set up to have the db change from underneath it, AFAIK -- have to add the ability to notify it there's new data.	2013-07-21 17:41:26 -07:00
Nick Foster	dd3e1fe629	GUI model ripped up and replaced with QSqlQueryModel. Not working but committing before I kill the child in row 15.	2013-07-21 17:41:26 -07:00