added callbacks for setting alphas

[debian/gnuradio] / grc / scripts / usrp_probe

diff --git a/grc/scripts/usrp_probe b/grc/scripts/usrp_probe
index bff6e147960befc2484d46d4004c498bc14c072e..d2e92e7530ab10dff1b46062ac13840d7209b544 100755 (executable)
--- a/grc/scripts/usrp_probe
+++ b/grc/scripts/usrp_probe
@@ -27,19 +27,21 @@ import gtk
 
 from gnuradio.grc.gui.Dialogs import TextDisplay
 
-from gnuradio.grc.platforms.python.Platform import Platform
-platform = Platform(block_paths_internal_only=['usrp_probe.xml'])
-
-from gnuradio.grc.platforms.gui.Platform import Platform
-platform = Platform(platform)
+from gnuradio.grc.python.Platform import Platform
+platform = Platform()
 
 flow_graph = platform.get_new_flow_graph()
 block = flow_graph.get_new_block('usrp_probe')
 
 ##all params
-usrp_number_param = block.get_param('number')
+usrp_which_param = block.get_param('which')
 usrp_dboard_param = block.get_param('dboard')
 
+def get_input(param):
+       param.validate()
+       input = param.get_input()
+       return input
+
 class USRPProbeWindow(gtk.Window):
        """
        The main window for USRP Dignostics.
@@ -66,8 +68,8 @@ class USRPProbeWindow(gtk.Window):
                #create vbox for storage
                vbox = gtk.VBox()
                frame.add(vbox)
-               vbox.pack_start(usrp_number_param.get_input_object(), False)
-               vbox.pack_start(usrp_dboard_param.get_input_object(), False)
+               vbox.pack_start(get_input(usrp_which_param), False)
+               vbox.pack_start(get_input(usrp_dboard_param), False)
                self.probe_button = gtk.Button('Probe')
                self.probe_button.connect('clicked', self._probe_usrp)
                vbox.pack_start(self.probe_button, False)
@@ -81,19 +83,14 @@ class USRPProbeWindow(gtk.Window):
                """Probe the USRP device and copy the results into the query text box."""
                dboard = usrp_dboard_param.evaluate()
                side = {'a': 0, 'b': 1}[dboard[-1]]
-               if dboard.startswith('rx'): #for the rx query, use the source and rx methods
-                       make = usrp.source_c
-                       get_mux = usrp.determine_rx_mux_value
-               elif dboard.startswith('tx'): #for the tx query, use the sink and tx methods
-                       make = usrp.sink_c
-                       get_mux = usrp.determine_tx_mux_value
+               if dboard.startswith('rx'): make = usrp.source_c
+               elif dboard.startswith('tx'): make = usrp.sink_c
                try:
-                       u = make(usrp_number_param.evaluate())
+                       u = make(which=usrp_which_param.evaluate())
                        subdev_spec = (side, 0)
                        subdev = usrp.selected_subdev(u, subdev_spec) #get the subdev
                        msg = ">>> USRP Probe\n"
                        msg = "%s\nName:\n\t%s\n"%(msg, str(subdev.name()))
-                       msg = "%s\nAutomated Mux:\n\t0x%08x\n"%(msg, 0xFFFFFFFFL & long(get_mux(u, subdev_spec))) #ensure that the value is displayed as: 8 nibbles, unsigned, hex
                        msg = "%s\nConverter Rate:\n\t%s\n"%(msg, u.converter_rate())
                        msg = "%s\nUses Quadrature:\n\t%s\n"%(msg, str(subdev.is_quadrature()))
                        gain_min, gain_max, gain_step = subdev.gain_range()