Changed directory structure.
Corrected clock_offset_corrector (for some streange and yet unknown reason fractional resampler eats strem tags for some values of sps).
(this commit may contain some changes that are not described)
diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt
index 8aa9b02..c95646d 100644
--- a/grc/CMakeLists.txt
+++ b/grc/CMakeLists.txt
@@ -17,17 +17,18 @@
# the Free Software Foundation, Inc., 51 Franklin Street,
# Boston, MA 02110-1301, USA.
install(FILES
- gsm_receiver_hier.xml
- gsm_bursts_printer.xml
- gsm_fcch_burst_tagger.xml
- gsm_sch_detector.xml
- gsm_fcch_detector.xml
- gsm_get_bcch_or_ccch_bursts.xml
- gsm_control_channels_decoder.xml
- gsm_extract_system_info.xml
- gsm_controlled_rotator_cc.xml
- gsm_controlled_const_source_f.xml
- gsm_clock_offset_control.xml
- gsm_message_printer.xml
- gsm_clock_offset_corrector.xml DESTINATION share/gnuradio/grc/blocks
+ receiver/gsm_receiver.xml
+ receiver/gsm_receiver_hier.xml
+ misc_utils/gsm_bursts_printer.xml
+ receiver/gsm_fcch_burst_tagger.xml
+ receiver/gsm_sch_detector.xml
+ receiver/gsm_fcch_detector.xml
+ demapping/gsm_get_bcch_or_ccch_bursts.xml
+ decoding/gsm_control_channels_decoder.xml
+ misc_utils/gsm_extract_system_info.xml
+ misc_utils/gsm_controlled_rotator_cc.xml
+ misc_utils/gsm_controlled_const_source_f.xml
+ receiver/gsm_clock_offset_control.xml
+ misc_utils/gsm_message_printer.xml
+ misc_utils/gsm_clock_offset_corrector.xml DESTINATION share/gnuradio/grc/blocks
)
diff --git a/grc/gsm_control_channels_decoder.xml b/grc/decoding/gsm_control_channels_decoder.xml
similarity index 100%
rename from grc/gsm_control_channels_decoder.xml
rename to grc/decoding/gsm_control_channels_decoder.xml
diff --git a/grc/gsm_get_bcch_or_ccch_bursts.xml b/grc/demapping/gsm_get_bcch_or_ccch_bursts.xml
similarity index 100%
rename from grc/gsm_get_bcch_or_ccch_bursts.xml
rename to grc/demapping/gsm_get_bcch_or_ccch_bursts.xml
diff --git a/grc/gsm_clock_offset_corrector.xml b/grc/gsm_clock_offset_corrector.xml
deleted file mode 100644
index a4b3cd3..0000000
--- a/grc/gsm_clock_offset_corrector.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version='1.0' encoding='ASCII'?>
-<block>
- <name>Clock offset corrector</name>
- <key>clock_offset_corrector</key>
- <category>GSM</category>
- <import>import gsm</import>
- <make>gsm.clock_offset_corrector(ppm=$ppm,samp_rate=$samp_rate,fc=$fc)</make>
- <callback>set_ppm($ppm)</callback>
- <callback>set_samp_rate($samp_rate)</callback>
- <callback>set_fc($fc)</callback>
- <param>
- <name>ppm</name>
- <key>ppm</key>
- <value>0</value>
- <type>raw</type>
- </param>
- <param>
- <name>samp_rate</name>
- <key>samp_rate</key>
- <value>samp_rate</value>
- <type>raw</type>
- </param>
- <param>
- <name>fc</name>
- <key>fc</key>
- <value>fc</value>
- <type>raw</type>
- </param>
- <sink>
- <name>in</name>
- <type>complex</type>
- <vlen>1</vlen>
- </sink>
- <sink>
- <name>ppm</name>
- <type>message</type>
- <optional>True</optional>
- </sink>
- <source>
- <name>out</name>
- <type>complex</type>
- <vlen>1</vlen>
- </source>
- <doc>Piotr Krysik</doc>
-<!-- <grc_source>/home/piotr/Odbiornik_gsm/gr-gsm/hier_blocks/clock_offset_corrector.grc</grc_source> -->
-</block>
diff --git a/grc/gsm_bursts_printer.xml b/grc/misc_utils/gsm_bursts_printer.xml
similarity index 100%
rename from grc/gsm_bursts_printer.xml
rename to grc/misc_utils/gsm_bursts_printer.xml
diff --git a/grc/misc_utils/gsm_clock_offset_corrector.xml b/grc/misc_utils/gsm_clock_offset_corrector.xml
new file mode 100644
index 0000000..7fe4a4d
--- /dev/null
+++ b/grc/misc_utils/gsm_clock_offset_corrector.xml
@@ -0,0 +1,58 @@
+<?xml version='1.0' encoding='ASCII'?>
+<block>
+ <name>Clock offset corrector</name>
+ <key>clock_offset_corrector</key>
+ <category>GSM</category>
+ <import>import gsm</import>
+ <make>gsm.clock_offset_corrector(
+ fc=$fc,
+ ppm=$ppm,
+ samp_rate_in=$samp_rate_in,
+ samp_rate_out=$samp_rate_out,
+)</make>
+ <callback>set_fc($fc)</callback>
+ <callback>set_ppm($ppm)</callback>
+ <callback>set_samp_rate_in($samp_rate_in)</callback>
+ <callback>set_samp_rate_out($samp_rate_out)</callback>
+ <param>
+ <name>fc</name>
+ <key>fc</key>
+ <value>936.6e6</value>
+ <type>raw</type>
+ </param>
+ <param>
+ <name>ppm</name>
+ <key>ppm</key>
+ <value>0</value>
+ <type>raw</type>
+ </param>
+ <param>
+ <name>samp_rate_in</name>
+ <key>samp_rate_in</key>
+ <value>1625000.0/6.0*4.0</value>
+ <type>raw</type>
+ </param>
+ <param>
+ <name>samp_rate_out</name>
+ <key>samp_rate_out</key>
+ <value>1625000.0/6.0*4.0</value>
+ <type>raw</type>
+ </param>
+ <sink>
+ <name>in</name>
+ <type>complex</type>
+ <vlen>1</vlen>
+ </sink>
+ <sink>
+ <name>ppm_in</name>
+ <type>message</type>
+ <optional>True</optional>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>complex</type>
+ <vlen>1</vlen>
+ </source>
+ <doc>Piotr Krysik</doc>
+<!-- <grc_source></grc_source> -->
+</block>
diff --git a/grc/gsm_controlled_const_source_f.xml b/grc/misc_utils/gsm_controlled_const_source_f.xml
similarity index 100%
rename from grc/gsm_controlled_const_source_f.xml
rename to grc/misc_utils/gsm_controlled_const_source_f.xml
diff --git a/grc/gsm_controlled_rotator_cc.xml b/grc/misc_utils/gsm_controlled_rotator_cc.xml
similarity index 100%
rename from grc/gsm_controlled_rotator_cc.xml
rename to grc/misc_utils/gsm_controlled_rotator_cc.xml
diff --git a/grc/gsm_extract_system_info.xml b/grc/misc_utils/gsm_extract_system_info.xml
similarity index 100%
rename from grc/gsm_extract_system_info.xml
rename to grc/misc_utils/gsm_extract_system_info.xml
diff --git a/grc/gsm_message_printer.xml b/grc/misc_utils/gsm_message_printer.xml
similarity index 100%
rename from grc/gsm_message_printer.xml
rename to grc/misc_utils/gsm_message_printer.xml
diff --git a/grc/gsm_clock_offset_control.xml b/grc/receiver/gsm_clock_offset_control.xml
similarity index 93%
rename from grc/gsm_clock_offset_control.xml
rename to grc/receiver/gsm_clock_offset_control.xml
index bb4dadb..a5c8854 100644
--- a/grc/gsm_clock_offset_control.xml
+++ b/grc/receiver/gsm_clock_offset_control.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<block>
- <name>Clock offset control</name>
+ <name>GSM clock offset control</name>
<key>gsm_clock_offset_control</key>
<category>GSM</category>
<import>import gsm</import>
diff --git a/grc/gsm_fcch_burst_tagger.xml b/grc/receiver/gsm_fcch_burst_tagger.xml
similarity index 100%
rename from grc/gsm_fcch_burst_tagger.xml
rename to grc/receiver/gsm_fcch_burst_tagger.xml
diff --git a/grc/gsm_fcch_detector.xml b/grc/receiver/gsm_fcch_detector.xml
similarity index 100%
rename from grc/gsm_fcch_detector.xml
rename to grc/receiver/gsm_fcch_detector.xml
diff --git a/grc/gsm_receiver_hier.xml b/grc/receiver/gsm_receiver.xml
similarity index 71%
copy from grc/gsm_receiver_hier.xml
copy to grc/receiver/gsm_receiver.xml
index ca28972..eb0db5f 100644
--- a/grc/gsm_receiver_hier.xml
+++ b/grc/receiver/gsm_receiver.xml
@@ -1,16 +1,10 @@
<?xml version="1.0"?>
<block>
- <name>GSM Receiver</name>
- <key>gsm_receiver_hier</key>
+ <name>GSM Receiver bare</name>
+ <key>gsm_receiver</key>
<category>GSM</category>
<import>import gsm</import>
- <make>gsm.receiver_hier($input_rate, $osr)</make>
- <param>
- <name>Input rate</name>
- <key>input_rate</key>
- <value>samp_rate</value>
- <type>real</type>
- </param>
+ <make>gsm.receiver($osr, $arfcn)</make>
<param>
<name>Oversampling ratio</name>
diff --git a/grc/gsm_receiver_hier.xml b/grc/receiver/gsm_receiver_hier.xml
similarity index 88%
rename from grc/gsm_receiver_hier.xml
rename to grc/receiver/gsm_receiver_hier.xml
index ca28972..b41eb99 100644
--- a/grc/gsm_receiver_hier.xml
+++ b/grc/receiver/gsm_receiver_hier.xml
@@ -1,10 +1,10 @@
<?xml version="1.0"?>
<block>
- <name>GSM Receiver</name>
+ <name>GSM Receiver hier</name>
<key>gsm_receiver_hier</key>
<category>GSM</category>
<import>import gsm</import>
- <make>gsm.receiver_hier($input_rate, $osr)</make>
+ <make>gsm.receiver_hier($input_rate, $osr, $arfcn)</make>
<param>
<name>Input rate</name>
<key>input_rate</key>
diff --git a/grc/gsm_sch_detector.xml b/grc/receiver/gsm_sch_detector.xml
similarity index 100%
rename from grc/gsm_sch_detector.xml
rename to grc/receiver/gsm_sch_detector.xml