diff options
| author | trondeau <trondeau@221aa14e-8319-0410-a670-987f0aec2ac5> | 2007-03-07 04:31:19 +0000 |
|---|---|---|
| committer | trondeau <trondeau@221aa14e-8319-0410-a670-987f0aec2ac5> | 2007-03-07 04:31:19 +0000 |
| commit | 28e086141aead2e43f958f0ae14d58cac557fa2d (patch) | |
| tree | 1ae54b3d508506d4ea25c7e8a335c5e2cd56dcef /gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py | |
| parent | 224434889bf564a4456011180c62a58e0ca55c8f (diff) | |
merged trondeau/digital-wip2 r4193:4730 into trunk - improves digital receiver and fixes ticket:72
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@4731 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py')
| -rw-r--r-- | gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py | 148 |
1 files changed, 66 insertions, 82 deletions
diff --git a/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py b/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py index 470ab8e2a5..28fb426637 100644 --- a/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py +++ b/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py @@ -39,9 +39,9 @@ _def_gray_code = True _def_verbose = False _def_log = False -_def_costas_alpha = None -_def_gain_mu = 0.03 -_def_mu = 0.05 +_def_costas_alpha = 0.1 +_def_gain_mu = None +_def_mu = 0.5 _def_omega_relative_limit = 0.005 @@ -88,7 +88,7 @@ class dbpsk_mod(gr.hier_block): ntaps = 11 * self._samples_per_symbol arity = pow(2,self.bits_per_symbol()) - + # turn bytes into k-bit vectors self.bytes2chunks = \ gr.packed_to_unpacked_bb(self.bits_per_symbol(), gr.GR_MSB_FIRST) @@ -99,18 +99,17 @@ class dbpsk_mod(gr.hier_block): self.symbol_mapper = gr.map_bb(psk.binary_to_ungray[arity]) self.diffenc = gr.diff_encoder_bb(arity) - + self.chunks2symbols = gr.chunks_to_symbols_bc(psk.constellation[arity]) # pulse shaping filter self.rrc_taps = gr.firdes.root_raised_cosine( - self._samples_per_symbol, # gain (samples_per_symbol since we're - # interpolating by samples_per_symbol) - self._samples_per_symbol, # sampling rate - 1.0, # symbol rate - self._excess_bw, # excess bandwidth (roll-off factor) + self._samples_per_symbol, # gain (samples_per_symbol since we're + # interpolating by samples_per_symbol) + self._samples_per_symbol, # sampling rate + 1.0, # symbol rate + self._excess_bw, # excess bandwidth (roll-off factor) ntaps) - self.rrc_filter = gr.interp_fir_filter_ccf(self._samples_per_symbol, self.rrc_taps) @@ -155,22 +154,23 @@ class dbpsk_mod(gr.hier_block): def _print_verbage(self): - print "bits per symbol = %d" % self.bits_per_symbol() - print "Gray code = %s" % self._gray_code - print "RRC roll-off factor = %.2f" % self._excess_bw + print "\nModulator:" + print "bits per symbol: %d" % self.bits_per_symbol() + print "Gray code: %s" % self._gray_code + print "RRC roll-off factor: %.2f" % self._excess_bw def _setup_logging(self): print "Modulation logging turned on." self._fg.connect(self.bytes2chunks, - gr.file_sink(gr.sizeof_char, "bytes2chunks.dat")) + gr.file_sink(gr.sizeof_char, "tx_bytes2chunks.dat")) self._fg.connect(self.symbol_mapper, - gr.file_sink(gr.sizeof_char, "graycoder.dat")) + gr.file_sink(gr.sizeof_char, "tx_graycoder.dat")) self._fg.connect(self.diffenc, - gr.file_sink(gr.sizeof_char, "diffenc.dat")) + gr.file_sink(gr.sizeof_char, "tx_diffenc.dat")) self._fg.connect(self.chunks2symbols, - gr.file_sink(gr.sizeof_gr_complex, "chunks2symbols.dat")) + gr.file_sink(gr.sizeof_gr_complex, "tx_chunks2symbols.dat")) self._fg.connect(self.rrc_filter, - gr.file_sink(gr.sizeof_gr_complex, "rrc_filter.dat")) + gr.file_sink(gr.sizeof_gr_complex, "tx_rrc_filter.dat")) # ///////////////////////////////////////////////////////////////////////////// @@ -223,9 +223,9 @@ class dbpsk_demod(gr.hier_block): self._samples_per_symbol = samples_per_symbol self._excess_bw = excess_bw self._costas_alpha = costas_alpha - self._gain_mu = gain_mu - self._mu = mu - self._omega_relative_limit = omega_relative_limit + self._mm_gain_mu = gain_mu + self._mm_mu = mu + self._mm_omega_relative_limit = omega_relative_limit self._gray_code = gray_code if samples_per_symbol < 2: @@ -237,43 +237,41 @@ class dbpsk_demod(gr.hier_block): 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, 1.0) - - - # Costas loop (carrier tracking) - # The Costas loop is not needed for BPSK, though it can help. Turn the Costas loop on - # by setting an alpha value not None. - if self._costas_alpha is not None: - costas_order = 2 - beta = .25 * self._costas_alpha * self._costas_alpha - self.costas_loop = gr.costas_loop_cc(self._costas_alpha, beta, 0.002, -0.002, costas_order) + self.agc = gr.feedforward_agc_cc(16, 2.0) # RRC data filter - ntaps = 11 * self._samples_per_symbol + ntaps = 11 * samples_per_symbol self.rrc_taps = gr.firdes.root_raised_cosine( - 1.0, # gain + 1.0, # gain self._samples_per_symbol, # sampling rate 1.0, # symbol rate self._excess_bw, # excess bandwidth (roll-off factor) ntaps) - - self.rrc_filter=gr.fir_filter_ccf(1, self.rrc_taps) + self.rrc_filter=gr.interp_fir_filter_ccf(1, self.rrc_taps) # symbol clock recovery - omega = self._samples_per_symbol - gain_omega = .25 * self._gain_mu * self._gain_mu - self.clock_recovery=gr.clock_recovery_mm_cc(omega, gain_omega, - self._mu, self._gain_mu, - self._omega_relative_limit) + if not self._mm_gain_mu: + self._mm_gain_mu = 0.1 + + self._mm_omega = self._samples_per_symbol + self._mm_gain_omega = .25 * self._mm_gain_mu * self._mm_gain_mu + self._costas_beta = 0.25 * self._costas_alpha * self._costas_alpha + fmin = -0.025 + fmax = 0.025 + + self.receiver=gr.mpsk_receiver_cc(arity, 0, + self._costas_alpha, self._costas_beta, + fmin, fmax, + self._mm_mu, self._mm_gain_mu, + self._mm_omega, self._mm_gain_omega, + self._mm_omega_relative_limit) + + # Do differential decoding based on phase change of symbols + self.diffdec = gr.diff_phasor_cc() # find closest constellation point rot = 1 rotated_const = map(lambda pt: pt * rot, psk.constellation[arity]) - #print "rotated_const =", rotated_const - - self.diffdec = gr.diff_phasor_cc() - #self.diffdec = gr.diff_decoder_bb(arity) - self.slicer = gr.constellation_decoder_cb(rotated_const, range(arity)) if self._gray_code: @@ -291,15 +289,8 @@ class dbpsk_demod(gr.hier_block): self._setup_logging() # Connect and Initialize base class - if self._costas_alpha is not None: # With Costas Loop - self._fg.connect(self.pre_scaler, self.agc, self.costas_loop, - self.rrc_filter, self.clock_recovery, self.diffdec, - self.slicer, self.symbol_mapper, self.unpack) - else: # Without Costas Loop - self._fg.connect(self.pre_scaler, self.agc, - self.rrc_filter, self.clock_recovery, self.diffdec, - self.slicer, self.symbol_mapper, self.unpack) - + self._fg.connect(self.pre_scaler, self.agc, self.rrc_filter, self.receiver, + self.diffdec, self.slicer, self.symbol_mapper, self.unpack) gr.hier_block.__init__(self, self._fg, self.pre_scaler, self.unpack) def samples_per_symbol(self): @@ -310,42 +301,36 @@ class dbpsk_demod(gr.hier_block): bits_per_symbol = staticmethod(bits_per_symbol) # make it a static method. RTFM def _print_verbage(self): - print "bits per symbol = %d" % self.bits_per_symbol() - print "Gray code = %s" % self._gray_code - print "RRC roll-off factor = %.2f" % self._excess_bw - if self._costas_alpha is not None: - print "Costas Loop alpha = %.5f" % self._costas_alpha - else: - print "Costas Loop is turned off" - print "M&M symbol sync gain = %.5f" % self._gain_mu - print "M&M symbol sync mu = %.5f" % self._mu - print "M&M omega relative limit = %.5f" % self._omega_relative_limit + print "\nDemodulator:" + print "bits per symbol: %d" % self.bits_per_symbol() + print "Gray code: %s" % self._gray_code + print "RRC roll-off factor: %.2f" % self._excess_bw + print "Costas Loop alpha: %.2e" % self._costas_alpha + print "Costas Loop beta: %.2e" % self._costas_beta + print "M&M mu: %.2f" % self._mm_mu + print "M&M mu gain: %.2e" % self._mm_gain_mu + print "M&M omega: %.2f" % self._mm_omega + print "M&M omega gain: %.2e" % self._mm_gain_omega + print "M&M omega limit: %.2f" % self._mm_omega_relative_limit def _setup_logging(self): print "Modulation logging turned on." self._fg.connect(self.pre_scaler, - gr.file_sink(gr.sizeof_gr_complex, "prescaler.dat")) + gr.file_sink(gr.sizeof_gr_complex, "rx_prescaler.dat")) self._fg.connect(self.agc, - gr.file_sink(gr.sizeof_gr_complex, "agc.dat")) - if self._costas_alpha is not None: - self._fg.connect(self.costas_loop, - gr.file_sink(gr.sizeof_gr_complex, "costas_loop.dat")) - self._fg.connect((self.costas_loop,1), - gr.file_sink(gr.sizeof_gr_complex, "costas_error.dat")) + gr.file_sink(gr.sizeof_gr_complex, "rx_agc.dat")) self._fg.connect(self.rrc_filter, - gr.file_sink(gr.sizeof_gr_complex, "rrc_filter.dat")) - self._fg.connect(self.clock_recovery, - gr.file_sink(gr.sizeof_gr_complex, "clock_recovery.dat")) - self._fg.connect((self.clock_recovery,1), - gr.file_sink(gr.sizeof_gr_complex, "clock_recovery_error.dat")) + gr.file_sink(gr.sizeof_gr_complex, "rx_rrc_filter.dat")) + self._fg.connect(self.receiver, + gr.file_sink(gr.sizeof_gr_complex, "rx_receiver.dat")) self._fg.connect(self.diffdec, - gr.file_sink(gr.sizeof_gr_complex, "diffdec.dat")) + gr.file_sink(gr.sizeof_gr_complex, "rx_diffdec.dat")) self._fg.connect(self.slicer, - gr.file_sink(gr.sizeof_char, "slicer.dat")) + gr.file_sink(gr.sizeof_char, "rx_slicer.dat")) self._fg.connect(self.symbol_mapper, - gr.file_sink(gr.sizeof_char, "symbol_mapper.dat")) + gr.file_sink(gr.sizeof_char, "rx_symbol_mapper.dat")) self._fg.connect(self.unpack, - gr.file_sink(gr.sizeof_char, "unpack.dat")) + gr.file_sink(gr.sizeof_char, "rx_unpack.dat")) def add_options(parser): """ @@ -373,7 +358,6 @@ class dbpsk_demod(gr.hier_block): return modulation_utils.extract_kwargs_from_options( dbpsk_demod.__init__, ('self', 'fg'), options) extract_kwargs_from_options=staticmethod(extract_kwargs_from_options) - # # Add these to the mod/demod registry # |