Changeset 8978

Timestamp:

07/22/08 12:23:25

Author:

jcorgan

Message:

wip

Files:

• gnuradio/branches/features/experimental-gui/const_streamer.py (modified) (5 diffs)
• gnuradio/branches/features/experimental-gui/const_top_block.py (modified) (1 prop)
• gnuradio/branches/features/experimental-gui/simple_usrp.py (modified) (1 diff)
• gnuradio/branches/features/experimental-gui/tx_mpsk.py (added)
• gnuradio/branches/features/experimental-gui/usrp_const.py (modified) (1 diff)

gnuradio/branches/features/experimental-gui/const_streamer.py

@@ -56 +56 @@
-                                gr.io_signature(1, 1, gr.sizeof_gr_complex*frame_size)) # Output signature
-
+
+
+        costas_beta = 0.25*costas_alpha*costas_alpha
+        costas_min = -costas_max
+        mm_omega = float(sample_rate)/bit_rate
+        mm_gain_omega = 0.25*mm_gain_mu*mm_gain_mu
+        mm_mu=0.5 # Center of bit
+
-        # Costas frequency/phase recovery loop
-        # Critically damped 2nd order PLL
-        costas_beta = 0.25*costas_alpha*costas_alpha
-        costas_min = -costas_max
-        self._costas = gr.costas_loop_cc(costas_alpha,
-                                         costas_beta,
@@ -68 +74 @@
-        # Timing recovery loop
-        # Critically damped 2nd order DLL
-        mm_omega = float(sample_rate)/bit_rate
-        mm_gain_omega = 0.25*mm_gain_mu*mm_gain_mu
-        mm_mu=0.5 # Center of bit
-        self._retime = gr.clock_recovery_mm_cc(mm_omega,   
-                                               mm_gain_omega,
@@ -80 +83 @@
-        self._agc = gr.agc_cc(1e-6);
-
+        # Decimate to requested frame rate
-        self._decim = blks2.stream_to_vector_decimator(item_size=gr.sizeof_gr_complex,
-                                                       sample_rate=bit_rate,
@@ -85 +89 @@
-                                                       vec_len=frame_size)
-            
-costas, self._retime, self._agc
+agc, self._costas, self._retime
-
+        
-    def set_costas_alpha(self, alpha):
-        self._costas.set_alpha(alpha)
@@ -109 +114 @@
-        
-    def gain_omega(self):
-urn
+ime

gnuradio/branches/features/experimental-gui/simple_usrp.py

@@ -119 +119 @@
-        """
-        return self._u.adc_rate()/self._decim
+
+class sink_c(gr.hier_block2):
+    def __init__(self, 
+                 which=0, 
+                 interp=32, 
+                 subdev_spec=None,
+                 freq=None):
+        """!
+        Create a simple_usrp object accepting complex samples.
+
+        @param which            USRP # on USB bus (default is 0)
+        @param interp           Transmit sample rate interpolation (default is 32)
+        @param subdev_spec      Daughterboard selection (default is first found)
+        @param freq             Daughterboard TX frequency (default is mid-range)
+        """
+
+        gr.hier_block2.__init__(self, "simple_usrp.sink_c",
+                                gr.io_signature(1, 1, gr.sizeof_gr_complex), # Input signature
+                                gr.io_signature(0, 0, 0))                    # Output signature
+
+        self._setup_usrp(which, interp)
+        self._setup_db(subdev_spec, freq)
+        self.connect(self, self._u)
+
+    def _setup_usrp(self, which, interp):
+        self._u = usrp.sink_c(which=which)
+        self.set_interp(interp)
+
+    def _setup_db(self, subdev_spec, freq):
+        if subdev_spec is None:
+            subdev_spec = usrp.pick_tx_subdevice(self._u)
+        self._u.set_mux(usrp.determine_tx_mux_value(self._u, subdev_spec))
+        self._subdev = usrp.selected_subdev(self._u, subdev_spec)
+        self.set_freq(freq)
+
+    def set_interp(self, interp):
+        """!
+        Set USRP TX interpolation.
+
+        @param interp TX decimation rate
+        """
+        self._interp = interp
+        self._u.set_interp_rate(interp)
+
+    def set_freq(self, freq):
+        """!
+        Set USRP/Daughterboard TX center frequency.
+
+        @param freq TX center frequency, (None=mid-range)
+        """
+        if freq is None:
+            f = self._subdev.freq_range()
+            freq = float(f[0]+f[1])/2.0
+        return self._u.tune(0, self._subdev, freq)
+
+    def sample_rate(self):
+        """!
+        Get USRP TX sample rate in samples/sec.
+        """
+        return self._u.dac_rate()/self._interp

gnuradio/branches/features/experimental-gui/usrp_const.py

@@ -78 +78 @@
-if __name__ == "__main__":
-    (options, args) = get_options()
-    print options
-    
-    # Applications have a 2-step initialization