diff options
| author | Josh Blum <josh@joshknows.com> | 2010-10-18 18:29:20 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-10-18 18:29:20 -0700 |
| commit | 343cba5663d0eefdd3ee3918bef812dc1bd75508 (patch) | |
| tree | 70ddc504b664cef8b6681ab8755dbe9df4af5ea9 /gr-uhd/grc | |
| parent | 8c6445cb3dd2a8db361203fedf55f3efb6953635 (diff) | |
uhd: tweaked and tested multi usrp with a single channel
Diffstat (limited to 'gr-uhd/grc')
| -rwxr-xr-x | gr-uhd/grc/gen_uhd_multi_usrp_blocks_xml.py | 16 | ||||
| -rwxr-xr-x | gr-uhd/grc/gen_uhd_single_usrp_blocks_xml.py | 2 |
2 files changed, 10 insertions, 8 deletions
diff --git a/gr-uhd/grc/gen_uhd_multi_usrp_blocks_xml.py b/gr-uhd/grc/gen_uhd_multi_usrp_blocks_xml.py index aa550157d2..2297167320 100755 --- a/gr-uhd/grc/gen_uhd_multi_usrp_blocks_xml.py +++ b/gr-uhd/grc/gen_uhd_multi_usrp_blocks_xml.py @@ -31,15 +31,15 @@ MAIN_TMPL = """\ num_channels=\$nchan, ) \#if \$sync() -clk_cfg = uhd.clock_config_t() -clk_cfg.ref_source = uhd.clock_config_t.REF_SMA -clk_cfg.pps_source = uhd.clock_config_t.PPS_SMA -clk_cfg.pps_polarity = uhd.clock_config_t.PPS_POS -self.\$(id).set_clock_config(clk_cfg, ~0); +_clk_cfg = uhd.clock_config_t() +_clk_cfg.ref_source = uhd.clock_config_t.REF_SMA +_clk_cfg.pps_source = uhd.clock_config_t.PPS_SMA +_clk_cfg.pps_polarity = uhd.clock_config_t.PPS_POS +self.\$(id).set_clock_config(_clk_cfg, uhd.ALL_MBOARDS); self.\$(id).set_time_unknown_pps(uhd.time_spec_t()) \#end if #for $m in range($max_mboards) -\#if \$num_mboards() > $m +\#if \$num_mboards() > $m and \$sd_spec$(m)() self.\$(id).set_subdev_spec(\$sd_spec$(m), $m) \#end if #end for @@ -110,7 +110,7 @@ self.\$(id).set_antenna(\$ant$(n), $n) <key>num_mboards</key> <value>2</value> <type>int</type> - #for $m in range(1, $max_mboards) + #for $m in range(1, $max_mboards+1) <option> <name>$(m)</name> <key>$m</key> @@ -139,7 +139,7 @@ self.\$(id).set_antenna(\$ant$(n), $n) <key>nchan</key> <value>2</value> <type>int</type> - #for $n in range(1, $max_nchan) + #for $n in range(1, $max_nchan+1) <option> <name>$(n)</name> <key>$n</key> diff --git a/gr-uhd/grc/gen_uhd_single_usrp_blocks_xml.py b/gr-uhd/grc/gen_uhd_single_usrp_blocks_xml.py index 7bc2425ee8..02cdf64cc2 100755 --- a/gr-uhd/grc/gen_uhd_single_usrp_blocks_xml.py +++ b/gr-uhd/grc/gen_uhd_single_usrp_blocks_xml.py @@ -30,7 +30,9 @@ MAIN_TMPL = """\ io_type=uhd.io_type_t.\$type.type, num_channels=\$nchan, ) +\#if \$sd_spec() self.\$(id).set_subdev_spec(\$sd_spec) +\#end if self.\$(id).set_samp_rate(\$samp_rate) #for $n in range($max_nchan) \#if \$nchan() > $n |