diff options
| author | Tom Rondeau <tom@trondeau.com> | 2014-07-07 12:20:09 -0400 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2014-07-07 12:20:09 -0400 |
| commit | bbfc759914da80214fabc70fbbed1edaf39f9e4b (patch) | |
| tree | 712eb6d1d95445bb6535534ce86d7faf1bfe6f90 /gr-noaa | |
| parent | 3f469513b94ac992138360caca7e1b53f82214ae (diff) | |
| parent | 597b93798a804cde1783d6d2ab53b348d57c44cd (diff) | |
Merge branch 'maint'
Diffstat (limited to 'gr-noaa')
| -rw-r--r-- | gr-noaa/lib/hrpt_pll_cf_impl.cc | 2 | ||||
| -rw-r--r-- | gr-noaa/python/noaa/__init__.py | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/gr-noaa/lib/hrpt_pll_cf_impl.cc b/gr-noaa/lib/hrpt_pll_cf_impl.cc index fc0d32408d..26376be351 100644 --- a/gr-noaa/lib/hrpt_pll_cf_impl.cc +++ b/gr-noaa/lib/hrpt_pll_cf_impl.cc @@ -51,7 +51,7 @@ namespace gr { return gnuradio::get_initial_sptr (new hrpt_pll_cf_impl(alpha, beta, max_offset)); } - + hrpt_pll_cf_impl::hrpt_pll_cf_impl(float alpha, float beta, float max_offset) : sync_block("noaa_hrpt_pll_cf", io_signature::make(1, 1, sizeof(gr_complex)), diff --git a/gr-noaa/python/noaa/__init__.py b/gr-noaa/python/noaa/__init__.py index 9192d2291e..876d5100ba 100644 --- a/gr-noaa/python/noaa/__init__.py +++ b/gr-noaa/python/noaa/__init__.py @@ -1,22 +1,22 @@ # Copyright 2012 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. -# +# ''' Blocks and utilities for NOAA app. |