grc: fixing grc blocks not properly moved in to digital.

8 files changed, 0 insertions, 510 deletions

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 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##GMSK Demod
-###################################################
- -->
-<block>
-	<name>GMSK Demod</name>
-	<key>blks2_gmsk_demod</key>
-	<import>from gnuradio import blks2</import>
-	<make>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,
-)</make>
-	<param>
-		<name>Samples/Symbol</name>
-		<key>samples_per_symbol</key>
-		<value>2</value>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Gain Mu</name>
-		<key>gain_mu</key>
-		<value>0.175</value>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Mu</name>
-		<key>mu</key>
-		<value>0.5</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>Freq Error</name>
-		<key>freq_error</key>
-		<value>0.0</value>
-		<type>real</type>
-	</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_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 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##GMSK Mod
-###################################################
- -->
-<block>
-	<name>GMSK Mod</name>
-	<key>blks2_gmsk_mod</key>
-	<import>from gnuradio import blks2</import>
-	<make>blks2.gmsk_mod(
-	samples_per_symbol=$samples_per_symbol,
-	bt=$bt,
-	verbose=$verbose,
-	log=$log,
-)</make>
-	<param>
-		<name>Samples/Symbol</name>
-		<key>samples_per_symbol</key>
-		<value>2</value>
-		<type>int</type>
-	</param>
-	<param>
-		<name>BT</name>
-		<key>bt</key>
-		<value>0.35</value>
-		<type>real</type>
-	</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/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>
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 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-## Continuous Phase Modulation
-###################################################
- -->
-<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>
-	<param>
-		<name>CPM Type</name>
-		<key>type</key>
-		<type>enum</type>
-		<option>
-			<name>L-REC (Rectangular phase response)</name>
-			<key>gr.cpm.LREC</key>
-		</option>
-		<option>
-			<name>L-RC (Raised Cosine)</name>
-			<key>gr.cpm.LRC</key>
-		</option>
-		<option>
-			<name>L-SRC (Spectral raised cosine)</name>
-			<key>gr.cpm.LSRC</key>
-		</option>
-		<option>
-			<name>TFM (Tamed frequency modulation)</name>
-			<key>gr.cpm.TFM</key>
-		</option>
-		<option>
-			<name>Gaussian</name>
-			<key>gr.cpm.GAUSSIAN</key>
-		</option>
-	</param>
-	<param>
-		<name>Modulation Index</name>
-		<key>mod_index</key>
-		<value>0.5</value>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Samples/Symbol</name>
-		<key>samples_per_symbol</key>
-		<value>4</value>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Pulse Duration (Symbols)</name>
-		<key>L</key>
-		<value>4</value>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Phase Response Parameter (BT or Beta)</name>
-		<key>beta</key>
-		<value>0.3</value>
-		<type>real</type>
-	</param>
-	<sink>
-		<name>in</name>
-		<type>byte</type>
-	</sink>
-	<source>
-		<name>out</name>
-		<type>complex</type>
-	</source>
-</block>
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 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-## GMSK
-###################################################
- -->
-<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>
-	<param>
-		<name>Samples/Symbol</name>
-		<key>samples_per_symbol</key>
-		<value>2</value>
-		<type>int</type>
-	</param>
-	<param>
-		<name>3 dB Time-Bandwith Product</name>
-		<key>bt</key>
-		<value>0.3</value>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Pulse Duration (Symbols)</name>
-		<key>L</key>
-		<value>4</value>
-		<type>int</type>
-	</param>
-	<sink>
-		<name>in</name>
-		<type>byte</type>
-	</sink>
-	<source>
-		<name>out</name>
-		<type>complex</type>
-	</source>
-</block>