diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-11-09 07:42:23 -0800 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-11-09 07:42:23 -0800 |
| commit | 14ef340ea74f7f3682b6c654f7519a4e186c3957 (patch) | |
| tree | e376f80d2e183044690ff839e105659cb53381bf /gr-channels/grc | |
| parent | a40f05e8f2a00e2196aa114386e27e8fd8c0f6fc (diff) | |
| parent | 23e834450ad9e052662d4a3fd8ea87acd775c5ec (diff) | |
Merge remote-tracking branch 'osh/master'
Diffstat (limited to 'gr-channels/grc')
| -rw-r--r-- | gr-channels/grc/channels_cfo_model.xml | 3 | ||||
| -rw-r--r-- | gr-channels/grc/channels_dynamic_channel_model.xml | 9 | ||||
| -rw-r--r-- | gr-channels/grc/channels_sro_model.xml | 3 |
3 files changed, 14 insertions, 1 deletions
diff --git a/gr-channels/grc/channels_cfo_model.xml b/gr-channels/grc/channels_cfo_model.xml index 188d89c52d..7d44f7fe87 100644 --- a/gr-channels/grc/channels_cfo_model.xml +++ b/gr-channels/grc/channels_cfo_model.xml @@ -14,6 +14,9 @@ $maxdev, $seed )</make> + <callback>set_std_dev($stdev)</callback> + <callback>set_max_dev($maxdev)</callback> + <callback>set_samp_rate($srate)</callback> <param> <name>Sample Rate Hz</name> <key>srate</key> diff --git a/gr-channels/grc/channels_dynamic_channel_model.xml b/gr-channels/grc/channels_dynamic_channel_model.xml index b54256c864..5735232537 100644 --- a/gr-channels/grc/channels_dynamic_channel_model.xml +++ b/gr-channels/grc/channels_dynamic_channel_model.xml @@ -9,7 +9,14 @@ <key>channels_dynamic_channel_model</key> <import>from gnuradio import channels</import> <make>channels.dynamic_channel_model( $samp_rate, $sro_stdev, $sro_maxdev, $cfo_stdev, $cfo_maxdev, $N, $fD, $LOS, $K, $delays, $mags, $ntaps, $noise_amp, $seed )</make> - <callback>set_fDTs($fDTs)</callback> + + <callback>set_samp_rate($samp_rate)</callback> + <callback>set_sro_dev_std($sro_stdev)</callback> + <callback>set_sro_dev_max($sro_maxdev)</callback> + <callback>set_cfo_dev_std($cfo_stdev)</callback> + <callback>set_cfo_dev_max($cfo_maxdev)</callback> + <callback>set_noise_amp($noise_amp)</callback> + <callback>set_doppler_freq($fD)</callback> <callback>set_K($K)</callback> <param> diff --git a/gr-channels/grc/channels_sro_model.xml b/gr-channels/grc/channels_sro_model.xml index 64d06899e6..63752aaefd 100644 --- a/gr-channels/grc/channels_sro_model.xml +++ b/gr-channels/grc/channels_sro_model.xml @@ -14,6 +14,9 @@ $maxdev, $seed )</make> + <callback>set_std_dev($stdev)</callback> + <callback>set_max_dev($maxdev)</callback> + <callback>set_samp_rate($srate)</callback> <param> <name>Sample Rate Hz</name> <key>srate</key> |