summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gnuradio-core/src/lib/filter/gr_single_pole_iir.h4
-rw-r--r--gnuradio-core/src/lib/general/gr_quadrature_demod_cf.h2
-rw-r--r--gnuradio-core/src/lib/general/gr_quadrature_demod_cf.i4
-rw-r--r--gr-howto-write-a-block/version.sh4
-rw-r--r--gr-qtgui/.gitignore1
-rw-r--r--gr-qtgui/lib/.gitignore1
-rw-r--r--gr-qtgui/swig/.gitignore2
-rw-r--r--gr-uhd/.gitignore1
-rw-r--r--gr-uhd/grc/gen_uhd_usrp_blocks.py65
-rw-r--r--gr-uhd/lib/gr_uhd_usrp_source.cc34
-rw-r--r--grc/blocks/gr_quadrature_demod_cf.xml1
-rw-r--r--grc/python/flow_graph.tmpl11
-rw-r--r--gruel/src/python/.gitignore1
-rw-r--r--gruel/src/swig/.gitignore2
-rw-r--r--version.sh4
15 files changed, 95 insertions, 42 deletions
diff --git a/gnuradio-core/src/lib/filter/gr_single_pole_iir.h b/gnuradio-core/src/lib/filter/gr_single_pole_iir.h
index da919b35c..8781065d4 100644
--- a/gnuradio-core/src/lib/filter/gr_single_pole_iir.h
+++ b/gnuradio-core/src/lib/filter/gr_single_pole_iir.h
@@ -71,7 +71,7 @@ public:
d_prev_output = 0;
}
- o_type prev_output () { return d_prev_output; }
+ o_type prev_output () const { return d_prev_output; }
protected:
tap_type d_alpha;
@@ -155,7 +155,7 @@ public:
d_prev_output = 0;
}
- gr_complexd prev_output () { return d_prev_output; }
+ gr_complexd prev_output () const { return d_prev_output; }
protected:
double d_alpha;
diff --git a/gnuradio-core/src/lib/general/gr_quadrature_demod_cf.h b/gnuradio-core/src/lib/general/gr_quadrature_demod_cf.h
index a29acd628..df6de93d5 100644
--- a/gnuradio-core/src/lib/general/gr_quadrature_demod_cf.h
+++ b/gnuradio-core/src/lib/general/gr_quadrature_demod_cf.h
@@ -44,6 +44,8 @@ class gr_quadrature_demod_cf : public gr_sync_block
float d_gain;
public:
+ void set_gain(float gain) { d_gain = gain; }
+ float gain() const { return d_gain; }
int work (int noutput_items,
gr_vector_const_void_star &input_items,
diff --git a/gnuradio-core/src/lib/general/gr_quadrature_demod_cf.i b/gnuradio-core/src/lib/general/gr_quadrature_demod_cf.i
index fbd45dcf8..d9f338daa 100644
--- a/gnuradio-core/src/lib/general/gr_quadrature_demod_cf.i
+++ b/gnuradio-core/src/lib/general/gr_quadrature_demod_cf.i
@@ -27,4 +27,8 @@ gr_quadrature_demod_cf_sptr gr_make_quadrature_demod_cf (float gain);
class gr_quadrature_demod_cf : public gr_sync_block
{
gr_quadrature_demod_cf (float gain);
+
+public:
+ void set_gain(float gain) { d_gain = gain; }
+ float gain() const { return d_gain; }
};
diff --git a/gr-howto-write-a-block/version.sh b/gr-howto-write-a-block/version.sh
index 8d4ff5200..759d52806 100644
--- a/gr-howto-write-a-block/version.sh
+++ b/gr-howto-write-a-block/version.sh
@@ -1,4 +1,4 @@
MAJOR_VERSION=3
API_COMPAT=4
-MINOR_VERSION=0
-MAINT_VERSION=0
+MINOR_VERSION=1
+MAINT_VERSION=git
diff --git a/gr-qtgui/.gitignore b/gr-qtgui/.gitignore
index b336cc7ce..a37fc0c1a 100644
--- a/gr-qtgui/.gitignore
+++ b/gr-qtgui/.gitignore
@@ -1,2 +1,3 @@
/Makefile
/Makefile.in
+/*.pc
diff --git a/gr-qtgui/lib/.gitignore b/gr-qtgui/lib/.gitignore
index fc4f8cdfe..7754ad227 100644
--- a/gr-qtgui/lib/.gitignore
+++ b/gr-qtgui/lib/.gitignore
@@ -10,6 +10,7 @@
/spectrumdisplayform.ui.h
/FrequencyDisplayPlot.moc.cc
/ConstellationDisplayPlot.moc.cc
+/timedisplayform.moc.cc
/gnuradio
/guile
/python
diff --git a/gr-qtgui/swig/.gitignore b/gr-qtgui/swig/.gitignore
index 282522db0..26647d4c1 100644
--- a/gr-qtgui/swig/.gitignore
+++ b/gr-qtgui/swig/.gitignore
@@ -1,2 +1,4 @@
Makefile
Makefile.in
+/qtgui_swig.py
+/python
diff --git a/gr-uhd/.gitignore b/gr-uhd/.gitignore
index b336cc7ce..a37fc0c1a 100644
--- a/gr-uhd/.gitignore
+++ b/gr-uhd/.gitignore
@@ -1,2 +1,3 @@
/Makefile
/Makefile.in
+/*.pc
diff --git a/gr-uhd/grc/gen_uhd_usrp_blocks.py b/gr-uhd/grc/gen_uhd_usrp_blocks.py
index 82b6aa964..c77df6c97 100644
--- a/gr-uhd/grc/gen_uhd_usrp_blocks.py
+++ b/gr-uhd/grc/gen_uhd_usrp_blocks.py
@@ -29,20 +29,34 @@ MAIN_TMPL = """\
io_type=uhd.io_type.\$type.type,
num_channels=\$nchan,
)
-\#if \$ref_clk()
-self.\$(id).set_clock_config(uhd.clock_config.external(), uhd.ALL_MBOARDS)
-\#end if
-\#if \$sync()
-self.\$(id).set_time_unknown_pps(uhd.time_spec())
-\#end if
\#if \$clock_rate()
self.\$(id).set_clock_rate(\$clock_rate, uhd.ALL_MBOARDS)
\#end if
#for $m in range($max_mboards)
+########################################################################
+\#if \$num_mboards() > $m and \$ref_source$(m)() == 'external'
+self.\$(id).set_clock_config(uhd.clock_config.external(), $m)
+\#end if
+########################################################################
+\#if \$num_mboards() > $m and \$ref_source$(m)() == 'internal'
+self.\$(id).set_clock_config(uhd.clock_config.internal(), $m)
+\#end if
+########################################################################
+\#if \$num_mboards() > $m and \$ref_source$(m)() == 'mimo'
+_config = uhd.clock_config()
+_config.ref_source = uhd.clock_config.REF_MIMO
+_config.pps_source = uhd.clock_config.PPS_MIMO
+self.\$(id).set_clock_config(_config, $m)
+\#end if
+########################################################################
\#if \$num_mboards() > $m and \$sd_spec$(m)()
self.\$(id).set_subdev_spec(\$sd_spec$(m), $m)
\#end if
+########################################################################
#end for
+\#if \$sync()
+self.\$(id).set_time_unknown_pps(uhd.time_spec())
+\#end if
self.\$(id).set_samp_rate(\$samp_rate)
#for $n in range($max_nchan)
\#if \$nchan() > $n
@@ -95,21 +109,6 @@ self.\$(id).set_bandwidth(\$bw$(n), $n)
</hide>
</param>
<param>
- <name>Ref Clock</name>
- <key>ref_clk</key>
- <value></value>
- <type>enum</type>
- <hide>\#if \$ref_clk() then 'none' else 'part'#</hide>
- <option>
- <name>External</name>
- <key>ext</key>
- </option>
- <option>
- <name>Internal</name>
- <key></key>
- </option>
- </param>
- <param>
<name>Sync</name>
<key>sync</key>
<value></value>
@@ -150,6 +149,25 @@ self.\$(id).set_bandwidth(\$bw$(n), $n)
</param>
#for $m in range($max_mboards)
<param>
+ <name>Mb$(m): Ref Source</name>
+ <key>ref_source$(m)</key>
+ <value></value>
+ <type>enum</type>
+ <hide>
+ \#if not \$num_mboards() > $m
+ all
+ \#elif \$ref_source$(m)()
+ none
+ \#else
+ part
+ \#end if
+ </hide>
+ <option><name>Default</name><key></key></option>
+ <option><name>Internal</name><key>internal</key></option>
+ <option><name>External</name><key>external</key></option>
+ <option><name>MIMO Cable</name><key>mimo</key></option>
+ </param>
+ <param>
<name>Mb$(m): Subdev Spec</name>
<key>sd_spec$(m)</key>
<value></value>
@@ -209,6 +227,11 @@ USRP2 Example: addr0=192.168.10.2, addr1=192.168.10.3
Num Motherboards:
Selects the number of USRP motherboards in this device configuration.
+Reference Source:
+Where the motherboard should sync its time and clock references.
+If source and sink blocks reference the same device,
+it is only necessary to set the reference source on one of the blocks.
+
Subdevice specification:
Each motherboard should have its own subdevice specification \\
and all subdevice specifications should be the same length. \\
diff --git a/gr-uhd/lib/gr_uhd_usrp_source.cc b/gr-uhd/lib/gr_uhd_usrp_source.cc
index 9983489c3..669f890ea 100644
--- a/gr-uhd/lib/gr_uhd_usrp_source.cc
+++ b/gr-uhd/lib/gr_uhd_usrp_source.cc
@@ -182,19 +182,37 @@ public:
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items
){
- //wait for a packet to become available
+ //In order to allow for low-latency:
+ //We receive all available packets without timeout.
+ //This call can timeout under regular operation...
size_t num_samps = _dev->get_device()->recv(
output_items, noutput_items, _metadata,
- _type, uhd::device::RECV_MODE_ONE_PACKET, 1.0
+ _type, uhd::device::RECV_MODE_FULL_BUFF, 0.0
);
+ //If receive resulted in a timeout condition:
+ //We now receive a single packet with a large timeout.
+ if (_metadata.error_code == uhd::rx_metadata_t::ERROR_CODE_TIMEOUT){
+ num_samps = _dev->get_device()->recv(
+ output_items, noutput_items, _metadata,
+ _type, uhd::device::RECV_MODE_ONE_PACKET, 1.0
+ );
+ }
+
//handle possible errors conditions
switch(_metadata.error_code){
case uhd::rx_metadata_t::ERROR_CODE_NONE:
+ //TODO insert tag for time stamp
break;
+ case uhd::rx_metadata_t::ERROR_CODE_TIMEOUT:
+ //Assume that the user called stop() on the flow graph.
+ //However, a timeout can occur under error conditions.
+ return WORK_DONE;
+
case uhd::rx_metadata_t::ERROR_CODE_OVERFLOW:
//ignore overflows and try work again
+ //TODO insert tag for overflow
return work(noutput_items, input_items, output_items);
default:
@@ -204,18 +222,6 @@ public:
return num_samps;
}
- //advance the pointers and count by num_samps
- noutput_items -= num_samps;
- for (size_t i = 0; i < _nchan; i++){
- _tmp_buffs[i] = static_cast<char *>(output_items[i]) + num_samps*_type.size;
- }
-
- //receive all available packets without timeout
- num_samps += _dev->get_device()->recv(
- _tmp_buffs, noutput_items, _metadata,
- _type, uhd::device::RECV_MODE_FULL_BUFF, 0.0
- );
-
return num_samps;
}
diff --git a/grc/blocks/gr_quadrature_demod_cf.xml b/grc/blocks/gr_quadrature_demod_cf.xml
index a0e630c7e..fad0b3879 100644
--- a/grc/blocks/gr_quadrature_demod_cf.xml
+++ b/grc/blocks/gr_quadrature_demod_cf.xml
@@ -9,6 +9,7 @@
<key>gr_quadrature_demod_cf</key>
<import>from gnuradio import gr</import>
<make>gr.quadrature_demod_cf($gain)</make>
+ <callback>set_gain($gain)</callback>
<param>
<name>Gain</name>
<key>gain</key>
diff --git a/grc/python/flow_graph.tmpl b/grc/python/flow_graph.tmpl
index d5e53b52b..0878be4ba 100644
--- a/grc/python/flow_graph.tmpl
+++ b/grc/python/flow_graph.tmpl
@@ -65,9 +65,18 @@ class $(class_name)(gr.top_block, Qt.QWidget):
Qt.QWidget.__init__(self)
self.setWindowTitle("$title")
self.setWindowIcon(Qt.QIcon.fromTheme('gnuradio-grc'))
- self.top_layout = Qt.QVBoxLayout(self)
+ self.top_scroll_layout = Qt.QVBoxLayout()
+ self.setLayout(self.top_scroll_layout)
+ self.top_scroll = Qt.QScrollArea()
+ self.top_scroll.setFrameStyle(Qt.QFrame.NoFrame)
+ self.top_scroll_layout.addWidget(self.top_scroll)
+ self.top_scroll.setWidgetResizable(True)
+ self.top_widget = Qt.QWidget()
+ self.top_scroll.setWidget(self.top_widget)
+ self.top_layout = Qt.QVBoxLayout(self.top_widget)
self.top_grid_layout = Qt.QGridLayout()
self.top_layout.addLayout(self.top_grid_layout)
+
#elif $generate_options == 'no_gui'
class $(class_name)(gr.top_block):
diff --git a/gruel/src/python/.gitignore b/gruel/src/python/.gitignore
index b336cc7ce..604b402c5 100644
--- a/gruel/src/python/.gitignore
+++ b/gruel/src/python/.gitignore
@@ -1,2 +1,3 @@
/Makefile
/Makefile.in
+/run_tests
diff --git a/gruel/src/swig/.gitignore b/gruel/src/swig/.gitignore
index b336cc7ce..f99fdb19b 100644
--- a/gruel/src/swig/.gitignore
+++ b/gruel/src/swig/.gitignore
@@ -1,2 +1,4 @@
/Makefile
/Makefile.in
+/python
+/pmt_swig.py
diff --git a/version.sh b/version.sh
index 9f729d508..759d52806 100644
--- a/version.sh
+++ b/version.sh
@@ -1,4 +1,4 @@
MAJOR_VERSION=3
API_COMPAT=4
-MINOR_VERSION=0
-MAINT_VERSION=0 \ No newline at end of file
+MINOR_VERSION=1
+MAINT_VERSION=git
generated by cgit (git 2.34.1) at 2024-12-23 04:05:09 +0000