diff options
| author | Josh Blum <josh@joshknows.com> | 2011-08-17 11:56:33 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-08-17 11:56:33 -0700 |
| commit | e6ed4fa7bb0d253adbf0cf2ae4da7c301b3c971f (patch) | |
| tree | 09f43f64f581af7b5159debaf7489365b0a1259d /gr-digital/examples/transmit_path.py | |
| parent | 40a9071074b2ec0f6daf74e50e131b89b9f66226 (diff) | |
| parent | ed564be6c78a3e22b3c98862834192f8b20bc551 (diff) | |
Merge branch 'digital' of https://github.com/trondeau/gnuradio into digital
Conflicts:
gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.h
gnuradio-core/src/lib/general/gr_fll_band_edge_cc.h
gnuradio-core/src/lib/general/gr_pll_refout_cc.h
gr-digital/lib/digital_constellation_receiver_cb.cc
gr-digital/lib/digital_constellation_receiver_cb.h
gr-digital/lib/digital_costas_loop_cc.h
Diffstat (limited to 'gr-digital/examples/transmit_path.py')
| -rw-r--r-- | gr-digital/examples/transmit_path.py | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/gr-digital/examples/transmit_path.py b/gr-digital/examples/transmit_path.py index 91869ad9ad..f22ffb3278 100644 --- a/gr-digital/examples/transmit_path.py +++ b/gr-digital/examples/transmit_path.py @@ -44,17 +44,17 @@ class transmit_path(gr.hier_block2): self._verbose = options.verbose self._tx_amplitude = options.tx_amplitude # digital amplitude sent to USRP self._bitrate = options.bitrate # desired bit rate - self._samples_per_symbol = options.samples_per_symbol # desired samples/baud self._modulator_class = modulator_class # the modulator_class we are using # Get mod_kwargs mod_kwargs = self._modulator_class.extract_kwargs_from_options(options) - + # transmitter - modulator = self._modulator_class(**mod_kwargs) + self.modulator = self._modulator_class(**mod_kwargs) + self.packet_transmitter = \ - digital.mod_pkts(modulator, + digital.mod_pkts(self.modulator, access_code=None, msgq_limit=4, pad_for_usrp=True) @@ -87,7 +87,10 @@ class transmit_path(gr.hier_block2): return self._bitrate def samples_per_symbol(self): - return self._samples_per_symbol + return self.modulator._samples_per_symbol + + def differential(self): + return self.modulator._differential def add_options(normal, expert): """ @@ -115,5 +118,5 @@ class transmit_path(gr.hier_block2): print "Tx amplitude %s" % (self._tx_amplitude) print "modulation: %s" % (self._modulator_class.__name__) print "bitrate: %sb/s" % (eng_notation.num_to_str(self._bitrate)) - print "samples/symbol: %.4f" % (self._samples_per_symbol) - + print "samples/symbol: %.4f" % (self.samples_per_symbol()) + print "Differential: %s" % (self.differential()) |