From 6fcf521394ed256f4e75d52e986e63e38f2ec56b Mon Sep 17 00:00:00 2001
From: Tom Rondeau
Date: Mon, 17 Oct 2011 20:16:33 -0700
Subject: digital: adding OFDM GRC blocks to gr-digital.

---
 grc/blocks/Makefile.am          |   2 -
 grc/blocks/blks2_ofdm_demod.xml | 122 ------------------------------------
 grc/blocks/blks2_ofdm_mod.xml   | 135 ----------------------------------------
 grc/blocks/block_tree.xml       |   3 -
 4 files changed, 262 deletions(-)
 delete mode 100644 grc/blocks/blks2_ofdm_demod.xml
 delete mode 100644 grc/blocks/blks2_ofdm_mod.xml

(limited to 'grc')

diff --git a/grc/blocks/Makefile.am b/grc/blocks/Makefile.am
index 9813154bd..5fff38f1f 100644
--- a/grc/blocks/Makefile.am
+++ b/grc/blocks/Makefile.am
@@ -39,8 +39,6 @@ dist_ourdata_DATA = \
 	blks2_logpwrfft_x.xml \
 	blks2_nbfm_rx.xml \
 	blks2_nbfm_tx.xml \
-	blks2_ofdm_demod.xml \
-	blks2_ofdm_mod.xml \
 	blks2_packet_decoder.xml \
 	blks2_packet_encoder.xml \
 	blks2_pfb_arb_resampler.xml \
diff --git a/grc/blocks/blks2_ofdm_demod.xml b/grc/blocks/blks2_ofdm_demod.xml
deleted file mode 100644
index ac5ee4795..000000000
--- a/grc/blocks/blks2_ofdm_demod.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##OFDM Demod
-###################################################
- -->
-<block>
-	<name>OFDM Demod</name>
-	<key>blks2_ofdm_demod</key>
-	<import>from grc_gnuradio import blks2 as grc_blks2</import>
-	<import>from gnuradio import blks2</import>
-	<make>grc_blks2.packet_demod_$(type.fcn)(blks2.ofdm_demod(
-		options=grc_blks2.options(
-			modulation="$modulation",
-			fft_length=$fft_length,
-			occupied_tones=$occupied_tones,
-			cp_length=$cp_length,
-			snr=$snr,
-			log=None,
-			verbose=None,
-		),
-		callback=lambda ok, payload: self.$(id).recv_pkt(ok, payload),
-	),
-)</make>
-	<param>
-		<name>Output Type</name>
-		<key>type</key>
-		<value>float</value>
-		<type>enum</type>
-		<option>
-			<name>Complex</name>
-			<key>complex</key>
-			<opt>fcn:c</opt>
-		</option>
-		<option>
-			<name>Float</name>
-			<key>float</key>
-			<opt>fcn:f</opt>
-		</option>
-		<option>
-			<name>Int</name>
-			<key>int</key>
-			<opt>fcn:i</opt>
-		</option>
-		<option>
-			<name>Short</name>
-			<key>short</key>
-			<opt>fcn:s</opt>
-		</option>
-		<option>
-			<name>Byte</name>
-			<key>byte</key>
-			<opt>fcn:b</opt>
-		</option>
-	</param>
-	<param>
-		<name>Modulation</name>
-		<key>modulation</key>
-		<type>enum</type>
-		<option>
-			<name>BPSK</name>
-			<key>bpsk</key>
-		</option>
-		<option>
-			<name>QPSK</name>
-			<key>qpsk</key>
-		</option>
-		<option>
-			<name>8PSK</name>
-			<key>8psk</key>
-		</option>
-		<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>FFT Length</name>
-		<key>fft_length</key>
-		<value>512</value>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Occupied Tones</name>
-		<key>occupied_tones</key>
-		<value>200</value>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Cyclic Prefix Length</name>
-		<key>cp_length</key>
-		<value>128</value>
-		<type>int</type>
-	</param>
-	<param>
-		<name>SNR</name>
-		<key>snr</key>
-		<value>10</value>
-		<type>real</type>
-	</param>
-	<sink>
-		<name>in</name>
-		<type>complex</type>
-	</sink>
-	<source>
-		<name>out</name>
-		<type>$type</type>
-	</source>
-	<doc>Payload Length: 0 for automatic.</doc>
-</block>
diff --git a/grc/blocks/blks2_ofdm_mod.xml b/grc/blocks/blks2_ofdm_mod.xml
deleted file mode 100644
index 2c54d10f4..000000000
--- a/grc/blocks/blks2_ofdm_mod.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##OFDM Mod
-###################################################
- -->
-<block>
-	<name>OFDM Mod</name>
-	<key>blks2_ofdm_mod</key>
-	<import>from grc_gnuradio import blks2 as grc_blks2</import>
-	<import>from gnuradio import blks2</import>
-	<make>grc_blks2.packet_mod_$(type.fcn)(blks2.ofdm_mod(
-		options=grc_blks2.options(
-			modulation="$modulation",
-			fft_length=$fft_length,
-			occupied_tones=$occupied_tones,
-			cp_length=$cp_length,
-			pad_for_usrp=$pad_for_usrp,
-			log=None,
-			verbose=None,
-		),
-	),
-	payload_length=$payload_length,
-)</make>
-	<param>
-		<name>Input Type</name>
-		<key>type</key>
-		<value>float</value>
-		<type>enum</type>
-		<option>
-			<name>Complex</name>
-			<key>complex</key>
-			<opt>fcn:c</opt>
-		</option>
-		<option>
-			<name>Float</name>
-			<key>float</key>
-			<opt>fcn:f</opt>
-		</option>
-		<option>
-			<name>Int</name>
-			<key>int</key>
-			<opt>fcn:i</opt>
-		</option>
-		<option>
-			<name>Short</name>
-			<key>short</key>
-			<opt>fcn:s</opt>
-		</option>
-		<option>
-			<name>Byte</name>
-			<key>byte</key>
-			<opt>fcn:b</opt>
-		</option>
-	</param>
-	<param>
-		<name>Modulation</name>
-		<key>modulation</key>
-		<type>enum</type>
-		<option>
-			<name>BPSK</name>
-			<key>bpsk</key>
-		</option>
-		<option>
-			<name>QPSK</name>
-			<key>qpsk</key>
-		</option>
-		<option>
-			<name>8PSK</name>
-			<key>8psk</key>
-		</option>
-		<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>FFT Length</name>
-		<key>fft_length</key>
-		<value>512</value>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Occupied Tones</name>
-		<key>occupied_tones</key>
-		<value>200</value>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Cyclic Prefix Length</name>
-		<key>cp_length</key>
-		<value>128</value>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Pad for USRP</name>
-		<key>pad_for_usrp</key>
-		<type>enum</type>
-		<option>
-			<name>Yes</name>
-			<key>True</key>
-		</option>
-		<option>
-			<name>No</name>
-			<key>False</key>
-		</option>
-	</param>
-	<param>
-		<name>Payload Length</name>
-		<key>payload_length</key>
-		<value>0</value>
-		<type>int</type>
-	</param>
-	<sink>
-		<name>in</name>
-		<type>$type</type>
-	</sink>
-	<source>
-		<name>out</name>
-		<type>complex</type>
-	</source>
-	<doc>Payload Length: 0 for automatic.</doc>
-</block>
diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml
index ea7d744d4..a7a90c4ac 100644
--- a/grc/blocks/block_tree.xml
+++ b/grc/blocks/block_tree.xml
@@ -215,9 +215,6 @@
 
 		<block>blks2_qamx_mod</block>
 		<block>blks2_qamx_demod</block>
-
-		<block>blks2_ofdm_mod</block>
-		<block>blks2_ofdm_demod</block>
 	</cat>
 	<cat>
 		<name>Error Correction</name>
-- 
cgit