diff options
| author | Tom Rondeau | 2010-03-13 20:16:46 -0500 |
|---|---|---|
| committer | Tom Rondeau | 2010-03-13 20:16:46 -0500 |
| commit | 8c163c9cca7aa39862c8c8eb19a3e0a18c61a661 (patch) | |
| tree | c14927c87a076eb23810e7d9615fe0901b143b33 /gnuradio-core/src | |
| parent | 6a617516e0678df0c6cb94319cb5980556d49793 (diff) | |
| parent | d7aa018010c828b2bedf0e3974c9d11d41088258 (diff) | |
| download | gnuradio-8c163c9cca7aa39862c8c8eb19a3e0a18c61a661.tar.gz gnuradio-8c163c9cca7aa39862c8c8eb19a3e0a18c61a661.tar.bz2 gnuradio-8c163c9cca7aa39862c8c8eb19a3e0a18c61a661.zip | |
Merge branch 'digital' of vps.gnuradio.org:trondeau into digital
Diffstat (limited to 'gnuradio-core/src')
| -rw-r--r-- | gnuradio-core/src/python/gnuradio/blks2impl/dbpsk2.py | 10 | ||||
| -rw-r--r-- | gnuradio-core/src/python/gnuradio/blks2impl/dqpsk2.py | 10 |
2 files changed, 8 insertions, 12 deletions
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/dbpsk2.py b/gnuradio-core/src/python/gnuradio/blks2impl/dbpsk2.py index 7830874d1..135b38e1f 100644 --- a/gnuradio-core/src/python/gnuradio/blks2impl/dbpsk2.py +++ b/gnuradio-core/src/python/gnuradio/blks2impl/dbpsk2.py @@ -317,16 +317,14 @@ class dbpsk2_demod(gr.hier_block2): def _setup_logging(self): print "Modulation logging turned on." - self.connect(self.pre_scaler, - gr.file_sink(gr.sizeof_gr_complex, "rx_prescaler.dat")) self.connect(self.agc, gr.file_sink(gr.sizeof_gr_complex, "rx_agc.dat")) - self.connect(self.rrc_filter, - gr.file_sink(gr.sizeof_gr_complex, "rx_rrc_filter.dat")) - self.connect(self.clock_recov, - gr.file_sink(gr.sizeof_gr_complex, "rx_clock_recov.dat")) + self.connect(self.freq_recov, + gr.file_sink(gr.sizeof_gr_complex, "rx_freq_recov.dat")) self.connect(self.time_recov, gr.file_sink(gr.sizeof_gr_complex, "rx_time_recov.dat")) + self.connect(self.phase_recov, + gr.file_sink(gr.sizeof_gr_complex, "rx_phase_recov.dat")) self.connect(self.diffdec, gr.file_sink(gr.sizeof_gr_complex, "rx_diffdec.dat")) self.connect(self.slicer, diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/dqpsk2.py b/gnuradio-core/src/python/gnuradio/blks2impl/dqpsk2.py index b09978fb9..f852a324c 100644 --- a/gnuradio-core/src/python/gnuradio/blks2impl/dqpsk2.py +++ b/gnuradio-core/src/python/gnuradio/blks2impl/dqpsk2.py @@ -323,16 +323,14 @@ class dqpsk2_demod(gr.hier_block2): def _setup_logging(self): print "Modulation logging turned on." - self.connect(self.pre_scaler, - gr.file_sink(gr.sizeof_gr_complex, "rx_prescaler.dat")) self.connect(self.agc, gr.file_sink(gr.sizeof_gr_complex, "rx_agc.dat")) - self.connect(self.rrc_filter, - gr.file_sink(gr.sizeof_gr_complex, "rx_rrc_filter.dat")) - self.connect(self.clock_recov, - gr.file_sink(gr.sizeof_gr_complex, "rx_clock_recov.dat")) + self.connect(self.freq_recov, + gr.file_sink(gr.sizeof_gr_complex, "rx_freq_recov.dat")) self.connect(self.time_recov, gr.file_sink(gr.sizeof_gr_complex, "rx_time_recov.dat")) + self.connect(self.phase_recov, + gr.file_sink(gr.sizeof_gr_complex, "rx_phase_recov.dat")) self.connect(self.diffdec, gr.file_sink(gr.sizeof_gr_complex, "rx_diffdec.dat")) self.connect(self.slicer, |