Merge commit 'v3.3.0' into upstream

[debian/gnuradio] / grc / blocks / usrp2_source_xxxx.xml

diff --git a/grc/blocks/usrp2_source_xxxx.xml b/grc/blocks/usrp2_source_xxxx.xml
index 6c776d0ad37deaa54f32b3d7b570eb717a0caf37..584199798f1b18325f0a31236747fc82f9bb91f5 100644 (file)
--- a/grc/blocks/usrp2_source_xxxx.xml
+++ b/grc/blocks/usrp2_source_xxxx.xml
@@ -2,6 +2,7 @@
 <!--
 ###################################################
 ##USRP2 Source
+##  Note: the center freq must be set after the lo offset
 ###################################################
  -->
 <block>
@@ -16,14 +17,17 @@ usrp2.source_$(type.fcn)($interface)
 usrp2.source_$(type.fcn)($interface, $mac_addr)
 #end if
 self.$(id).set_decim($decimation)
-self.$(id).set_center_freq($frequency)
-self.$(id).set_gain($gain)
 #if $lo_offset() != float('inf')
 self.$(id).set_lo_offset($lo_offset)
-#end if</make>
-       <callback>set_lo_offset($lo_offset)</callback>
+#end if
+self.$(id).set_center_freq($frequency)
+self.$(id).set_gain($gain)
+self.$(id).config_mimo($usrp2_clock_src)</make>
        <callback>set_decim($decimation)</callback>
-       <callback>set_center_freq($frequency)</callback>
+       <callback>#if $lo_offset() != float('inf')
+self.$(id).set_lo_offset($lo_offset)
+#end if
+self.$(id).set_center_freq($frequency)</callback>
        <callback>set_gain($gain)</callback>
        <param>
                <name>Output Type</name>
@@ -33,11 +37,13 @@ self.$(id).set_lo_offset($lo_offset)
                        <name>Complex</name>
                        <key>complex</key>
                        <opt>fcn:32fc</opt>
+                       <opt>vlen:1</opt>
                </option>
                <option>
                        <name>Short</name>
                        <key>short</key>
                        <opt>fcn:16sc</opt>
+                       <opt>vlen:2</opt>
                </option>
        </param>
        <param>
@@ -79,9 +85,28 @@ self.$(id).set_lo_offset($lo_offset)
                <value>0</value>
                <type>real</type>
        </param>
+       <param>
+               <name>Clock Source</name>
+               <key>usrp2_clock_src</key>
+               <value>usrp2.MC_WE_DONT_LOCK</value>
+               <type>enum</type>
+               <option>
+                       <name>Internal</name>
+                       <key>usrp2.MC_WE_DONT_LOCK</key>
+               </option>
+               <option>
+                       <name>External SMA</name>
+                       <key>usrp2.MC_WE_LOCK_TO_SMA</key>
+               </option>
+               <option>
+                       <name>External MIMO</name>
+                       <key>usrp2.MC_WE_LOCK_TO_MIMO</key>
+               </option>
+       </param>
        <source>
                <name>out</name>
                <type>$type</type>
+               <vlen>$type.vlen</vlen>
        </source>
        <doc>
 The USRP2 source outputs 100 Megasamples per second / decimation.