From 144ef2dbe12de3f1f784fb2e76771b1e174deb41 Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Thu, 9 Dec 2010 13:54:22 +0100 Subject: All CPM stuff included (C++/GRC/Python), tests pass --- grc/blocks/gr_cpmmod_bc.xml | 69 ++++++++++++++++++++++++++++++++++++++++++++ grc/blocks/gr_gmskmod_bc.xml | 38 ++++++++++++++++++++++++ 2 files changed, 107 insertions(+) create mode 100644 grc/blocks/gr_cpmmod_bc.xml create mode 100644 grc/blocks/gr_gmskmod_bc.xml (limited to 'grc') diff --git a/grc/blocks/gr_cpmmod_bc.xml b/grc/blocks/gr_cpmmod_bc.xml new file mode 100644 index 000000000..7ebb7e179 --- /dev/null +++ b/grc/blocks/gr_cpmmod_bc.xml @@ -0,0 +1,69 @@ + + + + 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 + real + 0.5 + + + Samples/Symbol + samples_per_symbol + 4 + int + + + Pulse Duration (Symbols) + L + 5 + int + + + Phase Response Parameter (BT or Beta) + beta + real + 0.3 + + + in + byte + + + out + complex + + diff --git a/grc/blocks/gr_gmskmod_bc.xml b/grc/blocks/gr_gmskmod_bc.xml new file mode 100644 index 000000000..00195a12f --- /dev/null +++ b/grc/blocks/gr_gmskmod_bc.xml @@ -0,0 +1,38 @@ + + + + GMSK + gr_gmskmod_bc + from gnuradio import gr + gr.gmskmod_bc($samples_per_symbol, $L, $bt) + + Samples/Symbol + samples_per_symbol + 4 + int + + + Pulse Duration (Symbols) + L + 5 + int + + + 3 dB Time-Bandwith Product + bt + real + 0.3 + + + in + byte + + + out + complex + + -- cgit From 3f9a95ae3e8b91faae6b59870429b84ccdfaa3db Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Fri, 10 Dec 2010 13:48:37 +0100 Subject: Added GRC blocks to Makefile --- grc/blocks/Makefile.am | 2 ++ grc/blocks/gr_gmskmod_bc.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) (limited to 'grc') diff --git a/grc/blocks/Makefile.am b/grc/blocks/Makefile.am index 18420a013..af849cd1b 100644 --- a/grc/blocks/Makefile.am +++ b/grc/blocks/Makefile.am @@ -92,6 +92,7 @@ dist_ourdata_DATA = \ gr_correlate_access_code_bb.xml \ gr_costas_loop_cc.xml \ gr_cpfsk_bc.xml \ + gr_cpmmod_bc.xml \ gr_decode_ccsds_27_fb.xml \ gr_deinterleave.xml \ gr_delay.xml \ @@ -118,6 +119,7 @@ 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/gr_gmskmod_bc.xml b/grc/blocks/gr_gmskmod_bc.xml index 00195a12f..de730fbc2 100644 --- a/grc/blocks/gr_gmskmod_bc.xml +++ b/grc/blocks/gr_gmskmod_bc.xml @@ -8,17 +8,11 @@ GMSK gr_gmskmod_bc from gnuradio import gr - gr.gmskmod_bc($samples_per_symbol, $L, $bt) + gr.gmskmod_bc($samples_per_symbol, $bt, $L) Samples/Symbol samples_per_symbol - 4 - int - - - Pulse Duration (Symbols) - L - 5 + 2 int @@ -27,6 +21,12 @@ real 0.3 + + Pulse Duration (Symbols) + L + 4 + int + in byte -- cgit From ee5ac10dcec81570be475877b41be6219784d4c6 Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Fri, 10 Dec 2010 14:03:50 +0100 Subject: Forgot to add GRC blocks to block_tree, fixed --- grc/blocks/block_tree.xml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'grc') diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml index 610a88102..dda5742ec 100644 --- a/grc/blocks/block_tree.xml +++ b/grc/blocks/block_tree.xml @@ -205,6 +205,8 @@ gr_phase_modulator_fc gr_quadrature_demod_cf gr_cpfsk_bc + gr_cpmmod_bc + gr_gmskmod_bc gr_diff_phasor_cc gr_constellation_decoder_cb -- cgit From 67e6c7e9a9420f2fc5ee14cee862412aad24b89f Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Fri, 10 Dec 2010 14:31:00 +0100 Subject: fixed some XML glitches --- grc/blocks/gr_cpmmod_bc.xml | 6 +++--- grc/blocks/gr_gmskmod_bc.xml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'grc') diff --git a/grc/blocks/gr_cpmmod_bc.xml b/grc/blocks/gr_cpmmod_bc.xml index 7ebb7e179..da405534e 100644 --- a/grc/blocks/gr_cpmmod_bc.xml +++ b/grc/blocks/gr_cpmmod_bc.xml @@ -37,8 +37,8 @@ Modulation Index mod_index - real 0.5 + real Samples/Symbol @@ -49,14 +49,14 @@ Pulse Duration (Symbols) L - 5 + 4 int Phase Response Parameter (BT or Beta) beta - real 0.3 + real in diff --git a/grc/blocks/gr_gmskmod_bc.xml b/grc/blocks/gr_gmskmod_bc.xml index de730fbc2..82e47452b 100644 --- a/grc/blocks/gr_gmskmod_bc.xml +++ b/grc/blocks/gr_gmskmod_bc.xml @@ -5,7 +5,7 @@ ################################################### --> - GMSK + GMSK Modulator gr_gmskmod_bc from gnuradio import gr gr.gmskmod_bc($samples_per_symbol, $bt, $L) @@ -18,8 +18,8 @@ 3 dB Time-Bandwith Product bt - real 0.3 + real Pulse Duration (Symbols) -- cgit