diff options
Diffstat (limited to 'gr-digital/examples')
| -rwxr-xr-x | gr-digital/examples/example_timing.py | 2 | ||||
| -rw-r--r-- | gr-digital/examples/receive_path.py | 14 | ||||
| -rw-r--r-- | gr-digital/examples/transmit_path.py | 15 |
3 files changed, 19 insertions, 12 deletions
diff --git a/gr-digital/examples/example_timing.py b/gr-digital/examples/example_timing.py index ef72d2369..fd86acfb1 100755 --- a/gr-digital/examples/example_timing.py +++ b/gr-digital/examples/example_timing.py @@ -42,7 +42,7 @@ class example_timing(gr.top_block): if mode == 0: self.clk = gr.pfb_clock_sync_ccf(sps, gain, rrc_taps_rx, - nfilts, nfilts/2, 3.5) + nfilts, nfilts//2, 3.5) self.taps = self.clk.get_taps() self.dtaps = self.clk.get_diff_taps() diff --git a/gr-digital/examples/receive_path.py b/gr-digital/examples/receive_path.py index c6a26daf2..dd8eb1a0d 100644 --- a/gr-digital/examples/receive_path.py +++ b/gr-digital/examples/receive_path.py @@ -50,12 +50,12 @@ class receive_path(gr.hier_block2): demod_kwargs = self._demod_class.extract_kwargs_from_options(options) # Build the demodulator - demodulator = self._demod_class(**demod_kwargs) + self.demodulator = self._demod_class(**demod_kwargs) # Design filter to get actual channel we want sw_decim = 1 chan_coeffs = gr.firdes.low_pass (1.0, # gain - sw_decim * demodulator._samples_per_symbol, # sampling rate + sw_decim * self.samples_per_symbol(), # sampling rate 1.0, # midpoint of trans. band 0.5, # width of trans. band gr.firdes.WIN_HANN) # filter type @@ -63,7 +63,7 @@ class receive_path(gr.hier_block2): # receiver self.packet_receiver = \ - digital.demod_pkts(demodulator, + digital.demod_pkts(self.demodulator, access_code=None, callback=self._rx_callback, threshold=-1) @@ -90,7 +90,10 @@ class receive_path(gr.hier_block2): return self._bitrate def samples_per_symbol(self): - return self._samples_per_symbol + return self.demodulator._samples_per_symbol + + def differential(self): + return self.demodulator._differential def carrier_sensed(self): """ @@ -139,4 +142,5 @@ class receive_path(gr.hier_block2): print "\nReceive Path:" print "modulation: %s" % (self._demod_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()) diff --git a/gr-digital/examples/transmit_path.py b/gr-digital/examples/transmit_path.py index 8ffb1e108..f22ffb327 100644 --- a/gr-digital/examples/transmit_path.py +++ b/gr-digital/examples/transmit_path.py @@ -44,7 +44,6 @@ 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 @@ -52,9 +51,10 @@ class transmit_path(gr.hier_block2): 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()) |