X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=grc%2Fblocks%2Fusrp2_sink_xxxx.xml;fp=grc%2Fblocks%2Fusrp2_sink_xxxx.xml;h=f9fb25361feac11dd11ee4e49214ea5d5fd2ee0d;hb=8a9ddbb0675f9bfcc6e03b457fba6c79474a3693;hp=639f96cf48bffd08bfcb4aeda0c09f46c0975fca;hpb=82d471b9b4a8b389b5da44b19c69c36420828382;p=debian%2Fgnuradio

diff --git a/grc/blocks/usrp2_sink_xxxx.xml b/grc/blocks/usrp2_sink_xxxx.xml
index 639f96cf..f9fb2536 100644
--- a/grc/blocks/usrp2_sink_xxxx.xml
+++ b/grc/blocks/usrp2_sink_xxxx.xml
@@ -2,6 +2,7 @@
 <!--
 ###################################################
 ##USRP2 Sink
+##  Note: the center freq must be set after the lo offset
 ###################################################
  -->
 <block>
@@ -16,14 +17,17 @@ usrp2.sink_$(type.fcn)($interface)
 usrp2.sink_$(type.fcn)($interface, $mac_addr)
 #end if
 self.$(id).set_interp($interpolation)
-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_interp($interpolation)</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>
 	<sink>
 		<name>in</name>
 		<type>$type</type>
+		<vlen>$type.vlen</vlen>
 	</sink>
 	<doc>
 The USRP2 sink inputs 100 Megasamples per second / interpolation.