Updated HRPT blocks/scripts for testing. Seeing good minor frame sync's.

* Change PLL and SYNC blocks to output floats
* Correct bit sense
* Update RX script to record ascii bits

4 files changed, 16 insertions, 16 deletions

diff --git a/gr-noaa/swig/Makefile.am b/gr-noaa/swig/Makefile.am
index 18cb5920a..2f98738ca 100644
--- a/gr-noaa/swig/Makefile.am
+++ b/gr-noaa/swig/Makefile.am
@@ -53,8 +53,8 @@ noaa_swig_python = \
 # additional SWIG files to be installed
 noaa_swig_swiginclude_headers =	\
 	noaa_swig.i \
-	noaa_hrpt_pll_cc.i \
-	noaa_hrpt_sync_cc.i
+	noaa_hrpt_pll_cf.i \
+	noaa_hrpt_sync_ff.i
 
 include $(top_srcdir)/Makefile.swig
 
diff --git a/gr-noaa/swig/noaa_hrpt_pll_cc.i b/gr-noaa/swig/noaa_hrpt_pll_cf.i
index a29eaa38a..859548a2d 100644
--- a/gr-noaa/swig/noaa_hrpt_pll_cc.i
+++ b/gr-noaa/swig/noaa_hrpt_pll_cf.i
@@ -20,15 +20,15 @@
  * Boston, MA 02110-1301, USA.
  */
 
-GR_SWIG_BLOCK_MAGIC(noaa,hrpt_pll_cc)
+GR_SWIG_BLOCK_MAGIC(noaa,hrpt_pll_cf)
 
-noaa_hrpt_pll_cc_sptr
-noaa_make_hrpt_pll_cc(float alpha, float beta, float max_offset);
+noaa_hrpt_pll_cf_sptr
+noaa_make_hrpt_pll_cf(float alpha, float beta, float max_offset);
 
-class noaa_hrpt_pll_cc : public gr_sync_block
+class noaa_hrpt_pll_cf : public gr_sync_block
 {
 private:
-  noaa_hrpt_pll_cc();
+  noaa_hrpt_pll_cf();
 
 public:
   void set_alpha(float alpha);
diff --git a/gr-noaa/swig/noaa_hrpt_sync_cc.i b/gr-noaa/swig/noaa_hrpt_sync_ff.i
index 6dcfa57df..f3b1594ba 100644
--- a/gr-noaa/swig/noaa_hrpt_sync_cc.i
+++ b/gr-noaa/swig/noaa_hrpt_sync_ff.i
@@ -20,15 +20,15 @@
  * Boston, MA 02110-1301, USA.
  */
 
-GR_SWIG_BLOCK_MAGIC(noaa,hrpt_sync_cc)
+GR_SWIG_BLOCK_MAGIC(noaa,hrpt_sync_ff)
 
-noaa_hrpt_sync_cc_sptr
-noaa_make_hrpt_sync_cc(float alpha, float beta, float sps, float max_offset);
+noaa_hrpt_sync_ff_sptr
+noaa_make_hrpt_sync_ff(float alpha, float beta, float sps, float max_offset);
 
-class noaa_hrpt_sync_cc : public gr_sync_block
+class noaa_hrpt_sync_ff : public gr_sync_block
 {
 private:
-  noaa_hrpt_sync_cc();
+  noaa_hrpt_sync_ff();
 
 public:
   void set_alpha(float alpha);
diff --git a/gr-noaa/swig/noaa_swig.i b/gr-noaa/swig/noaa_swig.i
index 470f5f960..a3e5dd783 100644
--- a/gr-noaa/swig/noaa_swig.i
+++ b/gr-noaa/swig/noaa_swig.i
@@ -23,9 +23,9 @@
 %include "gnuradio.i"
 
 %{
-#include <noaa_hrpt_pll_cc.h>
-#include <noaa_hrpt_sync_cc.h>
+#include <noaa_hrpt_pll_cf.h>
+#include <noaa_hrpt_sync_ff.h>
 %}
 
-%include "noaa_hrpt_pll_cc.i"
-%include "noaa_hrpt_sync_cc.i"
+%include "noaa_hrpt_pll_cf.i"
+%include "noaa_hrpt_sync_ff.i"