diff options
| author | Tom Rondeau | 2010-03-13 20:08:50 -0500 |
|---|---|---|
| committer | Tom Rondeau | 2010-03-13 20:08:50 -0500 |
| commit | ec8e9c7e113046c66176498f12ec79f11d3da65e (patch) | |
| tree | f03cfa2293e294326f0803a8c511690c9f116938 /gnuradio-core | |
| parent | 1ba78b5f4c6bc2468b6fb798f41837a8ab2be89b (diff) | |
| download | gnuradio-ec8e9c7e113046c66176498f12ec79f11d3da65e.tar.gz gnuradio-ec8e9c7e113046c66176498f12ec79f11d3da65e.tar.bz2 gnuradio-ec8e9c7e113046c66176498f12ec79f11d3da65e.zip | |
Adding version 2 of receive path so as not to affect old dbpsk and dqpsk operations.
Diffstat (limited to 'gnuradio-core')
| -rw-r--r-- | gnuradio-core/src/python/gnuradio/blks2impl/dbpsk.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/dbpsk.py b/gnuradio-core/src/python/gnuradio/blks2impl/dbpsk.py index 860015c3f..55e4890f3 100644 --- a/gnuradio-core/src/python/gnuradio/blks2impl/dbpsk.py +++ b/gnuradio-core/src/python/gnuradio/blks2impl/dbpsk.py @@ -233,10 +233,10 @@ class dbpsk_demod(gr.hier_block2): arity = pow(2,self.bits_per_symbol()) # Automatic gain control - scale = (1.0/16384.0) - self.pre_scaler = gr.multiply_const_cc(scale) # scale the signal from full-range to +-1 - #self.agc = gr.agc2_cc(0.6e-1, 1e-3, 1, 1, 100) - self.agc = gr.feedforward_agc_cc(16, 2.0) + #scale = (1.0/16384.0) + #self.pre_scaler = gr.multiply_const_cc(scale) # scale the signal from full-range to +-1 + self.agc = gr.agc2_cc(0.6e-1, 1e-3, 1, 1, 100) + #self.agc = gr.feedforward_agc_cc(16, 2.0) # RRC data filter ntaps = 11 * samples_per_symbol @@ -288,7 +288,7 @@ class dbpsk_demod(gr.hier_block2): self._setup_logging() # Connect and Initialize base class - self.connect(self, self.pre_scaler, self.agc, self.rrc_filter, self.receiver, + self.connect(self, self.agc, self.rrc_filter, self.receiver, self.diffdec, self.slicer, self.symbol_mapper, self.unpack, self) def samples_per_symbol(self): |