Merged grc developer branch r10679:10938

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

diff --git a/grc/data/platforms/python/blocks/usrp2_sink_xxxx.xml b/grc/data/platforms/python/blocks/usrp2_sink_xxxx.xml
index fe00908e02106d44cfe1956bf022434028249815..264ed4f20cf623a884f506e60da4831dfbdf763a 100644 (file)
--- a/grc/data/platforms/python/blocks/usrp2_sink_xxxx.xml
+++ b/grc/data/platforms/python/blocks/usrp2_sink_xxxx.xml
@@ -8,9 +8,9 @@
        <name>USRP2 Sink</name>
        <key>usrp2_sink_xxxx</key>
        <import>from gnuradio import usrp2</import>
-       <make>#if not $interface.eval and not $mac_addr.eval
+       <make>#if not $interface() and not $mac_addr()
 usrp2.sink_$(type.fcn)()
-#elif not $mac_addr.eval
+#elif not $mac_addr()
 usrp2.sink_$(type.fcn)($interface)
 #else
 usrp2.sink_$(type.fcn)($interface, $mac_addr)
@@ -48,16 +48,16 @@ self.$(id).set_gain($gain)</make>
                <value></value>
                <type>string</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>Frequency</name>
+               <key>frequency</key>
+               <type>real</type>
+       </param>
        <param>
                <name>Gain</name>
                <key>gain</key>