diff options
| author | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-02-14 11:23:42 -0800 |
|---|---|---|
| committer | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-02-14 11:23:42 -0800 |
| commit | 37021a4c1393026de88725565ba23ebd6d0cc4d9 (patch) | |
| tree | 377408e3f782c0d02ae268165e61508a970df423 /grc | |
| parent | 32225905cb4fef7364668fffc16c808ac6c3bee8 (diff) | |
| parent | dc266ca38bdc59955f8c8d8a98291f078d7f4377 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'grc')
| -rw-r--r-- | grc/blocks/blks2_cvsd_decode.xml | 32 | ||||
| -rw-r--r-- | grc/blocks/blks2_cvsd_encode.xml | 32 | ||||
| -rw-r--r-- | grc/blocks/block_tree.xml | 5 |
3 files changed, 0 insertions, 69 deletions
diff --git a/grc/blocks/blks2_cvsd_decode.xml b/grc/blocks/blks2_cvsd_decode.xml deleted file mode 100644 index 6be7daa222..0000000000 --- a/grc/blocks/blks2_cvsd_decode.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0"?> -<!-- -################################################### -## CVSD Encoder -################################################### - --> -<block> - <name>CVSD Decoder</name> - <key>blks2_cvsd_decode</key> - <import>from gnuradio import blks2</import> - <make>blks2.cvsd_decode($resample,$bw)</make> - <param> - <name>Resample</name> - <key>resample</key> - <value>8</value> - <type>int</type> - </param> - <param> - <name>Frac. Bandwidth</name> - <key>bw</key> - <value>0.5</value> - <type>real</type> - </param> - <sink> - <name>in</name> - <type>byte</type> - </sink> - <source> - <name>out</name> - <type>float</type> - </source> -</block> diff --git a/grc/blocks/blks2_cvsd_encode.xml b/grc/blocks/blks2_cvsd_encode.xml deleted file mode 100644 index 3123b1aa9d..0000000000 --- a/grc/blocks/blks2_cvsd_encode.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0"?> -<!-- -################################################### -## CVSD Encoder -################################################### - --> -<block> - <name>CVSD Encoder</name> - <key>blks2_cvsd_encode</key> - <import>from gnuradio import blks2</import> - <make>blks2.cvsd_encode($resample,$bw)</make> - <param> - <name>Resample</name> - <key>resample</key> - <value>8</value> - <type>int</type> - </param> - <param> - <name>Frac. Bandwidth</name> - <key>bw</key> - <value>0.5</value> - <type>real</type> - </param> - <sink> - <name>in</name> - <type>float</type> - </sink> - <source> - <name>out</name> - <type>byte</type> - </source> -</block> diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml index abc12b97fc..6c4cc0e883 100644 --- a/grc/blocks/block_tree.xml +++ b/grc/blocks/block_tree.xml @@ -225,11 +225,6 @@ <block>gr_additive_scrambler_bb</block> </cat> <cat> - <name>Vocoders</name> - <block>blks2_cvsd_encode</block> - <block>blks2_cvsd_decode</block> - </cat> - <cat> <name>Probes</name> <block>gr_probe_avg_mag_sqrd_x</block> <block>gr_probe_density_b</block> |