Changeset 6720

Timestamp:

10/28/07 16:08:40

Author:

nldudok1

Message:

added complex and dualchan option for BasicRX and LFRX

Files:

• gnuradio/trunk/gr-utils/src/python/usrp_oscope.py (modified) (11 diffs)

gnuradio/trunk/gr-utils/src/python/usrp_oscope.py

@@ -31 +31 @@
-import wx
-import sys
+try:
+  import usrp_dbid
+except:
+  from usrpm import usrp_dbid
-
-
@@ -65 +69 @@
-        parser.add_option("-8", "--width-8", action="store_true", default=False,
-                          help="Enable 8-bit samples across USB")
+        parser.add_option("-C", "--basic-complex", action="store_true", default=False,
+                          help="Use both inputs of a basicRX or LFRX as a single Complex input channel")
+        parser.add_option("-D", "--basic-dualchan", action="store_true", default=False,
+                          help="Use both inputs of a basicRX or LFRX as seperate Real input channels")
-        parser.add_option("-n", "--frame-decim", type="int", default=1,
-                          help="set oscope frame decimation factor to n [default=1]")
@@ -79 +87 @@
-        
-        # build the graph
-
-
+
+
+
+
+
-        if options.rx_subdev_spec is None:
-            options.rx_subdev_spec = pick_subdevice(self.u)
-        self.u.set_mux(usrp.determine_rx_mux_value(self.u, options.rx_subdev_spec))
-
-        if options.width_8:
@@ -95 +105 @@
-        # determine the daughterboard subdevice we're using
-        self.subdev = usrp.selected_subdev(self.u, options.rx_subdev_spec)
+        if (options.basic_complex  or options.basic_dualchan ):
+          if ((self.subdev.dbid()==usrp_dbid.BASIC_RX) or (self.subdev.dbid()==usrp_dbid.LF_RX)):
+            side = options.rx_subdev_spec[0]  # side A = 0, side B = 1
+            if options.basic_complex:
+              #force Basic_RX and LF_RX in complex mode (use both I and Q channel)
+              print "Receiver daughterboard forced in complex mode. Both inputs will combined to form a single complex channel."
+              self.dualchan=False
+              if side==0:
+                self.u.set_mux(0x00000010) #enable adc 0 and 1 to form a single complex input on side A
+              else: #side ==1
+                self.u.set_mux(0x00000032) #enable adc 3 and 2 to form a single complex input on side B
+            elif options.basic_dualchan:
+              #force Basic_RX and LF_RX in dualchan mode (use input A  for channel 0 and input B for channel 1)
+              print "Receiver daughterboard forced in dualchannel mode. Each input will be used to form a seperate channel."
+              self.dualchan=True
+              if side==0:
+                self.u.set_mux(gru.hexint(0xf0f0f1f0)) #enable adc 0, side A to form a real input on channel 0 and adc1,side A to form a real input on channel 1
+              else: #side ==1
+                self.u.set_mux(0xf0f0f3f2) #enable adc 2, side B to form a real input on channel 0 and adc3,side B to form a real input on channel 1 
+          else:
+            sys.stderr.write('options basic_dualchan or basic_complex is only supported for Basic Rx or LFRX at the moment\n')
+            sys.exit(1)
+        else:
+          self.dualchan=False
+          self.u.set_mux(usrp.determine_rx_mux_value(self.u, options.rx_subdev_spec))
-
-        input_rate = self.u.adc_freq() / self.u.decim_rate()
@@ -101 +136 @@
-                                            frame_decim=options.frame_decim,
-                                            v_scale=options.v_scale,
-
-
+
+
+
+
+
+
+
+
+
+
-
-        self._build_gui(vbox)
@@ -114 +157 @@
-
-        if options.freq is None:
-
-
-
+
+
+
+
+
+
+
-
-        self.set_gain(options.gain)
@@ -126 +173 @@
-            self.myform['baseband'].set_value(0)
-            self.myform['ddc'].set_value(0)
+            if self.num_inputs==2:
+              self.myform['baseband2'].set_value(0)
+              self.myform['ddc2'].set_value(0)              
-                        
-        if not(self.set_freq(options.freq)):
-            self._set_status_msg("Failed to set initial frequency")
+        if self.num_inputs==2:
+          if not(self.set_freq2(options.freq)):
+            self._set_status_msg("Failed to set initial frequency for channel 2")          
-
-
@@ -138 +191 @@
-        def _form_set_freq(kv):
-            return self.set_freq(kv['freq'])
-
+
+
+
-        vbox.Add(self.scope.win, 10, wx.EXPAND)
-        
@@ -148 +203 @@
-            parent=self.panel, sizer=hbox, label="Center freq", weight=1,
-            callback=myform.check_input_and_call(_form_set_freq, self._set_status_msg))
-
-
+
+
+
+
+
-        g = self.subdev.gain_range()
-        myform['gain'] = form.slider_field(parent=self.panel, sizer=hbox, label="Gain",
@@ -202 +260 @@
-        myform['ddc'] = form.static_float_field(
-            parent=panel, sizer=hbox, label="DDC")
+        if self.num_inputs==2:
+          hbox.Add((1,0), 1)
+          myform['baseband2'] = form.static_float_field(
+              parent=panel, sizer=hbox, label="BB2")
+          hbox.Add((1,0), 1)
+          myform['ddc2'] = form.static_float_field(
+            parent=panel, sizer=hbox, label="DDC2")          
-
-        hbox.Add((5,0), 0)
@@ -226 +291 @@
-                self.myform['baseband'].set_value(r.baseband_freq)
-                self.myform['ddc'].set_value(r.dxc_freq)
+            return True
+
+        return False
+
+    def set_freq2(self, target_freq):
+        """
+        Set the center frequency of we're interested in for the second channel.
+
+        @param target_freq: frequency in Hz
+        @rypte: bool
+
+        Tuning is a two step process.  First we ask the front-end to
+        tune as close to the desired frequency as it can.  Then we use
+        the result of that operation and our target_frequency to
+        determine the value for the digital down converter.
+        """
+        r = usrp.tune(self.u, 1, self.subdev, target_freq)
+        
+        if r:
+            self.myform['freq2'].set_value(target_freq)     # update displayed value
+            if self.show_debug_info:
+                self.myform['baseband2'].set_value(r.baseband_freq)
+                self.myform['ddc2'].set_value(r.dxc_freq)
-            return True
-