diff options
| author | Johnathan Corgan <jcorgan@corganenterprises.com> | 2009-08-29 11:12:37 -0700 |
|---|---|---|
| committer | Johnathan Corgan <jcorgan@corganenterprises.com> | 2009-09-20 09:39:27 -0700 |
| commit | 6b6a5522e0b1d12ef5d697b1067a87dfe584cec6 (patch) | |
| tree | 3ec76adefa7b434eb5f789679f660f2227c078fc /gr-noaa/swig | |
| parent | a02a0e43d49d3bbb9a76ab8333f1bf8e25c48556 (diff) | |
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
Diffstat (limited to 'gr-noaa/swig')
| -rw-r--r-- | gr-noaa/swig/Makefile.am | 3 | ||||
| -rw-r--r-- | gr-noaa/swig/noaa_hrpt_pll_cc.i (renamed from gr-noaa/swig/noaa_carrier_pll_cc.i) | 10 | ||||
| -rw-r--r-- | gr-noaa/swig/noaa_hrpt_sync_cc.i | 37 | ||||
| -rw-r--r-- | gr-noaa/swig/noaa_swig.i | 6 |
4 files changed, 48 insertions, 8 deletions
diff --git a/gr-noaa/swig/Makefile.am b/gr-noaa/swig/Makefile.am index 927c6cfb22..18cb5920ae 100644 --- a/gr-noaa/swig/Makefile.am +++ b/gr-noaa/swig/Makefile.am @@ -53,7 +53,8 @@ noaa_swig_python = \ # additional SWIG files to be installed noaa_swig_swiginclude_headers = \ noaa_swig.i \ - noaa_carrier_pll_cc.i + noaa_hrpt_pll_cc.i \ + noaa_hrpt_sync_cc.i include $(top_srcdir)/Makefile.swig diff --git a/gr-noaa/swig/noaa_carrier_pll_cc.i b/gr-noaa/swig/noaa_hrpt_pll_cc.i index 4d61f393c0..a29eaa38af 100644 --- a/gr-noaa/swig/noaa_carrier_pll_cc.i +++ b/gr-noaa/swig/noaa_hrpt_pll_cc.i @@ -20,15 +20,15 @@ * Boston, MA 02110-1301, USA. */ -GR_SWIG_BLOCK_MAGIC(noaa,carrier_pll_cc) +GR_SWIG_BLOCK_MAGIC(noaa,hrpt_pll_cc) -noaa_carrier_pll_cc_sptr -noaa_make_carrier_pll_cc(float alpha, float beta, float max_offset); +noaa_hrpt_pll_cc_sptr +noaa_make_hrpt_pll_cc(float alpha, float beta, float max_offset); -class noaa_carrier_pll_cc : public gr_sync_block +class noaa_hrpt_pll_cc : public gr_sync_block { private: - noaa_carrier_pll_cc(); + noaa_hrpt_pll_cc(); public: void set_alpha(float alpha); diff --git a/gr-noaa/swig/noaa_hrpt_sync_cc.i b/gr-noaa/swig/noaa_hrpt_sync_cc.i new file mode 100644 index 0000000000..6dcfa57dfa --- /dev/null +++ b/gr-noaa/swig/noaa_hrpt_sync_cc.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_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_swig.i b/gr-noaa/swig/noaa_swig.i index 384f4e6a22..470f5f960e 100644 --- a/gr-noaa/swig/noaa_swig.i +++ b/gr-noaa/swig/noaa_swig.i @@ -23,7 +23,9 @@ %include "gnuradio.i" %{ -#include <noaa_carrier_pll_cc.h> +#include <noaa_hrpt_pll_cc.h> +#include <noaa_hrpt_sync_cc.h> %} -%include "noaa_carrier_pll_cc.i" +%include "noaa_hrpt_pll_cc.i" +%include "noaa_hrpt_sync_cc.i" |