diff options
Diffstat (limited to 'gr-digital/python')
| -rw-r--r-- | gr-digital/python/ofdm_sync_ml.py | 6 | ||||
| -rw-r--r-- | gr-digital/python/pkt.py | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/gr-digital/python/ofdm_sync_ml.py b/gr-digital/python/ofdm_sync_ml.py index cab6ffda6c..69cfcbc7ea 100644 --- a/gr-digital/python/ofdm_sync_ml.py +++ b/gr-digital/python/ofdm_sync_ml.py @@ -84,8 +84,8 @@ class ofdm_sync_ml(gr.hier_block2): self.movingsum2 = filter.fir_filter_ccf(1,movingsum2_taps) # Correlator data handler - self.c2mag = gr.complex_to_mag() - self.angle = gr.complex_to_arg() + self.c2mag = blocks.complex_to_mag() + self.angle = blocks.complex_to_arg() self.connect(self.input,(self.mixer,1)) self.connect(self.delay,self.conjg,(self.mixer,0)) self.connect(self.mixer,self.movingsum2,self.c2mag) @@ -98,7 +98,7 @@ class ofdm_sync_ml(gr.hier_block2): #ML measurements input to sampler block and detect self.f2c = blocks.float_to_complex() - self.pk_detect = gr.peak_detector_fb(0.2, 0.25, 30, 0.0005) + self.pk_detect = blocks.peak_detector_fb(0.2, 0.25, 30, 0.0005) self.sample_and_hold = blocks.sample_and_hold_ff() # use the sync loop values to set the sampler and the NCO diff --git a/gr-digital/python/pkt.py b/gr-digital/python/pkt.py index d084c3ff0f..434548906e 100644 --- a/gr-digital/python/pkt.py +++ b/gr-digital/python/pkt.py @@ -25,6 +25,10 @@ import gnuradio.gr.gr_threading as _threading import packet_utils import digital_swig as digital +try: + from gnuradio import blocks +except ImportError: + import blocks_swig as blocks # ///////////////////////////////////////////////////////////////////////////// # mod/demod with packets as i/o @@ -70,7 +74,7 @@ class mod_pkts(gr.hier_block2): self._access_code = access_code # accepts messages from the outside world - self._pkt_input = gr.message_source(gr.sizeof_char, msgq_limit) + self._pkt_input = blocks.message_source(gr.sizeof_char, msgq_limit) self.connect(self._pkt_input, self._modulator, self) def send_pkt(self, payload='', eof=False): |