diff options
| author | Tom Rondeau | 2011-04-09 18:36:27 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2011-04-09 18:36:27 -0400 |
| commit | 6c3623b0b084ce9328557ebd3cd487c484ee1c5b (patch) | |
| tree | cc3bbb7d466c56266d451003ca119c4dbbb5d95d /gr-digital/python | |
| parent | cd73f4af9ed50369c47655f9ebb29a4a1ad56f1d (diff) | |
| download | gnuradio-6c3623b0b084ce9328557ebd3cd487c484ee1c5b.tar.gz gnuradio-6c3623b0b084ce9328557ebd3cd487c484ee1c5b.tar.bz2 gnuradio-6c3623b0b084ce9328557ebd3cd487c484ee1c5b.zip | |
gr-digital: adding dbpsk, dqpsk, and d8psk demodulators to gr-digital.
Diffstat (limited to 'gr-digital/python')
| -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 |
3 files changed, 7 insertions, 5 deletions
diff --git a/gr-digital/python/d8psk.py b/gr-digital/python/d8psk.py index f386fff89..25467edc8 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 91d439563..2e9b756e6 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 33eb6733e..29afd5530 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 |