diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-08-16 09:02:24 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-08-16 09:02:24 -0700 |
| commit | 78047bd03eac5d7a14948e98631e16ee77a9d6f7 (patch) | |
| tree | e460e4ff5380d98b944f4fffea02f1d3b9130453 /gr-blocks | |
| parent | 48e504327cbd0b8eca1b65ca67d1522f969bc142 (diff) | |
| parent | f3bc21930622df02f3fc17cbdb620924d80e1bb4 (diff) | |
Merge remote-tracking branch 'jgilbert/pdu_setters'
Diffstat (limited to 'gr-blocks')
| -rw-r--r-- | gr-blocks/grc/blocks_pdu_filter.xml | 5 | ||||
| -rw-r--r-- | gr-blocks/grc/blocks_pdu_remove.xml | 1 | ||||
| -rw-r--r-- | gr-blocks/grc/blocks_pdu_set.xml | 2 | ||||
| -rw-r--r-- | gr-blocks/include/gnuradio/blocks/pdu_filter.h | 3 | ||||
| -rw-r--r-- | gr-blocks/include/gnuradio/blocks/pdu_remove.h | 1 | ||||
| -rw-r--r-- | gr-blocks/include/gnuradio/blocks/pdu_set.h | 2 | ||||
| -rw-r--r-- | gr-blocks/lib/pdu_filter_impl.h | 3 | ||||
| -rw-r--r-- | gr-blocks/lib/pdu_remove_impl.h | 1 | ||||
| -rw-r--r-- | gr-blocks/lib/pdu_set_impl.h | 2 |
9 files changed, 19 insertions, 1 deletions
diff --git a/gr-blocks/grc/blocks_pdu_filter.xml b/gr-blocks/grc/blocks_pdu_filter.xml index 1fb720950..0e848963d 100644 --- a/gr-blocks/grc/blocks_pdu_filter.xml +++ b/gr-blocks/grc/blocks_pdu_filter.xml @@ -10,6 +10,9 @@ <import>from gnuradio import blocks</import> <import>import pmt</import> <make>blocks.pdu_filter($k, $v, $invert)</make> + <callback>set_key($k)</callback> + <callback>set_val($v)</callback> + <callback>set_inversion($invert)</callback> <param> <name>Key</name> <key>k</key> @@ -26,7 +29,7 @@ <name>Invert Filter</name> <key>invert</key> <value>False</value> - <type>enum</type> + <type>bool</type> <option> <name>No</name> <key>False</key> diff --git a/gr-blocks/grc/blocks_pdu_remove.xml b/gr-blocks/grc/blocks_pdu_remove.xml index ad99445e1..c71da32fc 100644 --- a/gr-blocks/grc/blocks_pdu_remove.xml +++ b/gr-blocks/grc/blocks_pdu_remove.xml @@ -10,6 +10,7 @@ <import>from gnuradio import blocks</import> <import>import pmt</import> <make>blocks.pdu_remove($k)</make> + <callback>set_key($k)</callback> <param> <name>Key</name> <key>k</key> diff --git a/gr-blocks/grc/blocks_pdu_set.xml b/gr-blocks/grc/blocks_pdu_set.xml index 1e7157fa8..b7a903062 100644 --- a/gr-blocks/grc/blocks_pdu_set.xml +++ b/gr-blocks/grc/blocks_pdu_set.xml @@ -10,6 +10,8 @@ <import>from gnuradio import blocks</import> <import>import pmt</import> <make>blocks.pdu_set($k, $v)</make> + <callback>set_key($k)</callback> + <callback>set_val($v)</callback> <param> <name>Key</name> <key>k</key> diff --git a/gr-blocks/include/gnuradio/blocks/pdu_filter.h b/gr-blocks/include/gnuradio/blocks/pdu_filter.h index 148373104..25dd18593 100644 --- a/gr-blocks/include/gnuradio/blocks/pdu_filter.h +++ b/gr-blocks/include/gnuradio/blocks/pdu_filter.h @@ -44,6 +44,9 @@ namespace gr { * \brief Construct a PDU filter */ static sptr make(pmt::pmt_t k, pmt::pmt_t v, bool invert = false); + virtual void set_key(pmt::pmt_t key) = 0; + virtual void set_val(pmt::pmt_t val) = 0; + virtual void set_inversion(bool invert) = 0; }; } /* namespace blocks */ diff --git a/gr-blocks/include/gnuradio/blocks/pdu_remove.h b/gr-blocks/include/gnuradio/blocks/pdu_remove.h index 9b8a087e9..f2ab35f7c 100644 --- a/gr-blocks/include/gnuradio/blocks/pdu_remove.h +++ b/gr-blocks/include/gnuradio/blocks/pdu_remove.h @@ -44,6 +44,7 @@ namespace gr { * \brief Construct a PDU meta remove block */ static sptr make(pmt::pmt_t k); + virtual void set_key(pmt::pmt_t key) = 0; }; } /* namespace blocks */ diff --git a/gr-blocks/include/gnuradio/blocks/pdu_set.h b/gr-blocks/include/gnuradio/blocks/pdu_set.h index cfafc44bd..ba96492b6 100644 --- a/gr-blocks/include/gnuradio/blocks/pdu_set.h +++ b/gr-blocks/include/gnuradio/blocks/pdu_set.h @@ -44,6 +44,8 @@ namespace gr { * \brief Construct a PDU meta set block */ static sptr make(pmt::pmt_t k, pmt::pmt_t v); + virtual void set_key(pmt::pmt_t key) = 0; + virtual void set_val(pmt::pmt_t val) = 0; }; } /* namespace blocks */ diff --git a/gr-blocks/lib/pdu_filter_impl.h b/gr-blocks/lib/pdu_filter_impl.h index 66440ee42..e54b50427 100644 --- a/gr-blocks/lib/pdu_filter_impl.h +++ b/gr-blocks/lib/pdu_filter_impl.h @@ -38,6 +38,9 @@ namespace gr { public: pdu_filter_impl(pmt::pmt_t k, pmt::pmt_t v, bool invert); void handle_msg(pmt::pmt_t msg); + void set_key(pmt::pmt_t key) { d_k = key; }; + void set_val(pmt::pmt_t val) { d_v = val; }; + void set_inversion(bool invert) { d_invert = invert; }; }; } /* namespace blocks */ diff --git a/gr-blocks/lib/pdu_remove_impl.h b/gr-blocks/lib/pdu_remove_impl.h index 4492e4b6d..6f1a7f1b9 100644 --- a/gr-blocks/lib/pdu_remove_impl.h +++ b/gr-blocks/lib/pdu_remove_impl.h @@ -36,6 +36,7 @@ namespace gr { public: pdu_remove_impl(pmt::pmt_t k); void handle_msg(pmt::pmt_t msg); + void set_key(pmt::pmt_t key) { d_k = key; }; }; } /* namespace blocks */ diff --git a/gr-blocks/lib/pdu_set_impl.h b/gr-blocks/lib/pdu_set_impl.h index b27315ef4..3529195aa 100644 --- a/gr-blocks/lib/pdu_set_impl.h +++ b/gr-blocks/lib/pdu_set_impl.h @@ -37,6 +37,8 @@ namespace gr { public: pdu_set_impl(pmt::pmt_t k, pmt::pmt_t v); void handle_msg(pmt::pmt_t msg); + void set_key(pmt::pmt_t key) { d_k = key; }; + void set_val(pmt::pmt_t val) { d_v = val; }; }; } /* namespace blocks */ |