From 07ca6eb3d617fdca52153acaccf59dbcdd9e5061 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Wed, 26 Oct 2011 07:48:39 -0400 Subject: grc: fixing grc blocks not properly moved in to digital. --- grc/blocks/Makefile.am | 6 -- grc/blocks/blks2_gmsk_demod.xml | 88 --------------------------- grc/blocks/blks2_gmsk_mod.xml | 67 -------------------- grc/blocks/blks2_qamx_demod.xml | 131 ---------------------------------------- grc/blocks/blks2_qamx_mod.xml | 103 ------------------------------- grc/blocks/block_tree.xml | 8 --- grc/blocks/gr_cpmmod_bc.xml | 69 --------------------- grc/blocks/gr_gmskmod_bc.xml | 38 ------------ 8 files changed, 510 deletions(-) delete mode 100644 grc/blocks/blks2_gmsk_demod.xml delete mode 100644 grc/blocks/blks2_gmsk_mod.xml delete mode 100644 grc/blocks/blks2_qamx_demod.xml delete mode 100644 grc/blocks/blks2_qamx_mod.xml delete mode 100644 grc/blocks/gr_cpmmod_bc.xml delete mode 100644 grc/blocks/gr_gmskmod_bc.xml (limited to 'grc') diff --git a/grc/blocks/Makefile.am b/grc/blocks/Makefile.am index f326285e5..020dcecdd 100644 --- a/grc/blocks/Makefile.am +++ b/grc/blocks/Makefile.am @@ -34,8 +34,6 @@ dist_ourdata_DATA = \ blks2_fm_deemph.xml \ blks2_fm_demod_cf.xml \ blks2_fm_preemph.xml \ - blks2_gmsk_demod.xml \ - blks2_gmsk_mod.xml \ blks2_logpwrfft_x.xml \ blks2_nbfm_rx.xml \ blks2_nbfm_tx.xml \ @@ -43,8 +41,6 @@ dist_ourdata_DATA = \ blks2_packet_encoder.xml \ blks2_pfb_arb_resampler.xml \ blks2_pfb_channelizer.xml \ - blks2_qamx_demod.xml \ - blks2_qamx_mod.xml \ blks2_rational_resampler_xxx.xml \ blks2_selector.xml \ blks2_standard_squelch.xml \ @@ -80,7 +76,6 @@ dist_ourdata_DATA = \ gr_cpfsk_bc.xml \ gr_ctcss_squelch_ff.xml \ gr_dc_blocker.xml \ - gr_cpmmod_bc.xml \ gr_decode_ccsds_27_fb.xml \ gr_deinterleave.xml \ gr_delay.xml \ @@ -106,7 +101,6 @@ dist_ourdata_DATA = \ gr_freq_xlating_fir_filter_xxx.xml \ gr_frequency_modulator_fc.xml \ gr_glfsr_source_x.xml \ - gr_gmskmod_bc.xml \ gr_goertzel_fc.xml \ gr_head.xml \ gr_hilbert_fc.xml \ diff --git a/grc/blocks/blks2_gmsk_demod.xml b/grc/blocks/blks2_gmsk_demod.xml deleted file mode 100644 index 13ecb3344..000000000 --- a/grc/blocks/blks2_gmsk_demod.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - - GMSK Demod - blks2_gmsk_demod - from gnuradio import blks2 - blks2.gmsk_demod( - samples_per_symbol=$samples_per_symbol, - gain_mu=$gain_mu, - mu=$mu, - omega_relative_limit=$omega_relative_limit, - freq_error=$freq_error, - verbose=$verbose, - log=$log, -) - - Samples/Symbol - samples_per_symbol - 2 - int - - - Gain Mu - gain_mu - 0.175 - real - - - Mu - mu - 0.5 - real - - - Omega Relative Limit - omega_relative_limit - 0.005 - real - - - Freq Error - freq_error - 0.0 - real - - - Verbose - verbose - False - bool - #if str($verbose) == 'False' then 'part' else 'none'# - - - - - Logging - log - False - bool - #if str($log) == 'False' then 'part' else 'none'# - - - - - in - complex - - - out - byte - - diff --git a/grc/blocks/blks2_gmsk_mod.xml b/grc/blocks/blks2_gmsk_mod.xml deleted file mode 100644 index e80264f11..000000000 --- a/grc/blocks/blks2_gmsk_mod.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - GMSK Mod - blks2_gmsk_mod - from gnuradio import blks2 - blks2.gmsk_mod( - samples_per_symbol=$samples_per_symbol, - bt=$bt, - verbose=$verbose, - log=$log, -) - - Samples/Symbol - samples_per_symbol - 2 - int - - - BT - bt - 0.35 - real - - - Verbose - verbose - False - bool - #if str($verbose) == 'False' then 'part' else 'none'# - - - - - Logging - log - False - bool - #if str($log) == 'False' then 'part' else 'none'# - - - - - in - byte - - - out - complex - - diff --git a/grc/blocks/blks2_qamx_demod.xml b/grc/blocks/blks2_qamx_demod.xml deleted file mode 100644 index e332495ae..000000000 --- a/grc/blocks/blks2_qamx_demod.xml +++ /dev/null @@ -1,131 +0,0 @@ - - - - QAM Demod - blks2_qamx_demod - from gnuradio import blks2 - blks2.$(type)_demod( - samples_per_symbol=$samples_per_symbol, - excess_bw=$excess_bw, - costas_alpha=$costas_alpha, - gain_mu=$gain_mu, - mu=$mu, - omega_relative_limit=$omega_relative_limit, - gray_code=$gray_code, - verbose=$verbose, - log=$log, -) - - Type - type - enum - - - - - - - Samples/Symbol - samples_per_symbol - 2 - int - - - Excess BW - excess_bw - 0.35 - real - - - Costas Alpha - costas_alpha - 0.175 - real - - - Gain Mu - gain_mu - 0.03 - real - - - Mu - mu - 0.05 - real - - - Omega Relative Limit - omega_relative_limit - 0.005 - real - - - Gray Code - gray_code - True - enum - - - - - Verbose - verbose - False - bool - #if str($verbose) == 'False' then 'part' else 'none'# - - - - - Logging - log - False - bool - #if str($log) == 'False' then 'part' else 'none'# - - - - - in - complex - - - out - byte - - diff --git a/grc/blocks/blks2_qamx_mod.xml b/grc/blocks/blks2_qamx_mod.xml deleted file mode 100644 index 69a2e9e75..000000000 --- a/grc/blocks/blks2_qamx_mod.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - QAM Mod - blks2_qamx_mod - from gnuradio import blks2 - blks2.$(type)_mod( - samples_per_symbol=$samples_per_symbol, - excess_bw=$excess_bw, - gray_code=$gray_code, - verbose=$verbose, - log=$log, -) - - Type - type - enum - - - - - - - Samples/Symbol - samples_per_symbol - 2 - int - - - Excess BW - excess_bw - 0.35 - real - - - Gray Code - gray_code - True - enum - - - - - Verbose - verbose - False - bool - #if str($verbose) == 'False' then 'part' else 'none'# - - - - - Logging - log - False - bool - #if str($log) == 'False' then 'part' else 'none'# - - - - - in - byte - - - out - complex - - diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml index 91afc506c..183408cec 100644 --- a/grc/blocks/block_tree.xml +++ b/grc/blocks/block_tree.xml @@ -190,8 +190,6 @@ gr_phase_modulator_fc gr_quadrature_demod_cf gr_cpfsk_bc - gr_cpmmod_bc - gr_gmskmod_bc gr_diff_phasor_cc @@ -209,12 +207,6 @@ blks2_fm_demod_cf blks2_fm_deemph blks2_fm_preemph - - blks2_gmsk_mod - blks2_gmsk_demod - - blks2_qamx_mod - blks2_qamx_demod Error Correction diff --git a/grc/blocks/gr_cpmmod_bc.xml b/grc/blocks/gr_cpmmod_bc.xml deleted file mode 100644 index da405534e..000000000 --- a/grc/blocks/gr_cpmmod_bc.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - Continuous Phase Modulation - gr_cpmmod_bc - from gnuradio import gr - gr.cpmmod_bc($type, $mod_index, $samples_per_symbol, $L, $beta) - - CPM Type - type - enum - - - - - - - - Modulation Index - mod_index - 0.5 - real - - - Samples/Symbol - samples_per_symbol - 4 - int - - - Pulse Duration (Symbols) - L - 4 - int - - - Phase Response Parameter (BT or Beta) - beta - 0.3 - real - - - in - byte - - - out - complex - - diff --git a/grc/blocks/gr_gmskmod_bc.xml b/grc/blocks/gr_gmskmod_bc.xml deleted file mode 100644 index 82e47452b..000000000 --- a/grc/blocks/gr_gmskmod_bc.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - GMSK Modulator - gr_gmskmod_bc - from gnuradio import gr - gr.gmskmod_bc($samples_per_symbol, $bt, $L) - - Samples/Symbol - samples_per_symbol - 2 - int - - - 3 dB Time-Bandwith Product - bt - 0.3 - real - - - Pulse Duration (Symbols) - L - 4 - int - - - in - byte - - - out - complex - - -- cgit