Changeset 6069

Timestamp:

07/26/07 08:38:18

Author:

jcorgan

Message:

Applied changeset r5831:5833 on trunk to release branch.

Files:

• gnuradio/branches/releases/3.0/gnuradio-core/src/python/gnuradio/blksimpl/wfm_rcv_pll.py (modified) (1 diff)
• gnuradio/branches/releases/3.0/gnuradio-examples/python/usrp/usrp_wfm_rcv_pll.py (modified) (4 diffs)

gnuradio/branches/releases/3.0/gnuradio-core/src/python/gnuradio/blksimpl/wfm_rcv_pll.py

@@ -132 +132 @@
-            min_freq = -2.0*math.pi*19010/audio_rate;
-            
-carriertracking
-self.stereo_carrier_pll_recovery.squelch_enable(False);
+refout
+#self.stereo_carrier_pll_recovery.squelch_enable(False) #pll_refout does not have squelch yet, so disabled for now 
-            
-

gnuradio/branches/releases/3.0/gnuradio-examples/python/usrp/usrp_wfm_rcv_pll.py

@@ -102 +102 @@
-        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._build_gui(vbox, usrp_rate, demod_rate, audio_rate)
@@ -122 +126 @@
-        self.set_gain(options.gain)
-        self.set_vol(options.volume)
-
+
+
+
+
+
-        if not(self.set_freq(options.freq)):
-            self._set_status_msg("Failed to set initial frequency")
@@ -219 +227 @@
-            form.quantized_slider_field(parent=self.panel, sizer=hbox, label="Stereo Squelch Threshold",
-                                        weight=3, range=(0.0,1.0,0.01),
-guts.stereo_carrier_pll_recovery.set_lock_threshold
+set_squelch
-        hbox.Add((5,0), 0)
-        vbox.Add(hbox, 0, wx.EXPAND)
@@ -268 +276 @@
-        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):