[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r6069 - in gnuradio/branches/releases/3.0: gnuradio-co
From: |
jcorgan |
Subject: |
[Commit-gnuradio] r6069 - in gnuradio/branches/releases/3.0: gnuradio-core/src/python/gnuradio/blksimpl gnuradio-examples/python/usrp |
Date: |
Thu, 26 Jul 2007 08:38:18 -0600 (MDT) |
Author: jcorgan
Date: 2007-07-26 08:38:18 -0600 (Thu, 26 Jul 2007)
New Revision: 6069
Modified:
gnuradio/branches/releases/3.0/gnuradio-core/src/python/gnuradio/blksimpl/wfm_rcv_pll.py
gnuradio/branches/releases/3.0/gnuradio-examples/python/usrp/usrp_wfm_rcv_pll.py
Log:
Applied changeset r5831:5833 on trunk to release branch.
Modified:
gnuradio/branches/releases/3.0/gnuradio-core/src/python/gnuradio/blksimpl/wfm_rcv_pll.py
===================================================================
---
gnuradio/branches/releases/3.0/gnuradio-core/src/python/gnuradio/blksimpl/wfm_rcv_pll.py
2007-07-26 14:33:34 UTC (rev 6068)
+++
gnuradio/branches/releases/3.0/gnuradio-core/src/python/gnuradio/blksimpl/wfm_rcv_pll.py
2007-07-26 14:38:18 UTC (rev 6069)
@@ -131,8 +131,8 @@
max_freq = -2.0*math.pi*18990/audio_rate;
min_freq = -2.0*math.pi*19010/audio_rate;
- self.stereo_carrier_pll_recovery =
gr.pll_carriertracking_cc(alpha,beta,max_freq,min_freq);
- self.stereo_carrier_pll_recovery.squelch_enable(False);
+ self.stereo_carrier_pll_recovery =
gr.pll_refout_cc(alpha,beta,max_freq,min_freq);
+ #self.stereo_carrier_pll_recovery.squelch_enable(False)
#pll_refout does not have squelch yet, so disabled for now
# set up mixer (multiplier) to get the L-R signal at baseband
Modified:
gnuradio/branches/releases/3.0/gnuradio-examples/python/usrp/usrp_wfm_rcv_pll.py
===================================================================
---
gnuradio/branches/releases/3.0/gnuradio-examples/python/usrp/usrp_wfm_rcv_pll.py
2007-07-26 14:33:34 UTC (rev 6068)
+++
gnuradio/branches/releases/3.0/gnuradio-examples/python/usrp/usrp_wfm_rcv_pll.py
2007-07-26 14:38:18 UTC (rev 6069)
@@ -101,8 +101,12 @@
self.connect (self.u, chan_filt, self.guts)
self.connect ((self.guts, 0), self.volume_control_l, (audio_sink, 0))
self.connect ((self.guts, 1), self.volume_control_r, (audio_sink, 1))
- self.guts.stereo_carrier_pll_recovery.squelch_enable(True);
+ try:
+ self.guts.stereo_carrier_pll_recovery.squelch_enable(True)
+ except:
+ print "FYI: This implementation of the stereo_carrier_pll_recovery
has no squelch implementation yet"
+
self._build_gui(vbox, usrp_rate, demod_rate, audio_rate)
if options.gain is None:
@@ -121,7 +125,11 @@
self.set_gain(options.gain)
self.set_vol(options.volume)
-
self.guts.stereo_carrier_pll_recovery.set_lock_threshold(options.squelch);
+ try:
+
self.guts.stereo_carrier_pll_recovery.set_lock_threshold(options.squelch)
+ except:
+ print "FYI: This implementation of the stereo_carrier_pll_recovery
has no squelch implementation yet"
+
if not(self.set_freq(options.freq)):
self._set_status_msg("Failed to set initial frequency")
@@ -218,7 +226,7 @@
myform['sqlch_thrsh'] = \
form.quantized_slider_field(parent=self.panel, sizer=hbox,
label="Stereo Squelch Threshold",
weight=3, range=(0.0,1.0,0.01),
-
callback=self.guts.stereo_carrier_pll_recovery.set_lock_threshold)
+ callback=self.set_squelch)
hbox.Add((5,0), 0)
vbox.Add(hbox, 0, wx.EXPAND)
@@ -267,6 +275,12 @@
self.volume_control_r.set_k(10**(self.vol/10))
self.myform['volume'].set_value(self.vol)
self.update_status_bar ()
+
+ def set_squelch(self,squelch_threshold):
+ try:
+
self.guts.stereo_carrier_pll_recovery.set_lock_threshold(squelch_threshold);
+ except:
+ print "FYI: This implementation of the stereo_carrier_pll_recovery
has no squelch implementation yet"
def set_freq(self, target_freq):
"""
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r6069 - in gnuradio/branches/releases/3.0: gnuradio-core/src/python/gnuradio/blksimpl gnuradio-examples/python/usrp,
jcorgan <=