diff options
| author | Tom Rondeau <tom@trondeau.com> | 2014-07-07 12:20:09 -0400 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2014-07-07 12:20:09 -0400 |
| commit | bbfc759914da80214fabc70fbbed1edaf39f9e4b (patch) | |
| tree | 712eb6d1d95445bb6535534ce86d7faf1bfe6f90 /gr-uhd | |
| parent | 3f469513b94ac992138360caca7e1b53f82214ae (diff) | |
| parent | 597b93798a804cde1783d6d2ab53b348d57c44cd (diff) | |
Merge branch 'maint'
Diffstat (limited to 'gr-uhd')
| -rw-r--r-- | gr-uhd/apps/hf_explorer/README | 2 | ||||
| -rwxr-xr-x | gr-uhd/apps/uhd_fft | 2 | ||||
| -rw-r--r-- | gr-uhd/apps/uhd_rx_cfile | 2 | ||||
| -rw-r--r-- | gr-uhd/apps/uhd_siggen_base.py | 2 | ||||
| -rwxr-xr-x | gr-uhd/examples/python/freq_hopping.py | 2 | ||||
| -rwxr-xr-x | gr-uhd/examples/python/usrp_spectrum_sense.py | 22 | ||||
| -rwxr-xr-x | gr-uhd/examples/python/usrp_wfm_rcv_sca.py | 2 |
7 files changed, 17 insertions, 17 deletions
diff --git a/gr-uhd/apps/hf_explorer/README b/gr-uhd/apps/hf_explorer/README index 942b84f5f6..39b6b66cd0 100644 --- a/gr-uhd/apps/hf_explorer/README +++ b/gr-uhd/apps/hf_explorer/README @@ -18,7 +18,7 @@ AM now switches in a synchronous PLL detector with the carriers at tooltips, etc. The target AM carrier needs to be closely tuned in, it will have a hollow sound until it is locked. The filter in AM is preset to 2500/12500 (7.5kHz +/- 5kHz) and is handy for removing -adjacent channel interference. +adjacent channel interference. There is code for Web based control of frequency and volume - so I can tune the radio with a handheld device. Disabled by default - it diff --git a/gr-uhd/apps/uhd_fft b/gr-uhd/apps/uhd_fft index 9edd75288f..0e80de6bd8 100755 --- a/gr-uhd/apps/uhd_fft +++ b/gr-uhd/apps/uhd_fft @@ -120,7 +120,7 @@ class app_top_block(stdgui2.std_top_block): fft_rate=options.fft_rate) def fftsink_callback(x, y): self.set_freq(x) - + self.scope.set_callback(fftsink_callback) self.frame.SetMinSize((800, 420)) diff --git a/gr-uhd/apps/uhd_rx_cfile b/gr-uhd/apps/uhd_rx_cfile index 7d8d5dd88c..442dd46b62 100644 --- a/gr-uhd/apps/uhd_rx_cfile +++ b/gr-uhd/apps/uhd_rx_cfile @@ -122,7 +122,7 @@ class rx_cfile_block(gr.top_block): mboard_serial = "no serial" else: mboard_serial = info["mboard_serial"] - + rx_id = info["rx_id"].split(" ")[0] if info["rx_serial"] == "": rx_serial = "no serial" diff --git a/gr-uhd/apps/uhd_siggen_base.py b/gr-uhd/apps/uhd_siggen_base.py index 0245c007b7..503f49b481 100644 --- a/gr-uhd/apps/uhd_siggen_base.py +++ b/gr-uhd/apps/uhd_siggen_base.py @@ -156,7 +156,7 @@ class top_block(gr.top_block, pubsub): def _set_tx_amplitude(self, ampl): """ Sets the transmit amplitude sent to the USRP - + Args: ampl: the amplitude or None for automatic """ diff --git a/gr-uhd/examples/python/freq_hopping.py b/gr-uhd/examples/python/freq_hopping.py index 3b4c426976..903b0b23d4 100755 --- a/gr-uhd/examples/python/freq_hopping.py +++ b/gr-uhd/examples/python/freq_hopping.py @@ -89,7 +89,7 @@ class FrequencyHopperSrc(gr.hier_block2): numpy.random.shuffle(self.hop_sequence) self.hop_sequence = [self.hop_sequence[x % n_channels] for x in xrange(n_bursts)] if verbose: - print "Hop Frequencies | Hop Pattern" + print "Hop Frequencies | Hop Pattern" print "=================|================================" for f in self.hop_sequence: print "{:6.3f} MHz | ".format(f/1e6), diff --git a/gr-uhd/examples/python/usrp_spectrum_sense.py b/gr-uhd/examples/python/usrp_spectrum_sense.py index 3ad0f332a5..ba45a2e80e 100755 --- a/gr-uhd/examples/python/usrp_spectrum_sense.py +++ b/gr-uhd/examples/python/usrp_spectrum_sense.py @@ -68,12 +68,12 @@ class tune(gr.feval_dd): # message on stderr. Not exactly helpful ;) new_freq = self.tb.set_next_freq() - + # wait until msgq is empty before continuing while(self.tb.msgq.full_p()): #print "msgq full, holding.." time.sleep(0.1) - + return new_freq except Exception, e: @@ -165,19 +165,19 @@ class my_top_block(gr.top_block): # Set the antenna if(options.antenna): self.u.set_antenna(options.antenna, 0) - + self.u.set_samp_rate(options.samp_rate) self.usrp_rate = usrp_rate = self.u.get_samp_rate() - + self.lo_offset = options.lo_offset if options.fft_size is None: self.fft_size = int(self.usrp_rate/self.channel_bandwidth) else: self.fft_size = options.fft_size - + self.squelch_threshold = options.squelch_threshold - + s2v = blocks.stream_to_vector(gr.sizeof_gr_complex, self.fft_size) mywindow = filter.window.blackmanharris(self.fft_size) @@ -196,7 +196,7 @@ class my_top_block(gr.top_block): # This allows us to discard the bins on both ends of the spectrum. self.freq_step = self.nearest_freq((0.75 * self.usrp_rate), self.channel_bandwidth) - self.min_center_freq = self.min_freq + (self.freq_step/2) + self.min_center_freq = self.min_freq + (self.freq_step/2) nsteps = math.ceil((self.max_freq - self.min_freq) / self.freq_step) self.max_center_freq = self.min_center_freq + (nsteps * self.freq_step) @@ -244,7 +244,7 @@ class my_top_block(gr.top_block): target_freq: frequency in Hz @rypte: bool """ - + r = self.u.set_center_freq(uhd.tune_request(target_freq, rf_freq=(target_freq + self.lo_offset),rf_freq_policy=uhd.tune_request.POLICY_MANUAL)) if r: return True @@ -253,13 +253,13 @@ class my_top_block(gr.top_block): def set_gain(self, gain): self.u.set_gain(gain) - + def nearest_freq(self, freq, channel_bandwidth): freq = round(freq / channel_bandwidth, 0) * channel_bandwidth return freq def main_loop(tb): - + def bin_freq(i_bin, center_freq): #hz_per_bin = tb.usrp_rate / tb.fft_size freq = center_freq - (tb.usrp_rate / 2) + (tb.channel_bandwidth * i_bin) @@ -267,7 +267,7 @@ def main_loop(tb): #freq = nearest_freq(freq, tb.channel_bandwidth) #print "freq rounded:",freq return freq - + bin_start = int(tb.fft_size * ((1 - 0.75) / 2)) bin_stop = int(tb.fft_size - bin_start) diff --git a/gr-uhd/examples/python/usrp_wfm_rcv_sca.py b/gr-uhd/examples/python/usrp_wfm_rcv_sca.py index 5cbbcd1d8a..9069a745f9 100755 --- a/gr-uhd/examples/python/usrp_wfm_rcv_sca.py +++ b/gr-uhd/examples/python/usrp_wfm_rcv_sca.py @@ -132,7 +132,7 @@ class wfm_rx_sca_block (stdgui2.std_top_block): 60) # stopband attenuation rrate = usrp_rate / dev_rate self.chan_filt = filter.pfb.arb_resampler_ccf(rrate, chan_coeffs, nfilts) - + #Create demodulator block for Main FM Channel max_dev = 75e3 fm_demod_gain = demod_rate/(2*math.pi*max_dev) |