summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAshwini2015-03-28 10:59:13 +0530
committerAshwini2015-03-28 10:59:13 +0530
commit11529ca451b90db113975b240d0c2125e2c5fd6a (patch)
tree17524b393550202ef49f373e58d5e923035b5106
parent1b1ede945eb59f1409b2802c5133e87b033b50ee (diff)
downloadgnuradio-11529ca451b90db113975b240d0c2125e2c5fd6a.tar.gz
gnuradio-11529ca451b90db113975b240d0c2125e2c5fd6a.tar.bz2
gnuradio-11529ca451b90db113975b240d0c2125e2c5fd6a.zip
CMake files edited
-rw-r--r--gr-input/grc/CMakeLists.txt6
-rw-r--r--gr-input/grc/Transfer_Function_Transfer_Function.xml66
-rw-r--r--gr-input/grc/Transfer_function_Denominator.xml49
-rw-r--r--gr-input/grc/Transfer_function_Numerator.xml48
-rw-r--r--gr-input/python/CMakeLists.txt7
5 files changed, 13 insertions, 163 deletions
diff --git a/gr-input/grc/CMakeLists.txt b/gr-input/grc/CMakeLists.txt
index 61b317f77..0aa2bb072 100644
--- a/gr-input/grc/CMakeLists.txt
+++ b/gr-input/grc/CMakeLists.txt
@@ -75,3 +75,9 @@ install(FILES
COMPONENT "input_python"
)
+install(FILES
+ plzr_plot.xml
+ DESTINATION ${GRC_BLOCKS_DIR}
+ COMPONENT "input_python"
+)
+
diff --git a/gr-input/grc/Transfer_Function_Transfer_Function.xml b/gr-input/grc/Transfer_Function_Transfer_Function.xml
deleted file mode 100644
index 203fe4a7b..000000000
--- a/gr-input/grc/Transfer_Function_Transfer_Function.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0"?>
-<block>
- <name>Transfer Function</name>
- <key>Transfer_Function_Transfer_Function</key>
- <category>Transfer Function</category>
- <import>import gnuradio.input.Transfer_Function</import>
- <make>gnuradio.input.Transfer_Function.Transfer_Function($order,$itype,$tstart,$tstop,$tstep)</make>
-
-<param>
- <name>Order of transfer function</name>
- <key>order</key>
- <value>1</value>
- <type>real</type>
-
-</param>
-
-
- <param>
- <name>Input Types</name>
- <key>itype</key>
- <type>enum</type>
- <option><name>Impulse</name><key>11</key></option>
- <option><name>Step</name><key>12</key></option>
- <option><name>Ramp</name><key>13</key></option>
- </param>
-
- <param>
-<name>tstart</name>
-<key>tstart</key>
-<value>0</value>
-<type>real</type>
-</param>
-
-<param>
-<name>tstop</name>
-<key>tstop</key>
-<value>0</value>
-<type>real</type>
-</param>
-
-<param>
-<name>tstep</name>
-<key>tstep</key>
-<value>0</value>
-<type>real</type>
-</param>
-
-
- <sink>
- <name>in</name>
- <type>float</type>
- <nports>2</nports>
- </sink>
-<!--
- <sink>
- <name>in1</name>
- <type>float</type>
- <nports>4</nports>
- </sink> -->
-
-
- <source>
- <name>out</name>
- <type>float</type>
- </source>
-</block>
diff --git a/gr-input/grc/Transfer_function_Denominator.xml b/gr-input/grc/Transfer_function_Denominator.xml
deleted file mode 100644
index 2ba936580..000000000
--- a/gr-input/grc/Transfer_function_Denominator.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0"?>
-<block>
- <name>Denominator</name>
- <key>Transfer_function_Denominator</key>
- <category>Transfer_function</category>
- <import>import gnuradio.input.Denominator</import>
- <make>gnuradio.input.Denominator.Denominator($num_inputs)</make>
-
-<param>
-<name>Order of Transfer Function</name>
-<key>num_inputs</key>
-<value>1</value>
-<type>int</type>
-</param>
-
- <sink>
- <name>in0</name>
- <type>float</type>
- <nports>1+$num_inputs</nports>
- </sink>
-<!--
- <sink>
- <name>in1</name>
- <type>float</type>
- <nports>4</nports>
- </sink> -->
-
-
- <source>
- <name>out</name>
- <type>float</type>
- </source>
-
-<doc>
-
-This will take the coefficient values for the Denominator.
-
-in00 = value of the coefficient of s^0
-
-in01 = value of the coefficient of s^1
-
-in02 = value of the coefficient of s^2
-
-and so on..
-
-</doc>
-
-
-</block>
diff --git a/gr-input/grc/Transfer_function_Numerator.xml b/gr-input/grc/Transfer_function_Numerator.xml
deleted file mode 100644
index 1ad34f316..000000000
--- a/gr-input/grc/Transfer_function_Numerator.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<block>
- <name>Numerator</name>
- <key>Transfer_function_Numerator</key>
- <category>Transfer_function</category>
- <import>import gnuradio.input.Numerator</import>
- <make>gnuradio.input.Numerator.Numerator($num_inputs)</make>
-
-<param>
-<name>Order of Transfer Function</name>
-<key>num_inputs</key>
-<value>1</value>
-<type>int</type>
-</param>
-
- <sink>
- <name>in0</name>
- <type>float</type>
- <nports>1+$num_inputs</nports>
- </sink>
-<!--
- <sink>
- <name>in1</name>
- <type>float</type>
- <nports>4</nports>
- </sink> -->
-
-
- <source>
- <name>out</name>
- <type>float</type>
- </source>
-
-<doc>
-
-This will take the coefficient values for the numerator.
-
-in00 = value of the coefficient of s^0
-
-in01 = value of the coefficient of s^1
-
-in02 = value of the coefficient of s^2
-
-and so on..
-
-</doc>
-
-</block>
diff --git a/gr-input/python/CMakeLists.txt b/gr-input/python/CMakeLists.txt
index 7c73fc59f..269c9e0b4 100644
--- a/gr-input/python/CMakeLists.txt
+++ b/gr-input/python/CMakeLists.txt
@@ -106,6 +106,13 @@ GR_PYTHON_INSTALL(
COMPONENT "input_python"
)
+GR_PYTHON_INSTALL(
+ FILES
+ plzr_plot.py
+ DESTINATION ${GR_PYTHON_DIR}/gnuradio/input
+ COMPONENT "input_python"
+)
+
########################################################################
# Handle the unit tests