From 486d97946acabbf5589b3163446fbe44c6a7a402 Mon Sep 17 00:00:00 2001 From: ptrkrysik Date: Thu, 6 Nov 2014 13:54:36 +0100 Subject: Created tree of modules for gnuradio-companion reflecting their organization. Changed some names of GRC blocks to prettier ones. --- grc/CMakeLists.txt | 1 + grc/decoding/gsm_control_channels_decoder.xml | 1 - grc/demapping/gsm_get_bcch_or_ccch_bursts.xml | 1 - grc/misc_utils/gsm_bursts_printer.xml | 4 +--- grc/misc_utils/gsm_clock_offset_corrector.xml | 11 +++++------ grc/misc_utils/gsm_controlled_const_source_f.xml | 1 - grc/misc_utils/gsm_controlled_rotator_cc.xml | 1 - grc/misc_utils/gsm_extract_system_info.xml | 3 +-- grc/misc_utils/gsm_message_printer.xml | 1 - grc/receiver/gsm_clock_offset_control.xml | 1 - grc/receiver/gsm_fcch_burst_tagger.xml | 3 +-- grc/receiver/gsm_fcch_detector.xml | 1 - grc/receiver/gsm_receiver.xml | 3 +-- grc/receiver/gsm_sch_detector.xml | 1 - 14 files changed, 10 insertions(+), 23 deletions(-) (limited to 'grc') 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 @@ Control channels decoder gsm_control_channels_decoder - GSM import gsm gsm.control_channels_decoder() 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 @@ Demapper for BCCH and CCCH gsm_get_bcch_or_ccch_bursts - GSM import gsm gsm.get_bcch_or_ccch_bursts($d_fn51_start) 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 @@ - bursts_printer + Bursts printer gsm_bursts_printer - GSM import gsm gsm.bursts_printer() - bursts message 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 @@ Clock offset corrector - clock_offset_corrector - GSM + gsm_clock_offset_corrector import gsm gsm.clock_offset_corrector( fc=$fc, @@ -18,25 +17,25 @@ fc fc 936.6e6 - raw + float ppm ppm 0 - raw + int samp_rate_in samp_rate_in 1625000.0/6.0*4.0 - raw + float samp_rate_out samp_rate_out 1625000.0/6.0*4.0 - raw + float in 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 @@ Controlled const source gsm_controlled_const_source_f - GSM import gsm gsm.controlled_const_source_f($constant) set_constant($constant) 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 @@ Controlled rotator gsm_controlled_rotator_cc - GSM import gsm gsm.controlled_rotator_cc($phase_inc,$samp_rate) set_phase_inc($phase_inc) 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 @@ - extract_system_info + Extract system info gsm_extract_system_info - GSM import gsm gsm.extract_system_info() 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 @@ Message printer gsm_message_printer - GSM import gsm gsm.message_printer() 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 @@ GSM clock offset control gsm_clock_offset_control - GSM import gsm gsm.clock_offset_control($fc, $samp_rate) 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 @@ - fcch_burst_tagger + FCCH burst tagger gsm_fcch_burst_tagger - GSM import gsm gsm.fcch_burst_tagger($OSR) 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 @@ FCCH bursts detector gsm_fcch_detector - GSM import gsm gsm.fcch_detector($OSR) set_OSR($OSR) 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 @@ - GSM Receiver bare + GSM Receiver gsm_receiver - GSM import gsm gsm.receiver($osr, $arfcn) 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 @@ SCH bursts detector gsm_sch_detector - GSM import gsm gsm.sch_detector($OSR) set_OSR($OSR) -- cgit v1.2.3