diff options
Diffstat (limited to 'grc')
-rw-r--r-- | grc/gsm_block_tree.xml | 1 | ||||
-rw-r--r-- | grc/misc_utils/CMakeLists.txt | 1 | ||||
-rw-r--r-- | grc/misc_utils/gsm_clock_offset_corrector_tagged.xml | 50 | ||||
-rw-r--r-- | grc/receiver/gsm_clock_offset_control.xml | 11 |
4 files changed, 61 insertions, 2 deletions
diff --git a/grc/gsm_block_tree.xml b/grc/gsm_block_tree.xml index 1dd81b7..99628d6 100644 --- a/grc/gsm_block_tree.xml +++ b/grc/gsm_block_tree.xml @@ -62,6 +62,7 @@ <block>gsm_controlled_fractional_resampler_cc</block> <block>gsm_message_printer</block> <block>gsm_clock_offset_corrector</block> + <block>gsm_clock_offset_corrector_tagged</block> <block>gsm_tmsi_dumper</block> </cat> </cat> diff --git a/grc/misc_utils/CMakeLists.txt b/grc/misc_utils/CMakeLists.txt index d042beb..a64d2eb 100644 --- a/grc/misc_utils/CMakeLists.txt +++ b/grc/misc_utils/CMakeLists.txt @@ -25,6 +25,7 @@ install(FILES gsm_message_printer.xml gsm_bursts_printer.xml gsm_clock_offset_corrector.xml + gsm_clock_offset_corrector_tagged.xml gsm_tmsi_dumper.xml gsm_burst_file_sink.xml gsm_burst_file_source.xml diff --git a/grc/misc_utils/gsm_clock_offset_corrector_tagged.xml b/grc/misc_utils/gsm_clock_offset_corrector_tagged.xml new file mode 100644 index 0000000..4f91b4b --- /dev/null +++ b/grc/misc_utils/gsm_clock_offset_corrector_tagged.xml @@ -0,0 +1,50 @@ +<block> + <name>Clock Offset Corrector Tagged</name> + <key>gsm_clock_offset_corrector_tagged</key> + <import>from clock_offset_corrector_tagged import clock_offset_corrector_tagged # grc-generated hier_block</import> + <make>grgsm.clock_offset_corrector_tagged( + fc=$fc, + ppm=$ppm, + samp_rate_in=$samp_rate_in, +)</make> + <callback>set_fc($fc)</callback> + <callback>set_ppm($ppm)</callback> + <callback>set_samp_rate_in($samp_rate_in)</callback> + <param> + <name>fc</name> + <key>fc</key> + <value>fc</value> + <type>float</type> + </param> + <param> + <name>ppm</name> + <key>ppm</key> + <value>ppm</value> + <type>float</type> + </param> + <param> + <name>samp_rate_in</name> + <key>samp_rate_in</key> + <value>samp_rate_in</value> + <type>float</type> + </param> + <sink> + <name>ctrl</name> + <type>message</type> + <optional>1</optional> + </sink> + <sink> + <name>in</name> + <type>complex</type> + <vlen>1</vlen> + </sink> + <source> + <name>out</name> + <type>complex</type> + <vlen>1</vlen> + </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> +</block> diff --git a/grc/receiver/gsm_clock_offset_control.xml b/grc/receiver/gsm_clock_offset_control.xml index 2d55e4f..704d2f3 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)</make> + <make>grgsm.clock_offset_control($fc, $samp_rate)</make> <callback></callback> <param> <name>fc</name> @@ -12,13 +12,20 @@ <type>float</type> </param> + <param> + <name>samp_rate</name> + <key>samp_rate</key> + <value>samp_rate</value> + <type>float</type> + </param> + <sink> <name>measurements</name> <type>message</type> </sink> <source> - <name>ppm</name> + <name>ctrl</name> <type>message</type> <optional>1</optional> </source> |