diff options
Diffstat (limited to 'grc')
| -rw-r--r-- | grc/blocks/Makefile.am | 1 | ||||
| -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 | 6 | ||||
| -rw-r--r-- | grc/blocks/gr_burst_tagger.xml | 87 | ||||
| -rw-r--r-- | grc/blocks/gr_fft_filter_xxx.xml | 9 | ||||
| -rw-r--r-- | grc/blocks/gr_fft_vxx.xml | 11 | ||||
| -rw-r--r-- | grc/freedesktop/CMakeLists.txt | 4 | ||||
| -rwxr-xr-x | grc/scripts/gnuradio-companion | 13 |
9 files changed, 119 insertions, 76 deletions
diff --git a/grc/blocks/Makefile.am b/grc/blocks/Makefile.am index 020dcecdd..738e79f24 100644 --- a/grc/blocks/Makefile.am +++ b/grc/blocks/Makefile.am @@ -162,6 +162,7 @@ dist_ourdata_DATA = \ gr_stream_to_vector.xml \ gr_streams_to_stream.xml \ gr_streams_to_vector.xml \ + gr_burst_tagger.xml \ gr_sub_xx.xml \ gr_threshold_ff.xml \ gr_throttle.xml \ diff --git a/grc/blocks/blks2_cvsd_decode.xml b/grc/blocks/blks2_cvsd_decode.xml deleted file mode 100644 index 6be7daa22..000000000 --- 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 3123b1aa9..000000000 --- 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 183408cec..6c4cc0e88 100644 --- a/grc/blocks/block_tree.xml +++ b/grc/blocks/block_tree.xml @@ -104,6 +104,7 @@ <block>blks2_stream_to_vector_decimator</block> <block>gr_stream_mux</block> + <block>gr_burst_tagger</block> </cat> <cat> <name>Misc Conversions</name> @@ -224,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> diff --git a/grc/blocks/gr_burst_tagger.xml b/grc/blocks/gr_burst_tagger.xml new file mode 100644 index 000000000..58c909999 --- /dev/null +++ b/grc/blocks/gr_burst_tagger.xml @@ -0,0 +1,87 @@ +<?xml version="1.0"?> +<!-- +################################################### +##Burst tagger: +## all types, 1 output, 2 input: stream & trigger (short) +################################################### + --> +<block> + <name>Burst Tagger</name> + <key>gr_burst_tagger</key> + <import>from gnuradio import gr</import> + <make>gr.burst_tagger($type.size) +self.$(id).set_true_tag($true_key,$true_value) +self.$(id).set_false_tag($false_key,$false_value) + </make> + <callback>set_true_tag($true_key,$true_value)</callback> + <callback>set_false_tag($false_key,$false_value)</callback> + <param> + <name>Stream Type</name> + <key>type</key> + <type>enum</type> + <option> + <name>Complex</name> + <key>complex</key> + <opt>size:gr.sizeof_gr_complex</opt> + </option> + <option> + <name>Float</name> + <key>float</key> + <opt>size:gr.sizeof_float</opt> + </option> + <option> + <name>Int</name> + <key>int</key> + <opt>size:gr.sizeof_int</opt> + </option> + <option> + <name>Short</name> + <key>short</key> + <opt>size:gr.sizeof_short</opt> + </option> + <option> + <name>Byte</name> + <key>byte</key> + <opt>size:gr.sizeof_char</opt> + </option> + </param> + <param> + <name>True KeyID</name> + <key>true_key</key> + <value>burst</value> + <type>string</type> + </param> + <param> + <name>True Value</name> + <key>true_value</key> + <value>True</value> + <type>bool</type> + </param> + <param> + <name>False KeyID</name> + <key>false_key</key> + <value>burst</value> + <type>string</type> + </param> + <param> + <name>False Value</name> + <key>false_value</key> + <value>False</value> + <type>bool</type> + </param> + <sink> + <name>in</name> + <type>$type</type> + <vlen>1</vlen> + </sink> + <sink> + <name>trigger</name> + <type>short</type> + <vlen>1</vlen> + </sink> + <source> + <name>out</name> + <type>$type</type> + <vlen>1</vlen> + </source> +</block> diff --git a/grc/blocks/gr_fft_filter_xxx.xml b/grc/blocks/gr_fft_filter_xxx.xml index c1633094b..5b4cd83cc 100644 --- a/grc/blocks/gr_fft_filter_xxx.xml +++ b/grc/blocks/gr_fft_filter_xxx.xml @@ -9,8 +9,9 @@ <key>gr_fft_filter_xxx</key> <import>from gnuradio import gr</import> <import>from gnuradio.gr import firdes</import> - <make>gr.fft_filter_$(type)($decim, $taps)</make> + <make>gr.fft_filter_$(type)($decim, $taps, $nthreads)</make> <callback>set_taps($taps)</callback> + <callback>set_nthreads($nthreads)</callback> <param> <name>Type</name> <key>type</key> @@ -41,6 +42,12 @@ <key>taps</key> <type>$type.taps</type> </param> + <param> + <name>Num. Threads</name> + <key>nthreads</key> + <value>1</value> + <type>int</type> + </param> <sink> <name>in</name> <type>$type.input</type> diff --git a/grc/blocks/gr_fft_vxx.xml b/grc/blocks/gr_fft_vxx.xml index d398486ef..565354e41 100644 --- a/grc/blocks/gr_fft_vxx.xml +++ b/grc/blocks/gr_fft_vxx.xml @@ -10,10 +10,11 @@ <import>from gnuradio import gr</import> <import>from gnuradio import window</import> <make>#if $type() == "complex" -gr.fft_vcc($fft_size, $forward, $window, $shift) +gr.fft_vcc($fft_size, $forward, $window, $shift, $nthreads) #else -gr.fft_vfc($fft_size, $forward, $window) +gr.fft_vfc($fft_size, $forward, $window, $nthreads) #end if</make> + <callback>set_nthreads($nthreads)</callback> <param> <name>Input Type</name> <key>type</key> @@ -68,6 +69,12 @@ gr.fft_vfc($fft_size, $forward, $window) <key>False</key> </option> </param> + <param> + <name>Num. Threads</name> + <key>nthreads</key> + <value>1</value> + <type>int</type> + </param> <sink> <name>in</name> <type>$type</type> diff --git a/grc/freedesktop/CMakeLists.txt b/grc/freedesktop/CMakeLists.txt index 8c0f53d9f..492b0f7d8 100644 --- a/grc/freedesktop/CMakeLists.txt +++ b/grc/freedesktop/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2011 Free Software Foundation, Inc. +# Copyright 2011-2012 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -41,7 +41,7 @@ if(UNIX AND HAVE_XDG_UTILS) ${CMAKE_CURRENT_BINARY_DIR}/grc_setup_freedesktop @ONLY) install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/grc_setup_freedesktop + PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/grc_setup_freedesktop DESTINATION ${GR_PKG_LIBEXEC_DIR} COMPONENT "grc" ) endif(UNIX AND HAVE_XDG_UTILS) diff --git a/grc/scripts/gnuradio-companion b/grc/scripts/gnuradio-companion index a4115c39f..e76322b4d 100755 --- a/grc/scripts/gnuradio-companion +++ b/grc/scripts/gnuradio-companion @@ -1,6 +1,6 @@ #!/usr/bin/env python """ -Copyright 2009 Free Software Foundation, Inc. +Copyright 2009-2012 Free Software Foundation, Inc. This file is part of GNU Radio GNU Radio Companion is free software; you can redistribute it and/or @@ -25,7 +25,16 @@ import gtk try: from gnuradio import gr except ImportError, e: d = gtk.MessageDialog(type=gtk.MESSAGE_ERROR, buttons=gtk.BUTTONS_CLOSE, message_format=""" -Cannot import gnuradio. Are your PYTHONPATH and LD_LIBRARY_PATH set correctly?""") +Cannot import gnuradio. + +Is the python path environment variable set correctly? + All OS: PYTHONPATH + +Is the library path environment variable set correctly? + Linux: LD_LIBRARY_PATH + Windows: PATH + MacOSX: DYLD_LIBRARY_PATH +""") d.set_title(str(e)) d.run() exit(-1) |