diff options
| author | Johnathan Corgan | 2010-05-27 15:19:20 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2010-05-27 15:19:20 -0700 |
| commit | 098fb6a3c73c8e3c81f761c48848508da4ff7c70 (patch) | |
| tree | 3ff468753cc909592da3201783306f67cc3d9ef0 /grc | |
| parent | 6af87d09a3f12a2915e4248fdc7c8b1b271b5f63 (diff) | |
| parent | d57365be4d71c75b963dac44ab0817c65cf73184 (diff) | |
| download | gnuradio-098fb6a3c73c8e3c81f761c48848508da4ff7c70.tar.gz gnuradio-098fb6a3c73c8e3c81f761c48848508da4ff7c70.tar.bz2 gnuradio-098fb6a3c73c8e3c81f761c48848508da4ff7c70.zip | |
Merge branch 'master' into next
* master:
Add USRP2 clock source parameter to GRC blocks.
Refactor Makefile.am to move common files from 3 libraries into a single variable.
Diffstat (limited to 'grc')
| -rw-r--r-- | grc/blocks/usrp2_sink_xxxx.xml | 21 | ||||
| -rw-r--r-- | grc/blocks/usrp2_source_xxxx.xml | 21 |
2 files changed, 40 insertions, 2 deletions
diff --git a/grc/blocks/usrp2_sink_xxxx.xml b/grc/blocks/usrp2_sink_xxxx.xml index 14586cc36..f9fb25361 100644 --- a/grc/blocks/usrp2_sink_xxxx.xml +++ b/grc/blocks/usrp2_sink_xxxx.xml @@ -21,7 +21,8 @@ self.$(id).set_interp($interpolation) self.$(id).set_lo_offset($lo_offset) #end if self.$(id).set_center_freq($frequency) -self.$(id).set_gain($gain)</make> +self.$(id).set_gain($gain) +self.$(id).config_mimo($usrp2_clock_src)</make> <callback>set_interp($interpolation)</callback> <callback>#if $lo_offset() != float('inf') self.$(id).set_lo_offset($lo_offset) @@ -84,6 +85,24 @@ self.$(id).set_center_freq($frequency)</callback> <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> diff --git a/grc/blocks/usrp2_source_xxxx.xml b/grc/blocks/usrp2_source_xxxx.xml index 0f297dfd1..584199798 100644 --- a/grc/blocks/usrp2_source_xxxx.xml +++ b/grc/blocks/usrp2_source_xxxx.xml @@ -21,7 +21,8 @@ self.$(id).set_decim($decimation) self.$(id).set_lo_offset($lo_offset) #end if self.$(id).set_center_freq($frequency) -self.$(id).set_gain($gain)</make> +self.$(id).set_gain($gain) +self.$(id).config_mimo($usrp2_clock_src)</make> <callback>set_decim($decimation)</callback> <callback>#if $lo_offset() != float('inf') self.$(id).set_lo_offset($lo_offset) @@ -84,6 +85,24 @@ self.$(id).set_center_freq($frequency)</callback> <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> |