Created tree of modules for gnuradio-companion reflecting their organization.

Changed some names of GRC blocks to prettier ones.

14 files changed, 10 insertions, 23 deletions

diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt
index fc24e58..8ded6ca 100644
--- a/grc/CMakeLists.txt
+++ b/grc/CMakeLists.txt
@@ -17,6 +17,7 @@
 # the Free Software Foundation, Inc., 51 Franklin Street,
 # Boston, MA 02110-1301, USA.
 install(FILES
+    gsm_block_tree.xml
     receiver/gsm_receiver.xml
     misc_utils/gsm_bursts_printer.xml
     receiver/gsm_fcch_burst_tagger.xml
diff --git a/grc/decoding/gsm_control_channels_decoder.xml b/grc/decoding/gsm_control_channels_decoder.xml
index f04794a..30e8702 100644
--- a/grc/decoding/gsm_control_channels_decoder.xml
+++ b/grc/decoding/gsm_control_channels_decoder.xml
@@ -2,7 +2,6 @@
 <block>
   <name>Control channels decoder</name>
   <key>gsm_control_channels_decoder</key>
-  <category>GSM</category>
   <import>import gsm</import>
   <make>gsm.control_channels_decoder()</make>
   <sink>
diff --git a/grc/demapping/gsm_get_bcch_or_ccch_bursts.xml b/grc/demapping/gsm_get_bcch_or_ccch_bursts.xml
index 5989227..1e1b881 100644
--- a/grc/demapping/gsm_get_bcch_or_ccch_bursts.xml
+++ b/grc/demapping/gsm_get_bcch_or_ccch_bursts.xml
@@ -2,7 +2,6 @@
 <block>
   <name>Demapper for BCCH and CCCH</name>
   <key>gsm_get_bcch_or_ccch_bursts</key>
-  <category>GSM</category>
   <import>import gsm</import>
   <make>gsm.get_bcch_or_ccch_bursts($d_fn51_start)</make>
   <param>
diff --git a/grc/misc_utils/gsm_bursts_printer.xml b/grc/misc_utils/gsm_bursts_printer.xml
index c1716be..4f1a79d 100644
--- a/grc/misc_utils/gsm_bursts_printer.xml
+++ b/grc/misc_utils/gsm_bursts_printer.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0"?>
 <block>
-  <name>bursts_printer</name>
+  <name>Bursts printer</name>
   <key>gsm_bursts_printer</key>
-  <category>GSM</category>
   <import>import gsm</import>
   <make>gsm.bursts_printer()</make>
- 
   <sink>
     <name>bursts</name>
     <type>message</type>
diff --git a/grc/misc_utils/gsm_clock_offset_corrector.xml b/grc/misc_utils/gsm_clock_offset_corrector.xml
index 7fe4a4d..c541054 100644
--- a/grc/misc_utils/gsm_clock_offset_corrector.xml
+++ b/grc/misc_utils/gsm_clock_offset_corrector.xml
@@ -1,8 +1,7 @@
 <?xml version='1.0' encoding='ASCII'?>
 <block>
   <name>Clock offset corrector</name>
-  <key>clock_offset_corrector</key>
-  <category>GSM</category>
+  <key>gsm_clock_offset_corrector</key>
   <import>import gsm</import>
   <make>gsm.clock_offset_corrector(
     fc=$fc,
@@ -18,25 +17,25 @@
     <name>fc</name>
     <key>fc</key>
     <value>936.6e6</value>
-    <type>raw</type>
+    <type>float</type>
   </param>
   <param>
     <name>ppm</name>
     <key>ppm</key>
     <value>0</value>
-    <type>raw</type>
+    <type>int</type>
   </param>
   <param>
     <name>samp_rate_in</name>
     <key>samp_rate_in</key>
     <value>1625000.0/6.0*4.0</value>
-    <type>raw</type>
+    <type>float</type>
   </param>
   <param>
     <name>samp_rate_out</name>
     <key>samp_rate_out</key>
     <value>1625000.0/6.0*4.0</value>
-    <type>raw</type>
+    <type>float</type>
   </param>
   <sink>
     <name>in</name>
diff --git a/grc/misc_utils/gsm_controlled_const_source_f.xml b/grc/misc_utils/gsm_controlled_const_source_f.xml
index f51ef69..13cf2fa 100644
--- a/grc/misc_utils/gsm_controlled_const_source_f.xml
+++ b/grc/misc_utils/gsm_controlled_const_source_f.xml
@@ -2,7 +2,6 @@
 <block>
   <name>Controlled const source</name>
   <key>gsm_controlled_const_source_f</key>
-  <category>GSM</category>
   <import>import gsm</import>
   <make>gsm.controlled_const_source_f($constant)</make>
   <callback>set_constant($constant)</callback>
diff --git a/grc/misc_utils/gsm_controlled_rotator_cc.xml b/grc/misc_utils/gsm_controlled_rotator_cc.xml
index 83040d4..e08b073 100644
--- a/grc/misc_utils/gsm_controlled_rotator_cc.xml
+++ b/grc/misc_utils/gsm_controlled_rotator_cc.xml
@@ -2,7 +2,6 @@
 <block>
   <name>Controlled rotator</name>
   <key>gsm_controlled_rotator_cc</key>
-  <category>GSM</category>
   <import>import gsm</import>
   <make>gsm.controlled_rotator_cc($phase_inc,$samp_rate)</make>
   <callback>set_phase_inc($phase_inc)</callback>
diff --git a/grc/misc_utils/gsm_extract_system_info.xml b/grc/misc_utils/gsm_extract_system_info.xml
index 4316d14..13db671 100644
--- a/grc/misc_utils/gsm_extract_system_info.xml
+++ b/grc/misc_utils/gsm_extract_system_info.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0"?>
 <block>
-  <name>extract_system_info</name>
+  <name>Extract system info</name>
   <key>gsm_extract_system_info</key>
-  <category>GSM</category>
   <import>import gsm</import>
   <make>gsm.extract_system_info()</make>
 
diff --git a/grc/misc_utils/gsm_message_printer.xml b/grc/misc_utils/gsm_message_printer.xml
index 2c849dc..2da469e 100644
--- a/grc/misc_utils/gsm_message_printer.xml
+++ b/grc/misc_utils/gsm_message_printer.xml
@@ -2,7 +2,6 @@
 <block>
   <name>Message printer</name>
   <key>gsm_message_printer</key>
-  <category>GSM</category>
   <import>import gsm</import>
   <make>gsm.message_printer()</make>
 
diff --git a/grc/receiver/gsm_clock_offset_control.xml b/grc/receiver/gsm_clock_offset_control.xml
index a5c8854..e02ecf2 100644
--- a/grc/receiver/gsm_clock_offset_control.xml
+++ b/grc/receiver/gsm_clock_offset_control.xml
@@ -2,7 +2,6 @@
 <block>
   <name>GSM clock offset control</name>
   <key>gsm_clock_offset_control</key>
-  <category>GSM</category>
   <import>import gsm</import>
   <make>gsm.clock_offset_control($fc, $samp_rate)</make>
   <callback></callback>
diff --git a/grc/receiver/gsm_fcch_burst_tagger.xml b/grc/receiver/gsm_fcch_burst_tagger.xml
index 90f5688..ce10af6 100644
--- a/grc/receiver/gsm_fcch_burst_tagger.xml
+++ b/grc/receiver/gsm_fcch_burst_tagger.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0"?>
 <block>
-  <name>fcch_burst_tagger</name>
+  <name>FCCH burst tagger</name>
   <key>gsm_fcch_burst_tagger</key>
-  <category>GSM</category>
   <import>import gsm</import>
   <make>gsm.fcch_burst_tagger($OSR)</make>
   <param>
diff --git a/grc/receiver/gsm_fcch_detector.xml b/grc/receiver/gsm_fcch_detector.xml
index d40aba7..a22379b 100644
--- a/grc/receiver/gsm_fcch_detector.xml
+++ b/grc/receiver/gsm_fcch_detector.xml
@@ -2,7 +2,6 @@
 <block>
   <name>FCCH bursts detector</name>
   <key>gsm_fcch_detector</key>
-  <category>GSM</category>
   <import>import gsm</import>
   <make>gsm.fcch_detector($OSR)</make>
 <callback>set_OSR($OSR)</callback>
diff --git a/grc/receiver/gsm_receiver.xml b/grc/receiver/gsm_receiver.xml
index 4841568..c555bf0 100644
--- a/grc/receiver/gsm_receiver.xml
+++ b/grc/receiver/gsm_receiver.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0"?>
 <block>
-  <name>GSM Receiver bare</name>
+  <name>GSM Receiver</name>
   <key>gsm_receiver</key>
-  <category>GSM</category>
   <import>import gsm</import>
   <make>gsm.receiver($osr, $arfcn)</make>
 
diff --git a/grc/receiver/gsm_sch_detector.xml b/grc/receiver/gsm_sch_detector.xml
index 3445dc6..902835b 100644
--- a/grc/receiver/gsm_sch_detector.xml
+++ b/grc/receiver/gsm_sch_detector.xml
@@ -2,7 +2,6 @@
 <block>
   <name>SCH bursts detector</name>
   <key>gsm_sch_detector</key>
-  <category>GSM</category>
   <import>import gsm</import>
   <make>gsm.sch_detector($OSR)</make>
   <callback>set_OSR($OSR)</callback>