new and improved simple/dual usrp blocks and wrapper classes

[debian/gnuradio] / grc / data / platforms / python / blocks / usrp_simple_sink_x.xml

diff --git a/grc/data/platforms/python/blocks/usrp_simple_sink_x.xml b/grc/data/platforms/python/blocks/usrp_simple_sink_x.xml
index 31d01c9bfc28408e32ed717cf6fe1980e0014704..885aec852ed41bdfa8440f0c196f8e831a3e6056 100644 (file)
--- a/grc/data/platforms/python/blocks/usrp_simple_sink_x.xml
+++ b/grc/data/platforms/python/blocks/usrp_simple_sink_x.xml
@@ -8,16 +8,16 @@
        <name>USRP Sink</name>
        <key>usrp_simple_sink_x</key>
        <import>from grc_gnuradio import usrp as grc_usrp</import>
-       <make>grc_usrp.simple_sink_$(type.fcn)(
-       number=$number,
-       subdev_spec=$subdev_spec,
-       frequency=$frequency,
-       interpolation=$interpolation,
-       gain=$gain,
-       mux=$mux,
-       auto_tr=$auto_tr,
-       tx_enb=$tx_enb,
-)</make>
+       <make>grc_usrp.simple_sink_$(type.fcn)(number=$number, side='$side')
+self.$(id).set_interp_rate($interpolation)
+self.$(id).set_frequency($frequency, verbose=True)
+self.$(id).set_gain($gain)
+#if $tx_enb.eval
+self.$(id).set_enable($tx_enb)
+#end if
+#if $auto_tr.eval and $tx_enb.eval
+self.$(id).set_auto_tr($auto_tr)
+#end if</make>
        <callback>set_interp_rate($interpolation)</callback>
        <callback>set_frequency($frequency)</callback>
        <callback>set_gain($gain)</callback>
@@ -43,54 +43,43 @@
                <type>int</type>
        </param>
        <param>
-               <name>Subdev Spec</name>
-               <key>subdev_spec</key>
-               <value>auto</value>
-               <type>enum</type>
-               <option>
-                       <name>Auto</name>
-                       <key>None</key>
-               </option>
-               <option>
-                       <name>Side A</name>
-                       <key>(0, 0)</key>
-               </option>
-               <option>
-                       <name>Side B</name>
-                       <key>(1, 0)</key>
-               </option>
+               <name>Interpolation</name>
+               <key>interpolation</key>
+               <type>int</type>
        </param>
        <param>
                <name>Frequency</name>
                <key>frequency</key>
                <type>real</type>
        </param>
-       <param>
-               <name>Interpolation</name>
-               <key>interpolation</key>
-               <type>int</type>
-       </param>
        <param>
                <name>Gain</name>
                <key>gain</key>
                <type>real</type>
        </param>
        <param>
-               <name>Mux</name>
-               <key>mux</key>
-               <value>0x0</value>
-               <type>hex</type>
-               <hide>part</hide>
+               <name>Side</name>
+               <key>side</key>
+               <value>A</value>
+               <type>enum</type>
+               <option>
+                       <name>Side A</name>
+                       <key>A</key>
+               </option>
+               <option>
+                       <name>Side B</name>
+                       <key>B</key>
+               </option>
        </param>
        <param>
-               <name>Auto T/R</name>
-               <key>auto_tr</key>
-               <value>None</value>
+               <name>TX Enable</name>
+               <key>tx_enb</key>
+               <value></value>
                <type>enum</type>
-               <hide>$auto_tr.hide</hide>
+               <hide>$tx_enb.hide</hide>
                <option>
-                       <name>Ignore</name>
-                       <key>None</key>
+                       <name>Unconfigured</name>
+                       <key></key>
                        <opt>hide:part</opt>
                </option>
                <option>
@@ -105,25 +94,22 @@
                </option>
        </param>
        <param>
-               <name>TX Enable</name>
-               <key>tx_enb</key>
-               <value>None</value>
+               <name>Auto T/R</name>
+               <key>auto_tr</key>
+               <value></value>
                <type>enum</type>
-               <hide>$tx_enb.hide</hide>
+               <hide>#if $tx_enb.eval then 'none' else 'all'#</hide>
                <option>
-                       <name>Ignore</name>
-                       <key>None</key>
-                       <opt>hide:part</opt>
+                       <name>Auto</name>
+                       <key></key>
                </option>
                <option>
                        <name>Enable</name>
                        <key>True</key>
-                       <opt>hide:none</opt>
                </option>
                <option>
                        <name>Disable</name>
                        <key>False</key>
-                       <opt>hide:none</opt>
                </option>
        </param>
        <sink>
@@ -133,13 +119,10 @@
        <doc>
 The USRP sink inputs 128 Megasamples per second / interpolation.
 
---- Flex RF specific ---
-The "Auto TR" and "TX Enable" settings are flex rf specific and should be left at "Ignore" unless this is a flex rf board.
+Flex RF boards only: The "Transmit Enable" configures the transmitter to be on or off. \
+Do not leave this unconfigured.
 
-If enabled, "Auto Transmit/Receive Switching" handles the preference for transmit packets vs receive packets. \
+Flex RF boards only: If enabled, "Auto Transmit/Receive Switching" handles the preference for transmit packets vs receive packets. \
 By default, "Auto TR" is disabled.
-
-The "Transmit Enable" configures the transmitter to be on or off. \
-Do not leave this unconfigured.
        </doc>
 </block>