From b6101982e270948b4a3185ee745ed76bb8661552 Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Sat, 15 Aug 2009 12:30:45 -0700 Subject: Created new gr-noaa top-level component. Initial work: - Carrier recovery/mixer PLL block - Start of POES grc pipeline, recovers Manchester symbols only - Start of GOES grc pipeline, recovers BPSK symbols only --- gr-noaa/swig/noaa_swig.i | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 gr-noaa/swig/noaa_swig.i (limited to 'gr-noaa/swig/noaa_swig.i') diff --git a/gr-noaa/swig/noaa_swig.i b/gr-noaa/swig/noaa_swig.i new file mode 100644 index 000000000..384f4e6a2 --- /dev/null +++ b/gr-noaa/swig/noaa_swig.i @@ -0,0 +1,29 @@ +/* -*- 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. + */ + +%include "gnuradio.i" + +%{ +#include +%} + +%include "noaa_carrier_pll_cc.i" -- cgit From 6b6a5522e0b1d12ef5d697b1067a87dfe584cec6 Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Sat, 29 Aug 2009 11:12:37 -0700 Subject: Work in progress, incomplete * Renamed noaa.carrier_pll_cc to noaa.hrpt_pll_cc * Added nop noaa.hrpt_sync_cc * Renamed grc apps to use usrp_ prefix and protocol name * Installed grc generated scripts to path --- gr-noaa/swig/noaa_swig.i | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gr-noaa/swig/noaa_swig.i') diff --git a/gr-noaa/swig/noaa_swig.i b/gr-noaa/swig/noaa_swig.i index 384f4e6a2..470f5f960 100644 --- a/gr-noaa/swig/noaa_swig.i +++ b/gr-noaa/swig/noaa_swig.i @@ -23,7 +23,9 @@ %include "gnuradio.i" %{ -#include +#include +#include %} -%include "noaa_carrier_pll_cc.i" +%include "noaa_hrpt_pll_cc.i" +%include "noaa_hrpt_sync_cc.i" -- cgit From 65bcd58b65219408268e5db1b8fbafb2d3ccc215 Mon Sep 17 00:00:00 2001 From: Johnathan Corgan 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/noaa_swig.i | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gr-noaa/swig/noaa_swig.i') 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 -#include +#include +#include %} -%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 From b7d1c551fb374a0e5219fbb4d118f3f19f448393 Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Tue, 8 Sep 2009 16:52:37 -0700 Subject: Changed synchronizer to output sliced bits. --- gr-noaa/swig/noaa_swig.i | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gr-noaa/swig/noaa_swig.i') diff --git a/gr-noaa/swig/noaa_swig.i b/gr-noaa/swig/noaa_swig.i index a3e5dd783..8223eedb9 100644 --- a/gr-noaa/swig/noaa_swig.i +++ b/gr-noaa/swig/noaa_swig.i @@ -24,8 +24,8 @@ %{ #include -#include +#include %} %include "noaa_hrpt_pll_cf.i" -%include "noaa_hrpt_sync_ff.i" +%include "noaa_hrpt_sync_fb.i" -- cgit From ce9a41e69f5e3b9e0280d22fa778d167c3982db7 Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Tue, 8 Sep 2009 21:08:29 -0700 Subject: Added HRPT deframer block --- gr-noaa/swig/noaa_swig.i | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gr-noaa/swig/noaa_swig.i') diff --git a/gr-noaa/swig/noaa_swig.i b/gr-noaa/swig/noaa_swig.i index 8223eedb9..44f2e4723 100644 --- a/gr-noaa/swig/noaa_swig.i +++ b/gr-noaa/swig/noaa_swig.i @@ -23,9 +23,11 @@ %include "gnuradio.i" %{ +#include #include #include %} +%include "noaa_hrpt_deframer.i" %include "noaa_hrpt_pll_cf.i" %include "noaa_hrpt_sync_fb.i" -- cgit From f8fcb642dabca11870886c53dfdff66c86774db0 Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Sun, 20 Sep 2009 19:32:30 -0700 Subject: Added skeleton HRPT decoder block --- gr-noaa/swig/noaa_swig.i | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gr-noaa/swig/noaa_swig.i') diff --git a/gr-noaa/swig/noaa_swig.i b/gr-noaa/swig/noaa_swig.i index 44f2e4723..e6497bc46 100644 --- a/gr-noaa/swig/noaa_swig.i +++ b/gr-noaa/swig/noaa_swig.i @@ -23,11 +23,13 @@ %include "gnuradio.i" %{ +#include #include #include #include %} +%include "noaa_hrpt_decoder.i" %include "noaa_hrpt_deframer.i" %include "noaa_hrpt_pll_cf.i" %include "noaa_hrpt_sync_fb.i" -- cgit