diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2011-04-09 18:36:27 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2011-04-09 18:36:27 -0400 |
| commit | 6c3623b0b084ce9328557ebd3cd487c484ee1c5b (patch) | |
| tree | cc3bbb7d466c56266d451003ca119c4dbbb5d95d /gr-digital | |
| parent | cd73f4af9ed50369c47655f9ebb29a4a1ad56f1d (diff) | |
gr-digital: adding dbpsk, dqpsk, and d8psk demodulators to gr-digital.
Diffstat (limited to 'gr-digital')
| -rw-r--r-- | gr-digital/grc/Makefile.am | 3 | ||||
| -rw-r--r-- | gr-digital/grc/digital_block_tree.xml | 25 | ||||
| -rw-r--r-- | gr-digital/python/d8psk.py | 5 | ||||
| -rw-r--r-- | gr-digital/python/dbpsk.py | 2 | ||||
| -rw-r--r-- | gr-digital/python/dqpsk.py | 5 |
5 files changed, 33 insertions, 7 deletions
diff --git a/gr-digital/grc/Makefile.am b/gr-digital/grc/Makefile.am index 748511c1ca..8d08c3f59d 100644 --- a/gr-digital/grc/Makefile.am +++ b/gr-digital/grc/Makefile.am @@ -28,4 +28,5 @@ dist_grcblocks_DATA = \ digital_costas_loop_cc.xml \ digital_cma_equalizer_cc.xml \ digital_kurtotic_equalizer_cc.xml \ - digital_dxpsk_mod.xml
\ No newline at end of file + digital_dxpsk_mod.xml \ + digital_dxpsk_demod.xml diff --git a/gr-digital/grc/digital_block_tree.xml b/gr-digital/grc/digital_block_tree.xml index d368589911..c132ff5b42 100644 --- a/gr-digital/grc/digital_block_tree.xml +++ b/gr-digital/grc/digital_block_tree.xml @@ -1,4 +1,26 @@ <?xml version="1.0"?> + +<!-- + Copyright 2011 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. +--> + <!-- ################################################### ##Block Tree for GR Digital blocks. @@ -13,7 +35,8 @@ <block>digital_kurtotic_equalizer_cc</block> </cat> <cat> - <name>Digital Mods</name> + <name>Digital Modulators</name> <block>digital_dxpsk_mod</block> + <block>digital_dxpsk_demod</block> </cat> </cat> diff --git a/gr-digital/python/d8psk.py b/gr-digital/python/d8psk.py index f386fff89a..25467edc8f 100644 --- a/gr-digital/python/d8psk.py +++ b/gr-digital/python/d8psk.py @@ -229,7 +229,8 @@ class d8psk_demod(gr.hier_block2): self._excess_bw = excess_bw self._freq_alpha = freq_alpha self._freq_beta = 0.25*self._freq_alpha**2 - self._phase_alpha = phase_alpha + self._phase_damping = phase_damping + self._phase_natfreq = phase_natfreq self._timing_alpha = timing_alpha self._timing_beta = _def_timing_beta self._timing_max_dev=timing_max_dev @@ -291,7 +292,7 @@ class d8psk_demod(gr.hier_block2): self.connect(self, self.agc, self.freq_recov, self.time_recov, self.phase_recov, self.diffdec, self.slicer, self.symbol_mapper, self.unpack, self) - if sync_out: self.connect(self.time_recov, (self, 1)) + if sync_out: self.connect(self.phase_recov, (self, 1)) def samples_per_symbol(self): return self._samples_per_symbol diff --git a/gr-digital/python/dbpsk.py b/gr-digital/python/dbpsk.py index 91d4395631..2e9b756e64 100644 --- a/gr-digital/python/dbpsk.py +++ b/gr-digital/python/dbpsk.py @@ -294,7 +294,7 @@ class dbpsk_demod(gr.hier_block2): self.connect(self, self.agc, self.freq_recov, self.time_recov, self.phase_recov, self.diffdec, self.slicer, self.symbol_mapper, self.unpack, self) - if sync_out: self.connect(self.time_recov, (self, 1)) + if sync_out: self.connect(self.phase_recov, (self, 1)) def samples_per_symbol(self): return self._samples_per_symbol diff --git a/gr-digital/python/dqpsk.py b/gr-digital/python/dqpsk.py index 33eb6733e3..29afd55306 100644 --- a/gr-digital/python/dqpsk.py +++ b/gr-digital/python/dqpsk.py @@ -232,7 +232,8 @@ class dqpsk_demod(gr.hier_block2): self._excess_bw = excess_bw self._freq_alpha = freq_alpha self._freq_beta = 0.25*self._freq_alpha**2 - self._phase_alpha = phase_alpha + self._phase_damping = phase_damping + self._phase_natfreq = phase_natfreq self._timing_alpha = timing_alpha self._timing_beta = _def_timing_beta self._timing_max_dev=timing_max_dev @@ -296,7 +297,7 @@ class dqpsk_demod(gr.hier_block2): self.connect(self, self.agc, self.freq_recov, self.time_recov, self.phase_recov, self.diffdec, self.slicer, self.symbol_mapper, self.unpack, self) - if sync_out: self.connect(self.time_recov, (self, 1)) + if sync_out: self.connect(self.phase_recov, (self, 1)) def samples_per_symbol(self): return self._samples_per_symbol |