diff options
| author | Tom Rondeau <tom@trondeau.com> | 2014-08-08 16:44:15 -0400 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2014-08-08 16:44:15 -0400 |
| commit | 4ac28002fbea740f78c2339446cca2d1f118628f (patch) | |
| tree | c81ebb1aa487fdb3cc277415e68c360ef6c80b26 /gr-blocks/grc | |
| parent | 41d0844328800cfc84c97e3961c39b5fafab11bb (diff) | |
| parent | 3d5df0ddd3aa8d5a94285b95f487747f25d4ee06 (diff) | |
Merge branch 'maint'
Conflicts:
gnuradio-runtime/CMakeLists.txt
gnuradio-runtime/lib/controlport/CMakeLists.txt
Diffstat (limited to 'gr-blocks/grc')
| -rw-r--r-- | gr-blocks/grc/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-blocks/grc/blocks_block_tree.xml | 2 | ||||
| -rw-r--r-- | gr-blocks/grc/blocks_ctrlport_performance.xml | 49 | ||||
| -rw-r--r-- | gr-blocks/grc/blocks_ctrlport_viewer.xml | 49 |
4 files changed, 0 insertions, 102 deletions
diff --git a/gr-blocks/grc/CMakeLists.txt b/gr-blocks/grc/CMakeLists.txt index 9d38e3dcd8..96a715a7e4 100644 --- a/gr-blocks/grc/CMakeLists.txt +++ b/gr-blocks/grc/CMakeLists.txt @@ -23,8 +23,6 @@ file(GLOB xml_files "*.xml") # Force out the controlport GRC blocks if we've disabled it. if(NOT ENABLE_GR_CTRLPORT) list(REMOVE_ITEM xml_files - ${CMAKE_CURRENT_SOURCE_DIR}/ctrlport_viewer.xml - ${CMAKE_CURRENT_SOURCE_DIR}/blocks_ctrlport_performance.xml ${CMAKE_CURRENT_SOURCE_DIR}/ctrlport_probe_c.xml ${CMAKE_CURRENT_SOURCE_DIR}/ctrlport_probe2_c.xml ) diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index c2910930e4..436bec3891 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -51,8 +51,6 @@ </cat> <cat> <name>Control Port</name> - <block>blocks_ctrlport_monitor</block> - <block>blocks_ctrlport_monitor_performance</block> <block>blocks_ctrlport_probe2_x</block> <block>blocks_ctrlport_probe2_c</block> <block>blocks_ctrlport_probe_c</block> diff --git a/gr-blocks/grc/blocks_ctrlport_performance.xml b/gr-blocks/grc/blocks_ctrlport_performance.xml deleted file mode 100644 index ae0fb91c50..0000000000 --- a/gr-blocks/grc/blocks_ctrlport_performance.xml +++ /dev/null @@ -1,49 +0,0 @@ -<?xml version="1.0"?> - -<!-- - Copyright 2012 Free Software Foundation, Inc. - - This file is part of GNU Radio - - GNU Radio is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3, or (at your option) - any later version. - - GNU Radio is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNU Radio; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, - Boston, MA 02110-1301, USA. ---> - -<block> - <name>CtrlPort Performance Monitor</name> - <key>blocks_ctrlport_monitor_performance</key> - <import>from gnuradio.ctrlport.monitor import *</import> - <make>not $en or monitor("gr-perf-monitorx")</make> - <param> - <name>Enabled</name> - <key>en</key> - <value></value> - <type>enum</type> - <option> - <name>True</name> - <key>True</key> - </option> - <option> - <name>False</name> - <key>False</key> - </option> - </param> - - <doc> - Place this in a graph to launch a QtPy GR CtrlPort Performance Monitor app. - </doc> - -</block> - diff --git a/gr-blocks/grc/blocks_ctrlport_viewer.xml b/gr-blocks/grc/blocks_ctrlport_viewer.xml deleted file mode 100644 index 2b69ae05ad..0000000000 --- a/gr-blocks/grc/blocks_ctrlport_viewer.xml +++ /dev/null @@ -1,49 +0,0 @@ -<?xml version="1.0"?> - -<!-- - Copyright 2012 Free Software Foundation, Inc. - - This file is part of GNU Radio - - GNU Radio is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3, or (at your option) - any later version. - - GNU Radio is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNU Radio; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, - Boston, MA 02110-1301, USA. ---> - -<block> - <name>CtrlPort Monitor</name> - <key>blocks_ctrlport_monitor</key> - <import>from gnuradio.ctrlport.monitor import *</import> - <make>not $en or monitor()</make> - <param> - <name>Enabled</name> - <key>en</key> - <value></value> - <type>enum</type> - <option> - <name>True</name> - <key>True</key> - </option> - <option> - <name>False</name> - <key>False</key> - </option> - </param> - - <doc> - Place this in a graph to launch a QtPy GR CtrlPort Monitor app. - </doc> - -</block> - |