diff options
Diffstat (limited to 'grc')
| -rw-r--r-- | grc/misc_utils/gsm_clock_offset_corrector_tagged.xml | 25 | ||||
| -rw-r--r-- | grc/misc_utils/gsm_controlled_rotator_cc.xml | 17 | ||||
| -rw-r--r-- | grc/receiver/gsm_clock_offset_control.xml | 8 |
3 files changed, 24 insertions, 26 deletions
diff --git a/grc/misc_utils/gsm_clock_offset_corrector_tagged.xml b/grc/misc_utils/gsm_clock_offset_corrector_tagged.xml index 25d2132..bcec98e 100644 --- a/grc/misc_utils/gsm_clock_offset_corrector_tagged.xml +++ b/grc/misc_utils/gsm_clock_offset_corrector_tagged.xml @@ -4,29 +4,37 @@ <import>import grgsm</import> <make>grgsm.clock_offset_corrector_tagged( fc=$fc, - ppm=$ppm, samp_rate_in=$samp_rate_in, + ppm=$ppm, + osr=$osr )</make> <callback>set_fc($fc)</callback> <callback>set_ppm($ppm)</callback> <callback>set_samp_rate_in($samp_rate_in)</callback> + <callback>set_osr($osr)</callback> <param> <name>fc</name> <key>fc</key> - <value>fc</value> - <type>float</type> + <value>936.6e6</value> + <type>raw</type> </param> <param> <name>ppm</name> <key>ppm</key> - <value>ppm</value> - <type>float</type> + <value>0</value> + <type>raw</type> </param> <param> <name>samp_rate_in</name> <key>samp_rate_in</key> - <value>samp_rate_in</value> - <type>float</type> + <value>1625000.0/6.0*4.0</value> + <type>raw</type> + </param> + <param> + <name>OSR</name> + <key>osr</key> + <value>osr</value> + <type>raw</type> </param> <sink> <name>ctrl</name> @@ -45,6 +53,5 @@ </source> <doc>Piotr Krysik Clock offset corrector with blocks that use tags to switch offsets -</doc> - <grc_source>gr-gsm/hier_blocks/misc_utils/gsm_clock_offset_corrector_tagged.grc</grc_source> + </doc> </block> diff --git a/grc/misc_utils/gsm_controlled_rotator_cc.xml b/grc/misc_utils/gsm_controlled_rotator_cc.xml index e280de9..09ac422 100644 --- a/grc/misc_utils/gsm_controlled_rotator_cc.xml +++ b/grc/misc_utils/gsm_controlled_rotator_cc.xml @@ -3,33 +3,18 @@ <name>Controlled Rotator</name> <key>gsm_controlled_rotator_cc</key> <import>import grgsm</import> - <make>grgsm.controlled_rotator_cc($phase_inc,$samp_rate)</make> + <make>grgsm.controlled_rotator_cc($phase_inc)</make> <callback>set_phase_inc($phase_inc)</callback> - <callback>set_samp_rate($samp_rate)</callback> <param> <name>phase_inc</name> <key>phase_inc</key> <value>0</value> <type>real</type> </param> - - <param> - <name>samp_rate</name> - <key>samp_rate</key> - <value>samp_rate</value> - <type>real</type> - </param> - <sink> <name>in</name> <type>complex</type> </sink> - <sink> - <name>phase_inc</name> - <type>float</type> - <optional>1</optional> - </sink> - <source> <name>out</name> <type>complex</type> diff --git a/grc/receiver/gsm_clock_offset_control.xml b/grc/receiver/gsm_clock_offset_control.xml index 704d2f3..17378ea 100644 --- a/grc/receiver/gsm_clock_offset_control.xml +++ b/grc/receiver/gsm_clock_offset_control.xml @@ -3,7 +3,7 @@ <name>GSM Clock Offset Control</name> <key>gsm_clock_offset_control</key> <import>import grgsm</import> - <make>grgsm.clock_offset_control($fc, $samp_rate)</make> + <make>grgsm.clock_offset_control($fc, $samp_rate, $osr)</make> <callback></callback> <param> <name>fc</name> @@ -11,6 +11,12 @@ <value>fc</value> <type>float</type> </param> + <param> + <name>OSR</name> + <key>osr</key> + <value>osr</value> + <type>int</type> + </param> <param> <name>samp_rate</name> |