From 65bcd58b65219408268e5db1b8fbafb2d3ccc215 Mon Sep 17 00:00:00 2001
From: Johnathan Corgan <jcorgan@corganenterprises.com>
Date: Mon, 7 Sep 2009 13:22:16 -0700
Subject: 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
---
gr-noaa/swig/Makefile.am | 4 ++--
gr-noaa/swig/noaa_hrpt_pll_cc.i | 37 -------------------------------------
gr-noaa/swig/noaa_hrpt_pll_cf.i | 37 +++++++++++++++++++++++++++++++++++++
gr-noaa/swig/noaa_hrpt_sync_cc.i | 37 -------------------------------------
gr-noaa/swig/noaa_hrpt_sync_ff.i | 37 +++++++++++++++++++++++++++++++++++++
gr-noaa/swig/noaa_swig.i | 8 ++++----
6 files changed, 80 insertions(+), 80 deletions(-)
delete mode 100644 gr-noaa/swig/noaa_hrpt_pll_cc.i
create mode 100644 gr-noaa/swig/noaa_hrpt_pll_cf.i
delete mode 100644 gr-noaa/swig/noaa_hrpt_sync_cc.i
create mode 100644 gr-noaa/swig/noaa_hrpt_sync_ff.i
(limited to 'gr-noaa/swig')
diff --git a/gr-noaa/swig/Makefile.am b/gr-noaa/swig/Makefile.am
index 18cb5920ae..2f98738ca0 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_cc.i
deleted file mode 100644
index a29eaa38af..0000000000
--- a/gr-noaa/swig/noaa_hrpt_pll_cc.i
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2009 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.
- */
-
-GR_SWIG_BLOCK_MAGIC(noaa,hrpt_pll_cc)
-
-noaa_hrpt_pll_cc_sptr
-noaa_make_hrpt_pll_cc(float alpha, float beta, float max_offset);
-
-class noaa_hrpt_pll_cc : public gr_sync_block
-{
-private:
- noaa_hrpt_pll_cc();
-
-public:
- void set_alpha(float alpha);
- void set_beta(float beta);
- void set_max_offset(float min_freq);
-};
diff --git a/gr-noaa/swig/noaa_hrpt_pll_cf.i b/gr-noaa/swig/noaa_hrpt_pll_cf.i
new file mode 100644
index 0000000000..859548a2db
--- /dev/null
+++ b/gr-noaa/swig/noaa_hrpt_pll_cf.i
@@ -0,0 +1,37 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2009 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.
+ */
+
+GR_SWIG_BLOCK_MAGIC(noaa,hrpt_pll_cf)
+
+noaa_hrpt_pll_cf_sptr
+noaa_make_hrpt_pll_cf(float alpha, float beta, float max_offset);
+
+class noaa_hrpt_pll_cf : public gr_sync_block
+{
+private:
+ noaa_hrpt_pll_cf();
+
+public:
+ void set_alpha(float alpha);
+ void set_beta(float beta);
+ void set_max_offset(float min_freq);
+};
diff --git a/gr-noaa/swig/noaa_hrpt_sync_cc.i b/gr-noaa/swig/noaa_hrpt_sync_cc.i
deleted file mode 100644
index 6dcfa57dfa..0000000000
--- a/gr-noaa/swig/noaa_hrpt_sync_cc.i
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2009 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.
- */
-
-GR_SWIG_BLOCK_MAGIC(noaa,hrpt_sync_cc)
-
-noaa_hrpt_sync_cc_sptr
-noaa_make_hrpt_sync_cc(float alpha, float beta, float sps, float max_offset);
-
-class noaa_hrpt_sync_cc : public gr_sync_block
-{
-private:
- noaa_hrpt_sync_cc();
-
-public:
- void set_alpha(float alpha);
- void set_beta(float beta);
- void set_max_offset(float min_freq);
-};
diff --git a/gr-noaa/swig/noaa_hrpt_sync_ff.i b/gr-noaa/swig/noaa_hrpt_sync_ff.i
new file mode 100644
index 0000000000..f3b1594ba3
--- /dev/null
+++ b/gr-noaa/swig/noaa_hrpt_sync_ff.i
@@ -0,0 +1,37 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2009 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.
+ */
+
+GR_SWIG_BLOCK_MAGIC(noaa,hrpt_sync_ff)
+
+noaa_hrpt_sync_ff_sptr
+noaa_make_hrpt_sync_ff(float alpha, float beta, float sps, float max_offset);
+
+class noaa_hrpt_sync_ff : public gr_sync_block
+{
+private:
+ noaa_hrpt_sync_ff();
+
+public:
+ void set_alpha(float alpha);
+ void set_beta(float beta);
+ void set_max_offset(float min_freq);
+};
diff --git a/gr-noaa/swig/noaa_swig.i b/gr-noaa/swig/noaa_swig.i
index 470f5f960e..a3e5dd7839 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"
--
cgit v1.2.3