diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-08-16 15:32:24 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-08-16 15:32:24 -0700 |
| commit | 631dd648e49da20df1f0fb825037ff28460f03a1 (patch) | |
| tree | 61bbd5573912326de6d4a76c87eef6feb0383605 | |
| parent | d420aad06ad7c3e1ee56662bf80e12db3e162665 (diff) | |
| parent | b05e462e5f88cf35db8dce58b510f96e52433187 (diff) | |
Merge branch 'maint'
| -rw-r--r-- | gr-analog/lib/agc3_cc_impl.cc | 2 | ||||
| -rw-r--r-- | gr-digital/python/digital/ofdm_receiver.py | 3 | ||||
| -rwxr-xr-x | gr-uhd/apps/uhd_fft | 5 | ||||
| -rwxr-xr-x | gr-uhd/apps/uhd_rx_cfile | 5 | ||||
| -rw-r--r-- | gr-uhd/apps/uhd_siggen_base.py | 5 |
5 files changed, 15 insertions, 5 deletions
diff --git a/gr-analog/lib/agc3_cc_impl.cc b/gr-analog/lib/agc3_cc_impl.cc index dc60c6a8d9..b8f1104c45 100644 --- a/gr-analog/lib/agc3_cc_impl.cc +++ b/gr-analog/lib/agc3_cc_impl.cc @@ -103,7 +103,7 @@ namespace gr { for(int i=0; i<noutput_items; i++) { float newlevel = mags[i]; // abs(in[i]); float rate = (newlevel > d_reference/d_gain)?d_attack:d_decay; - d_gain = (d_gain*(1-rate)) + (d_reference/newlevel)*rate; + d_gain = newlevel==0?(d_gain*(1-rate)):(d_gain*(1-rate)) + (d_reference/newlevel)*rate; out[i] = in[i] * d_gain; } } diff --git a/gr-digital/python/digital/ofdm_receiver.py b/gr-digital/python/digital/ofdm_receiver.py index 4fbf76251a..4b7836b43c 100644 --- a/gr-digital/python/digital/ofdm_receiver.py +++ b/gr-digital/python/digital/ofdm_receiver.py @@ -22,6 +22,7 @@ import math from numpy import fft +from gnuradio import fft as gr_fft from gnuradio import gr from gnuradio import analog from gnuradio import blocks @@ -125,7 +126,7 @@ class ofdm_receiver(gr.hier_block2): self.nco = analog.frequency_modulator_fc(nco_sensitivity) # generate a signal proportional to frequency error of sync block self.sigmix = blocks.multiply_cc() self.sampler = digital.ofdm_sampler(fft_length, fft_length+cp_length) - self.fft_demod = fft.fft_vcc(fft_length, True, win, True) + self.fft_demod = gr_fft.fft_vcc(fft_length, True, win, True) self.ofdm_frame_acq = digital.ofdm_frame_acquisition(occupied_tones, fft_length, cp_length, ks[0]) diff --git a/gr-uhd/apps/uhd_fft b/gr-uhd/apps/uhd_fft index 800a5fab84..c1ccc33261 100755 --- a/gr-uhd/apps/uhd_fft +++ b/gr-uhd/apps/uhd_fft @@ -211,7 +211,10 @@ class app_top_block(stdgui2.std_top_block): subdev = self.u.get_subdev_spec() antenna = self.u.get_antenna() - usrp_config_val = "%s (%s), %s (%s, %s, %s)" % (mboard_id, mboard_serial, dboard_subdev_name, dboard_serial, subdev, antenna) + if "B200" in mboard_id or "B210" in mboard_id: + usrp_config_val = "%s (%s), %s (%s, %s)" % (mboard_id, mboard_serial, dboard_subdev_name, subdev, antenna) + else: + usrp_config_val = "%s (%s), %s (%s, %s, %s)" % (mboard_id, mboard_serial, dboard_subdev_name, dboard_serial, subdev, antenna) except: usrp_config_val = "Not implemented in this version." diff --git a/gr-uhd/apps/uhd_rx_cfile b/gr-uhd/apps/uhd_rx_cfile index 5531bb35b8..9f5ef19893 100755 --- a/gr-uhd/apps/uhd_rx_cfile +++ b/gr-uhd/apps/uhd_rx_cfile @@ -110,7 +110,10 @@ class rx_cfile_block(gr.top_block): rx_subdev_spec = info.get("rx_subdev_spec") print "Motherboard: %s (%s)" % (mboard_id, mboard_serial) - print "Daughterboard: %s (%s, %s, %s)" % (rx_id, rx_serial, rx_antenna, rx_subdev_spec) + if "B200" in mboard_id or "B210" in mboard_id: + print "Daughterboard: %s (%s, %s)" % (mboard_id, rx_antenna, rx_subdev_spec) + else: + print "Daughterboard: %s (%s, %s, %s)" % (rx_id, rx_serial, rx_antenna, rx_subdev_spec) except: print "Args: ", options.args print "Rx gain:", options.gain diff --git a/gr-uhd/apps/uhd_siggen_base.py b/gr-uhd/apps/uhd_siggen_base.py index 6b51bfcb50..84dff1f504 100644 --- a/gr-uhd/apps/uhd_siggen_base.py +++ b/gr-uhd/apps/uhd_siggen_base.py @@ -124,7 +124,10 @@ class top_block(gr.top_block, pubsub): antenna = self._u.get_antenna() desc_key_str = "Motherboard: %s [%s]\n" % (mboard_id, mboard_serial) - desc_key_str += "Daughterboard: %s [%s]\n" % (dboard_subdev_name, dboard_serial) + if "B200" in mboard_id or "B210" in mboard_id: + desc_key_str += "Daughterboard: %s\n" % dboard_subdev_name + else: + desc_key_str += "Daughterboard: %s [%s]\n" % (dboard_subdev_name, dboard_serial) desc_key_str += "Subdev: %s\n" % subdev desc_key_str += "Antenna: %s" % antenna except: |