summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiří Pinkava <j-pi@seznam.cz>2015-03-06 07:35:20 +0100
committerTom Rondeau <tom@trondeau.com>2015-03-13 09:23:28 -0400
commitadb12aaf8fc3f80fbacac1e387438a2c41d44fed (patch)
tree02185b6092785d1ff878bc518775c5a01bb6041b
parent854ff515b60cbacffffb0f9bdef07a031d666dc4 (diff)
analog: fix check of sample rate vs audio rate
Variables in XML blocks are substituted by the content of filed value from GRC block. Content of field in GRC block can be anny python expressions and expression can contain operators (like +). Some operators have lower priority than %. This leads to wrong (from user field of view) evaluation of expression as a whole. Just add parentheses fix this.
-rw-r--r--gr-analog/grc/analog_nbfm_rx.xml2
-rw-r--r--gr-analog/grc/analog_nbfm_tx.xml2
-rw-r--r--gr-analog/grc/analog_wfm_tx.xml2
3 files changed, 3 insertions, 3 deletions
diff --git a/gr-analog/grc/analog_nbfm_rx.xml b/gr-analog/grc/analog_nbfm_rx.xml
index cc690c7b6b..fca1d3a6a5 100644
--- a/gr-analog/grc/analog_nbfm_rx.xml
+++ b/gr-analog/grc/analog_nbfm_rx.xml
@@ -36,7 +36,7 @@
<value>5e3</value>
<type>real</type>
</param>
- <check>$quad_rate%$audio_rate == 0</check>
+ <check>($quad_rate)%($audio_rate) == 0</check>
<sink>
<name>in</name>
<type>complex</type>
diff --git a/gr-analog/grc/analog_nbfm_tx.xml b/gr-analog/grc/analog_nbfm_tx.xml
index b3d3451cf7..0ec4f489c9 100644
--- a/gr-analog/grc/analog_nbfm_tx.xml
+++ b/gr-analog/grc/analog_nbfm_tx.xml
@@ -36,7 +36,7 @@
<value>5e3</value>
<type>real</type>
</param>
- <check>$quad_rate%$audio_rate == 0</check>
+ <check>($quad_rate)%($audio_rate) == 0</check>
<sink>
<name>in</name>
<type>float</type>
diff --git a/gr-analog/grc/analog_wfm_tx.xml b/gr-analog/grc/analog_wfm_tx.xml
index 0e00f05fb2..89844f9ef3 100644
--- a/gr-analog/grc/analog_wfm_tx.xml
+++ b/gr-analog/grc/analog_wfm_tx.xml
@@ -36,7 +36,7 @@
<value>75e3</value>
<type>real</type>
</param>
- <check>$quad_rate%$audio_rate == 0</check>
+ <check>($quad_rate)%($audio_rate) == 0</check>
<sink>
<name>in</name>
<type>float</type>