diff options
| -rw-r--r-- | gr-digital/digital_gmsk_demod.xml (renamed from grc/blocks/blks2_gmsk_demod.xml) | 6 | ||||
| -rw-r--r-- | gr-digital/digital_gmsk_mod.xml (renamed from grc/blocks/blks2_gmsk_mod.xml) | 6 | ||||
| -rw-r--r-- | gr-digital/digital_gmskmod_bc.xml (renamed from grc/blocks/gr_gmskmod_bc.xml) | 6 | ||||
| -rw-r--r-- | gr-digital/grc/digital_block_tree.xml | 4 | ||||
| -rw-r--r-- | gr-digital/grc/digital_cpmmod_bc.xml (renamed from grc/blocks/gr_cpmmod_bc.xml) | 6 | ||||
| -rw-r--r-- | grc/blocks/Makefile.am | 6 | ||||
| -rw-r--r-- | grc/blocks/blks2_qamx_demod.xml | 131 | ||||
| -rw-r--r-- | grc/blocks/blks2_qamx_mod.xml | 103 | ||||
| -rw-r--r-- | grc/blocks/block_tree.xml | 8 |
9 files changed, 16 insertions, 260 deletions
diff --git a/grc/blocks/blks2_gmsk_demod.xml b/gr-digital/digital_gmsk_demod.xml index 13ecb3344..a7ae5881f 100644 --- a/grc/blocks/blks2_gmsk_demod.xml +++ b/gr-digital/digital_gmsk_demod.xml @@ -6,9 +6,9 @@ --> <block> <name>GMSK Demod</name> - <key>blks2_gmsk_demod</key> - <import>from gnuradio import blks2</import> - <make>blks2.gmsk_demod( + <key>digtial_gmsk_demod</key> + <import>from gnuradio import digital</import> + <make>digital.gmsk_demod( samples_per_symbol=$samples_per_symbol, gain_mu=$gain_mu, mu=$mu, diff --git a/grc/blocks/blks2_gmsk_mod.xml b/gr-digital/digital_gmsk_mod.xml index e80264f11..ede76808a 100644 --- a/grc/blocks/blks2_gmsk_mod.xml +++ b/gr-digital/digital_gmsk_mod.xml @@ -6,9 +6,9 @@ --> <block> <name>GMSK Mod</name> - <key>blks2_gmsk_mod</key> - <import>from gnuradio import blks2</import> - <make>blks2.gmsk_mod( + <key>digital_gmsk_mod</key> + <import>from gnuradio import digital</import> + <make>digital.gmsk_mod( samples_per_symbol=$samples_per_symbol, bt=$bt, verbose=$verbose, diff --git a/grc/blocks/gr_gmskmod_bc.xml b/gr-digital/digital_gmskmod_bc.xml index 82e47452b..a44afe798 100644 --- a/grc/blocks/gr_gmskmod_bc.xml +++ b/gr-digital/digital_gmskmod_bc.xml @@ -6,9 +6,9 @@ --> <block> <name>GMSK Modulator</name> - <key>gr_gmskmod_bc</key> - <import>from gnuradio import gr</import> - <make>gr.gmskmod_bc($samples_per_symbol, $bt, $L)</make> + <key>digital_gmskmod_bc</key> + <import>from gnuradio import digital</import> + <make>digital.gmskmod_bc($samples_per_symbol, $bt, $L)</make> <param> <name>Samples/Symbol</name> <key>samples_per_symbol</key> diff --git a/gr-digital/grc/digital_block_tree.xml b/gr-digital/grc/digital_block_tree.xml index 816df7f45..84151c190 100644 --- a/gr-digital/grc/digital_block_tree.xml +++ b/gr-digital/grc/digital_block_tree.xml @@ -49,6 +49,10 @@ <block>digital_psk_demod</block> <block>digital_qam_mod</block> <block>digital_qam_demod</block> + <block>digital_gmskmod_bc</block> + <block>digital_cpmmod_bc</block> + <block>digital_gmsk_mod</block> + <block>digital_gmsk_demod</block> </cat> <cat> <name>OFDM</name> diff --git a/grc/blocks/gr_cpmmod_bc.xml b/gr-digital/grc/digital_cpmmod_bc.xml index da405534e..01174ef80 100644 --- a/grc/blocks/gr_cpmmod_bc.xml +++ b/gr-digital/grc/digital_cpmmod_bc.xml @@ -6,9 +6,9 @@ --> <block> <name>Continuous Phase Modulation</name> - <key>gr_cpmmod_bc</key> - <import>from gnuradio import gr</import> - <make>gr.cpmmod_bc($type, $mod_index, $samples_per_symbol, $L, $beta)</make> + <key>digital_cpmmod_bc</key> + <import>from gnuradio import gr, digital</import> + <make>digital.cpmmod_bc($type, $mod_index, $samples_per_symbol, $L, $beta)</make> <param> <name>CPM Type</name> <key>type</key> 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_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 @@ -<?xml version="1.0"?> -<!-- -################################################### -##QAM Demod - 8, 16, 64, 256 -################################################### - --> -<block> - <name>QAM Demod</name> - <key>blks2_qamx_demod</key> - <import>from gnuradio import blks2</import> - <make>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, -)</make> - <param> - <name>Type</name> - <key>type</key> - <type>enum</type> - <option> - <name>QAM8</name> - <key>qam8</key> - </option> - <option> - <name>QAM16</name> - <key>qam16</key> - </option> - <option> - <name>QAM64</name> - <key>qam64</key> - </option> - <option> - <name>QAM256</name> - <key>qam256</key> - </option> - </param> - <param> - <name>Samples/Symbol</name> - <key>samples_per_symbol</key> - <value>2</value> - <type>int</type> - </param> - <param> - <name>Excess BW</name> - <key>excess_bw</key> - <value>0.35</value> - <type>real</type> - </param> - <param> - <name>Costas Alpha</name> - <key>costas_alpha</key> - <value>0.175</value> - <type>real</type> - </param> - <param> - <name>Gain Mu</name> - <key>gain_mu</key> - <value>0.03</value> - <type>real</type> - </param> - <param> - <name>Mu</name> - <key>mu</key> - <value>0.05</value> - <type>real</type> - </param> - <param> - <name>Omega Relative Limit</name> - <key>omega_relative_limit</key> - <value>0.005</value> - <type>real</type> - </param> - <param> - <name>Gray Code</name> - <key>gray_code</key> - <value>True</value> - <type>enum</type> - <option> - <name>Yes</name> - <key>True</key> - </option> - <option> - <name>No</name> - <key>False</key> - </option> - </param> - <param> - <name>Verbose</name> - <key>verbose</key> - <value>False</value> - <type>bool</type> - <hide>#if str($verbose) == 'False' then 'part' else 'none'#</hide> - <option> - <name>On</name> - <key>True</key> - </option> - <option> - <name>Off</name> - <key>False</key> - </option> - </param> - <param> - <name>Logging</name> - <key>log</key> - <value>False</value> - <type>bool</type> - <hide>#if str($log) == 'False' then 'part' else 'none'#</hide> - <option> - <name>On</name> - <key>True</key> - </option> - <option> - <name>Off</name> - <key>False</key> - </option> - </param> - <sink> - <name>in</name> - <type>complex</type> - </sink> - <source> - <name>out</name> - <type>byte</type> - </source> -</block> 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 @@ -<?xml version="1.0"?> -<!-- -################################################### -##QAM Mod - 8, 16, 64, 256 -################################################### - --> -<block> - <name>QAM Mod</name> - <key>blks2_qamx_mod</key> - <import>from gnuradio import blks2</import> - <make>blks2.$(type)_mod( - samples_per_symbol=$samples_per_symbol, - excess_bw=$excess_bw, - gray_code=$gray_code, - verbose=$verbose, - log=$log, -)</make> - <param> - <name>Type</name> - <key>type</key> - <type>enum</type> - <option> - <name>QAM8</name> - <key>qam8</key> - </option> - <option> - <name>QAM16</name> - <key>qam16</key> - </option> - <option> - <name>QAM64</name> - <key>qam64</key> - </option> - <option> - <name>QAM256</name> - <key>qam256</key> - </option> - </param> - <param> - <name>Samples/Symbol</name> - <key>samples_per_symbol</key> - <value>2</value> - <type>int</type> - </param> - <param> - <name>Excess BW</name> - <key>excess_bw</key> - <value>0.35</value> - <type>real</type> - </param> - <param> - <name>Gray Code</name> - <key>gray_code</key> - <value>True</value> - <type>enum</type> - <option> - <name>Yes</name> - <key>True</key> - </option> - <option> - <name>No</name> - <key>False</key> - </option> - </param> - <param> - <name>Verbose</name> - <key>verbose</key> - <value>False</value> - <type>bool</type> - <hide>#if str($verbose) == 'False' then 'part' else 'none'#</hide> - <option> - <name>On</name> - <key>True</key> - </option> - <option> - <name>Off</name> - <key>False</key> - </option> - </param> - <param> - <name>Logging</name> - <key>log</key> - <value>False</value> - <type>bool</type> - <hide>#if str($log) == 'False' then 'part' else 'none'#</hide> - <option> - <name>On</name> - <key>True</key> - </option> - <option> - <name>Off</name> - <key>False</key> - </option> - </param> - <sink> - <name>in</name> - <type>byte</type> - </sink> - <source> - <name>out</name> - <type>complex</type> - </source> -</block> 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 @@ <block>gr_phase_modulator_fc</block> <block>gr_quadrature_demod_cf</block> <block>gr_cpfsk_bc</block> - <block>gr_cpmmod_bc</block> - <block>gr_gmskmod_bc</block> <block>gr_diff_phasor_cc</block> @@ -209,12 +207,6 @@ <block>blks2_fm_demod_cf</block> <block>blks2_fm_deemph</block> <block>blks2_fm_preemph</block> - - <block>blks2_gmsk_mod</block> - <block>blks2_gmsk_demod</block> - - <block>blks2_qamx_mod</block> - <block>blks2_qamx_demod</block> </cat> <cat> <name>Error Correction</name> |