summaryrefslogtreecommitdiff
path: root/grc
diff options
context:
space:
mode:
Diffstat (limited to 'grc')
-rw-r--r--grc/blocks/block_tree.xml17
-rw-r--r--grc/blocks/gr_message_burst_source.xml58
-rw-r--r--grc/blocks/gr_message_debug.xml27
-rw-r--r--grc/blocks/gr_message_sink.xml72
-rw-r--r--grc/blocks/gr_message_source.xml58
-rw-r--r--grc/blocks/gr_message_strobe.xml35
-rw-r--r--grc/blocks/gr_moving_average_xx.xml68
-rw-r--r--grc/blocks/gr_peak_detector_xb.xml64
-rw-r--r--grc/grc_gnuradio/blks2/error_rate.py8
-rw-r--r--grc/grc_gnuradio/blks2/packet.py9
10 files changed, 9 insertions, 407 deletions
diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml
index f7e69c947f..61455b9861 100644
--- a/grc/blocks/block_tree.xml
+++ b/grc/blocks/block_tree.xml
@@ -15,8 +15,6 @@
<block>blks2_tcp_source</block>
<block>gr_udp_source</block>
<block>gr_wavfile_source</block>
- <block>gr_message_source</block>
- <block>gr_message_burst_source</block>
<block>pad_source</block>
<block>virtual_source</block>
</cat>
@@ -28,16 +26,10 @@
<block>blks2_tcp_sink</block>
<block>gr_udp_sink</block>
<block>gr_wavfile_sink</block>
- <block>gr_message_sink</block>
<block>pad_sink</block>
<block>virtual_sink</block>
<block>gr_tag_debug</block>
</cat>
- <cat>
- <name>Message Tools</name>
- <block>gr_message_debug</block>
- <block>gr_message_strobe</block>
- </cat>
<cat>
<name>Operators</name>
<block>gr_vector_insert_x</block>
@@ -68,15 +60,6 @@
<block>blks2_packet_encoder</block>
</cat>
<cat>
- <name>Level Controls</name>
- <block>gr_peak_detector_xb</block>
- </cat>
- <cat>
- <name>Filters</name>
- <!-- Other filters -->
- <block>gr_moving_average_xx</block>
- </cat>
- <cat>
<name>Modulators</name>
<block>gr_vco_f</block>
</cat>
diff --git a/grc/blocks/gr_message_burst_source.xml b/grc/blocks/gr_message_burst_source.xml
deleted file mode 100644
index e835d2a2ce..0000000000
--- a/grc/blocks/gr_message_burst_source.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##Message Burst Source (the sink port is a message)
-###################################################
- -->
-<block>
- <name>Message Burst Source</name>
- <key>gr_message_burst_source</key>
- <import>from gnuradio import gr</import>
- <make>gr.message_burst_source($type.size*$vlen, $(id)_msgq_in)</make>
- <param>
- <name>Output 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>Vec Length</name>
- <key>vlen</key>
- <value>1</value>
- <type>int</type>
- </param>
- <check>$vlen &gt; 0</check>
- <sink>
- <name>in</name>
- <type>msg</type>
- </sink>
- <source>
- <name>out</name>
- <type>$type</type>
- <vlen>$vlen</vlen>
- </source>
-</block>
diff --git a/grc/blocks/gr_message_debug.xml b/grc/blocks/gr_message_debug.xml
deleted file mode 100644
index 964f957569..0000000000
--- a/grc/blocks/gr_message_debug.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##Message Debug
-###################################################
- -->
-<block>
- <name>Message Debug</name>
- <key>gr_message_debug</key>
- <import>from gnuradio import gr</import>
- <make>gr.message_debug()</make>
- <sink>
- <name>print</name>
- <type>message</type>
- <optional>1</optional>
- </sink>
- <sink>
- <name>store</name>
- <type>message</type>
- <optional>1</optional>
- </sink>
- <sink>
- <name>print_pdu</name>
- <type>message</type>
- <optional>1</optional>
- </sink>
-</block>
diff --git a/grc/blocks/gr_message_sink.xml b/grc/blocks/gr_message_sink.xml
deleted file mode 100644
index 18e92adb97..0000000000
--- a/grc/blocks/gr_message_sink.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##Message Sink (the source port is a message)
-###################################################
- -->
-<block>
- <name>Message Sink</name>
- <key>gr_message_sink</key>
- <import>from gnuradio import gr</import>
- <make>gr.message_sink($type.size*$vlen, $(id)_msgq_out, $dont_block)</make>
- <param>
- <name>Input 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>Don't Block</name>
- <key>dont_block</key>
- <value>False</value>
- <type>enum</type>
- <option>
- <name>Don't Block</name>
- <key>True</key>
- </option>
- <option>
- <name>Block</name>
- <key>False</key>
- </option>
- </param>
- <param>
- <name>Vec Length</name>
- <key>vlen</key>
- <value>1</value>
- <type>int</type>
- </param>
- <check>$vlen &gt; 0</check>
- <sink>
- <name>in</name>
- <type>$type</type>
- <vlen>$vlen</vlen>
- </sink>
- <source>
- <name>out</name>
- <type>msg</type>
- </source>
-</block>
diff --git a/grc/blocks/gr_message_source.xml b/grc/blocks/gr_message_source.xml
deleted file mode 100644
index 72367b21b0..0000000000
--- a/grc/blocks/gr_message_source.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##Message Source (the sink port is a message)
-###################################################
- -->
-<block>
- <name>Message Source</name>
- <key>gr_message_source</key>
- <import>from gnuradio import gr</import>
- <make>gr.message_source($type.size*$vlen, $(id)_msgq_in)</make>
- <param>
- <name>Output 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>Vec Length</name>
- <key>vlen</key>
- <value>1</value>
- <type>int</type>
- </param>
- <check>$vlen &gt; 0</check>
- <sink>
- <name>in</name>
- <type>msg</type>
- </sink>
- <source>
- <name>out</name>
- <type>$type</type>
- <vlen>$vlen</vlen>
- </source>
-</block>
diff --git a/grc/blocks/gr_message_strobe.xml b/grc/blocks/gr_message_strobe.xml
deleted file mode 100644
index 067d345c8e..0000000000
--- a/grc/blocks/gr_message_strobe.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##Message Strobe
-###################################################
- -->
-<block>
- <name>Message Strobe</name>
- <key>gr_message_strobe</key>
- <import>from gnuradio import gr</import>
- <import>from gruel import pmt</import>
- <make>gr.message_strobe($msg, $period)</make>
- <param>
- <name>Message PMT</name>
- <key>msg</key>
- <value>pmt.intern("TEST")</value>
- <type>raw</type>
- </param>
- <param>
- <name>Period (ms)</name>
- <key>period</key>
- <value>1000</value>
- <type>real</type>
- </param>
- <sink>
- <name>set_msg</name>
- <type>message</type>
- <optional>1</optional>
- </sink>
- <source>
- <name>strobe</name>
- <type>message</type>
- <optional>1</optional>
- </source>
-</block>
diff --git a/grc/blocks/gr_moving_average_xx.xml b/grc/blocks/gr_moving_average_xx.xml
deleted file mode 100644
index b70943c785..0000000000
--- a/grc/blocks/gr_moving_average_xx.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##Moving Average
-###################################################
- -->
-<block>
- <name>Moving Average</name>
- <key>gr_moving_average_xx</key>
- <import>from gnuradio import gr</import>
- <make>gr.moving_average_$(type.fcn)($length, $scale, $max_iter)</make>
- <callback>set_length_and_scale($length, $scale)</callback>
- <param>
- <name>Type</name>
- <key>type</key>
- <type>enum</type>
- <option>
- <name>Complex</name>
- <key>complex</key>
- <opt>fcn:cc</opt>
- <opt>scale:complex</opt>
- </option>
- <option>
- <name>Float</name>
- <key>float</key>
- <opt>fcn:ff</opt>
- <opt>scale:real</opt>
- </option>
- <option>
- <name>Int</name>
- <key>int</key>
- <opt>fcn:ii</opt>
- <opt>scale:int</opt>
- </option>
- <option>
- <name>Short</name>
- <key>short</key>
- <opt>fcn:ss</opt>
- <opt>scale:int</opt>
- </option>
- </param>
- <param>
- <name>Length</name>
- <key>length</key>
- <value>1000</value>
- <type>int</type>
- </param>
- <param>
- <name>Scale</name>
- <key>scale</key>
- <value>1</value>
- <type>$type.scale</type>
- </param>
- <param>
- <name>Max Iter</name>
- <key>max_iter</key>
- <value>4000</value>
- <type>int</type>
- </param>
- <sink>
- <name>in</name>
- <type>$type</type>
- </sink>
- <source>
- <name>out</name>
- <type>$type</type>
- </source>
-</block>
diff --git a/grc/blocks/gr_peak_detector_xb.xml b/grc/blocks/gr_peak_detector_xb.xml
deleted file mode 100644
index 394b0697f8..0000000000
--- a/grc/blocks/gr_peak_detector_xb.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##Peak Detector
-###################################################
- -->
-<block>
- <name>Peak Detector</name>
- <key>gr_peak_detector_xb</key>
- <import>from gnuradio import gr</import>
- <make>gr.peak_detector_$(type.fcn)b($threshold_factor_rise, $threshold_factor_fall, $look_ahead, $alpha)</make>
- <callback>set_threshold_factor_rise($threshold_factor_rise)</callback>
- <callback>set_threshold_factor_fall($threshold_factor_fall)</callback>
- <callback>set_look_ahead($look_ahead)</callback>
- <callback>set_alpha($alpha)</callback>
- <param>
- <name>Input Type</name>
- <key>type</key>
- <type>enum</type>
- <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>
- </param>
- <param>
- <name>TH Factor Rise</name>
- <key>threshold_factor_rise</key>
- <type>real</type>
- </param>
- <param>
- <name>TH Factor Fall</name>
- <key>threshold_factor_fall</key>
- <type>real</type>
- </param>
- <param>
- <name>Look Ahead</name>
- <key>look_ahead</key>
- <type>int</type>
- </param>
- <param>
- <name>Alpha</name>
- <key>alpha</key>
- <type>real</type>
- </param>
- <sink>
- <name>in</name>
- <type>$type</type>
- </sink>
- <source>
- <name>out</name>
- <type>byte</type>
- </source>
-</block>
diff --git a/grc/grc_gnuradio/blks2/error_rate.py b/grc/grc_gnuradio/blks2/error_rate.py
index 7f53f7af65..7970f29bae 100644
--- a/grc/grc_gnuradio/blks2/error_rate.py
+++ b/grc/grc_gnuradio/blks2/error_rate.py
@@ -79,10 +79,10 @@ class error_rate(gr.hier_block2):
self._max_samples = win_size
self._bits_per_symbol = bits_per_symbol
#setup message queue
- msg_source = gr.message_source(gr.sizeof_float, 1)
+ msg_source = blocks.message_source(gr.sizeof_float, 1)
self._msgq_source = msg_source.msgq()
msgq_sink = gr.msg_queue(2)
- msg_sink = gr.message_sink(gr.sizeof_char, msgq_sink, False) #False -> blocking
+ msg_sink = blocks.message_sink(gr.sizeof_char, msgq_sink, False) #False -> blocking
inter = blocks.interleave(gr.sizeof_char)
#start thread
self._num_errs = 0
@@ -113,7 +113,7 @@ class error_rate(gr.hier_block2):
#write sample
arr[i] = float(self._num_errs)/float(self._num_samps*self._bits_per_symbol)
#write message
- msg = gr.message_from_string(arr.tostring(), 0, gr.sizeof_float, num)
+ msg = blocks.message_from_string(arr.tostring(), 0, gr.sizeof_float, num)
self._msgq_source.insert_tail(msg)
def _handler_ser(self, samples):
@@ -136,5 +136,5 @@ class error_rate(gr.hier_block2):
#write sample
arr[i] = float(self._num_errs)/float(self._num_samps)
#write message
- msg = gr.message_from_string(arr.tostring(), 0, gr.sizeof_float, num)
+ msg = blocks.message_from_string(arr.tostring(), 0, gr.sizeof_float, num)
self._msgq_source.insert_tail(msg)
diff --git a/grc/grc_gnuradio/blks2/packet.py b/grc/grc_gnuradio/blks2/packet.py
index cceb4da650..eeadfb4a60 100644
--- a/grc/grc_gnuradio/blks2/packet.py
+++ b/grc/grc_gnuradio/blks2/packet.py
@@ -19,6 +19,7 @@
#
from gnuradio import gr, digital
+from gnuradio import blocks
from gnuradio.digital import packet_utils
import gnuradio.gr.gr_threading as _threading
@@ -89,7 +90,7 @@ class packet_encoder(gr.hier_block2):
self._access_code = access_code
self._pad_for_usrp = pad_for_usrp
#create blocks
- msg_source = gr.message_source(gr.sizeof_char, DEFAULT_MSGQ_LIMIT)
+ msg_source = blocks.message_source(gr.sizeof_char, DEFAULT_MSGQ_LIMIT)
self._msgq_out = msg_source.msgq()
#initialize hier2
gr.hier_block2.__init__(
@@ -199,7 +200,7 @@ class packet_mod_base(gr.hier_block2):
)
#create blocks
msgq = gr.msg_queue(DEFAULT_MSGQ_LIMIT)
- msg_sink = gr.message_sink(self._item_size_in, msgq, False) #False -> blocking
+ msg_sink = blocks.message_sink(self._item_size_in, msgq, False) #False -> blocking
#connect
self.connect(self, msg_sink)
self.connect(packet_source, self)
@@ -229,7 +230,7 @@ class packet_demod_base(gr.hier_block2):
gr.io_signature(1, 1, self._item_size_out) # Output signature
)
#create blocks
- msg_source = gr.message_source(self._item_size_out, DEFAULT_MSGQ_LIMIT)
+ msg_source = blocks.message_source(self._item_size_out, DEFAULT_MSGQ_LIMIT)
self._msgq_out = msg_source.msgq()
#connect
self.connect(self, packet_sink)
@@ -238,7 +239,7 @@ class packet_demod_base(gr.hier_block2):
self.connect(packet_sink, gr.null_sink(packet_sink._hb.output_signature().sizeof_stream_item(0)))
def recv_pkt(self, ok, payload):
- msg = gr.message_from_string(payload, 0, self._item_size_out, len(payload)/self._item_size_out)
+ msg = blocks.message_from_string(payload, 0, self._item_size_out, len(payload)/self._item_size_out)
if ok: self._msgq_out.insert_tail(msg)
class packet_demod_b(packet_demod_base): _item_size_out = gr.sizeof_char
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-26 02:04:11 +0000