From ad08a308cb2e4261c878521bd41ce5635d7dc280 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Mon, 12 Sep 2011 20:29:31 -0400 Subject: digital: fixed GRC blocks for blocks moved to gr-digital. --- grc/blocks/Makefile.am | 10 -- grc/blocks/blks2_dxpsk2_demod.xml | 152 ----------------------------- grc/blocks/blks2_dxpsk2_mod.xml | 95 ------------------ grc/blocks/blks2_dxpsk_demod.xml | 127 ------------------------ grc/blocks/blks2_dxpsk_mod.xml | 99 ------------------- grc/blocks/gr_binary_slicer_fb.xml | 20 ---- grc/blocks/gr_clock_recovery_mm_xx.xml | 64 ------------ grc/blocks/gr_cma_equalizer_cc.xml | 36 ------- grc/blocks/gr_constellation_decoder_cb.xml | 30 ------ grc/blocks/gr_correlate_access_code_bb.xml | 31 ------ grc/blocks/gr_costas_loop_cc.xml | 52 ---------- 11 files changed, 716 deletions(-) delete mode 100644 grc/blocks/blks2_dxpsk2_demod.xml delete mode 100644 grc/blocks/blks2_dxpsk2_mod.xml delete mode 100644 grc/blocks/blks2_dxpsk_demod.xml delete mode 100644 grc/blocks/blks2_dxpsk_mod.xml delete mode 100644 grc/blocks/gr_binary_slicer_fb.xml delete mode 100644 grc/blocks/gr_clock_recovery_mm_xx.xml delete mode 100644 grc/blocks/gr_cma_equalizer_cc.xml delete mode 100644 grc/blocks/gr_constellation_decoder_cb.xml delete mode 100644 grc/blocks/gr_correlate_access_code_bb.xml delete mode 100644 grc/blocks/gr_costas_loop_cc.xml (limited to 'grc') diff --git a/grc/blocks/Makefile.am b/grc/blocks/Makefile.am index 6f72fe399..bed84adc8 100644 --- a/grc/blocks/Makefile.am +++ b/grc/blocks/Makefile.am @@ -30,10 +30,6 @@ dist_ourdata_DATA = \ blks2_analysis_filterbank.xml \ blks2_cvsd_encode.xml \ blks2_cvsd_decode.xml \ - blks2_dxpsk_demod.xml \ - blks2_dxpsk_mod.xml \ - blks2_dxpsk2_demod.xml \ - blks2_dxpsk2_mod.xml \ blks2_error_rate.xml \ blks2_fm_deemph.xml \ blks2_fm_demod_cf.xml \ @@ -71,12 +67,9 @@ dist_ourdata_DATA = \ gr_and_xx.xml \ gr_and_const_xx.xml \ gr_argmax_xx.xml \ - gr_binary_slicer_fb.xml \ gr_channel_model.xml \ gr_char_to_float.xml \ gr_chunks_to_symbols.xml \ - gr_clock_recovery_mm_xx.xml \ - gr_cma_equalizer_cc.xml \ gr_complex_to_arg.xml \ gr_complex_to_float.xml \ gr_complex_to_imag.xml \ @@ -85,10 +78,7 @@ dist_ourdata_DATA = \ gr_complex_to_mag_squared.xml \ gr_complex_to_real.xml \ gr_conjugate_cc.xml \ - gr_constellation_decoder_cb.xml \ gr_copy.xml \ - gr_correlate_access_code_bb.xml \ - gr_costas_loop_cc.xml \ gr_cpfsk_bc.xml \ gr_dc_blocker.xml \ gr_cpmmod_bc.xml \ diff --git a/grc/blocks/blks2_dxpsk2_demod.xml b/grc/blocks/blks2_dxpsk2_demod.xml deleted file mode 100644 index 7fe4be32b..000000000 --- a/grc/blocks/blks2_dxpsk2_demod.xml +++ /dev/null @@ -1,152 +0,0 @@ - - - - DPSK2 Demod - blks2_dxpsk2_demod - from gnuradio import blks2 - blks2.$(type)2_demod( - samples_per_symbol=$samples_per_symbol, - excess_bw=$excess_bw, - freq_alpha=$freq_alpha, - phase_alpha=$phase_alpha, - timing_alpha=$timing_alpha, - timing_max_dev=$timing_max_dev, - gray_code=$gray_code, - verbose=$verbose, - log=$log, - sync_out=$sync_out, -) - clock_recov.set_alpha($costas_alpha) - clock_recov.set_beta(0.25*$costas_alpha**2) - time_recov.set_alpha($timing_alpha) - - Type - type - enum - - - - - Samples/Symbol - samples_per_symbol - 2 - int - - - Excess BW - excess_bw - 0.35 - real - - - FLL Alpha - freq_alpha - 0.010 - real - - - Phase Alpha - phase_alpha - 0.100 - real - - - Timing Alpha - timing_alpha - 0.100 - real - - - Timing Max Dev - timing_max_dev - 1.5 - real - - - Omega Relative Limit - omega_relative_limit - 0.005 - real - - - Gray Code - gray_code - True - bool - - - - - Verbose - verbose - False - bool - #if str($verbose) == 'False' then 'part' else 'none'# - - - - - Logging - log - False - bool - #if str($log) == 'False' then 'part' else 'none'# - - - - - Sync Out - sync_out - False - bool - - - - - in - complex - - - out - byte - - - sync - complex - 1 - - diff --git a/grc/blocks/blks2_dxpsk2_mod.xml b/grc/blocks/blks2_dxpsk2_mod.xml deleted file mode 100644 index bf292be17..000000000 --- a/grc/blocks/blks2_dxpsk2_mod.xml +++ /dev/null @@ -1,95 +0,0 @@ - - - - DPSK2 Mod - blks2_dxpsk2_mod - from gnuradio import blks2 - blks2.$(type)2_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 - bool - - - - - 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_dxpsk_demod.xml b/grc/blocks/blks2_dxpsk_demod.xml deleted file mode 100644 index 1c96b6cec..000000000 --- a/grc/blocks/blks2_dxpsk_demod.xml +++ /dev/null @@ -1,127 +0,0 @@ - - - - DPSK Demod - blks2_dxpsk_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.175 - real - - - Mu - mu - 0.5 - real - - - Omega Relative Limit - omega_relative_limit - 0.005 - real - - - Gray Code - gray_code - True - bool - - - - - 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_dxpsk_mod.xml b/grc/blocks/blks2_dxpsk_mod.xml deleted file mode 100644 index 77505d8ad..000000000 --- a/grc/blocks/blks2_dxpsk_mod.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - - DPSK Mod - blks2_dxpsk_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 - bool - - - - - 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/gr_binary_slicer_fb.xml b/grc/blocks/gr_binary_slicer_fb.xml deleted file mode 100644 index 85d71e709..000000000 --- a/grc/blocks/gr_binary_slicer_fb.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - Binary Slicer - gr_binary_slicer_fb - from gnuradio import gr - gr.binary_slicer_fb() - - in - float - - - out - byte - - diff --git a/grc/blocks/gr_clock_recovery_mm_xx.xml b/grc/blocks/gr_clock_recovery_mm_xx.xml deleted file mode 100644 index 613cc23bf..000000000 --- a/grc/blocks/gr_clock_recovery_mm_xx.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - Clock Recovery MM - gr_clock_recovery_mm_xx - from gnuradio import gr - gr.clock_recovery_mm_$(type.fcn)($omega, $gain_omega, $mu, $gain_mu, $omega_relative_limit) - set_omega($omega) - set_gain_omega($gain_omega) - set_mu($mu) - set_gain_mu($gain_mu) - - Type - type - enum - - - - - Omega - omega - real - - - Gain Omega - gain_omega - real - - - Mu - mu - real - - - Gain Mu - gain_mu - real - - - Omega Relative Limit - omega_relative_limit - real - - - in - $type - - - out - $type - - diff --git a/grc/blocks/gr_cma_equalizer_cc.xml b/grc/blocks/gr_cma_equalizer_cc.xml deleted file mode 100644 index 142fb6d81..000000000 --- a/grc/blocks/gr_cma_equalizer_cc.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - CMA Equalizer - gr_cma_equalizer_cc - from gnuradio import gr - gr.cma_equalizer_cc($num_taps, $modulus, $mu) - - Num Taps - num_taps - 64 - int - - - Modulus - modulus - real - - - Mu - mu - real - - - in - complex - - - out - complex - - diff --git a/grc/blocks/gr_constellation_decoder_cb.xml b/grc/blocks/gr_constellation_decoder_cb.xml deleted file mode 100644 index 99d897a3a..000000000 --- a/grc/blocks/gr_constellation_decoder_cb.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - Constellation Decoder - gr_constellation_decoder_cb - from gnuradio import gr - gr.constellation_decoder_cb($sym_position, $sym_value_out) - - Symbol Position - sym_position - complex_vector - - - Symbol Value Out - sym_value_out - int_vector - - - in - complex - - - out - byte - - diff --git a/grc/blocks/gr_correlate_access_code_bb.xml b/grc/blocks/gr_correlate_access_code_bb.xml deleted file mode 100644 index e13d2d070..000000000 --- a/grc/blocks/gr_correlate_access_code_bb.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - Correlate Access Code - gr_correlate_access_code_bb - from gnuradio import gr - gr.correlate_access_code_bb($access_code, $threshold) - - Access Code - access_code - 101010 - string - - - Threshold - threshold - int - - - in - byte - - - out - byte - - diff --git a/grc/blocks/gr_costas_loop_cc.xml b/grc/blocks/gr_costas_loop_cc.xml deleted file mode 100644 index e0db8bc5d..000000000 --- a/grc/blocks/gr_costas_loop_cc.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - Costas Loop - gr_costas_loop_cc - from gnuradio import gr - gr.costas_loop_cc($alpha, $beta, $max_freq, $min_freq, $order) - set_alpha($alpha) - set_beta($beta) - - Alpha - alpha - real - - - Beta - beta - real - - - Max Freq - max_freq - real - - - Min Freq - min_freq - real - - - Order - order - int - - - in - complex - - - out - complex - - - out - complex - 1 - - -- cgit From dc7442b6b2ff456eeef442360f5ffd375f30af83 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Tue, 13 Sep 2011 11:00:42 -0400 Subject: grc: removing more blocks from general grc tree that are now in digital. --- grc/blocks/block_tree.xml | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'grc') diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml index f5365dcb5..c729d4903 100644 --- a/grc/blocks/block_tree.xml +++ b/grc/blocks/block_tree.xml @@ -110,23 +110,19 @@ gr_unpacked_to_packed_xx gr_packed_to_unpacked_xx gr_unpack_k_bits_bb - gr_binary_slicer_fb gr_chunks_to_symbols_xx gr_map_bb Synchronizers - gr_clock_recovery_mm_xx gr_pfb_clock_sync_xxx - gr_costas_loop_cc gr_mpsk_sync_cc gr_pll_carriertracking_cc gr_pll_freqdet_cf gr_pll_refout_cc - gr_correlate_access_code_bb gr_pn_correlator_cc gr_simple_correlator gr_simple_framer @@ -178,7 +174,6 @@ gr_single_pole_iir_filter_xx gr_hilbert_fc gr_goertzel_fc - gr_cma_equalizer_cc gr_rational_resampler_base_xxx blks2_rational_resampler_xxx gr_fractional_interpolator_xx @@ -198,7 +193,6 @@ gr_gmskmod_bc gr_diff_phasor_cc - gr_constellation_decoder_cb gr_diff_encoder_bb gr_diff_decoder_bb @@ -215,12 +209,6 @@ blks2_fm_deemph blks2_fm_preemph - blks2_dxpsk_mod - blks2_dxpsk_demod - - blks2_dxpsk2_mod - blks2_dxpsk2_demod - blks2_gmsk_mod blks2_gmsk_demod -- cgit