[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r6184 - in gnuradio/branches/developers/jcorgan/fg: co
|
From: |
jcorgan |
|
Subject: |
[Commit-gnuradio] r6184 - in gnuradio/branches/developers/jcorgan/fg: config gnuradio-core/src/lib/runtime gnuradio-examples/c++/dial_tone gnuradio-examples/python/hier/audio gnuradio-examples/python/hier/dect gnuradio-examples/python/hier/digital gnuradio-examples/python/hier/networking gnuradio-examples/python/hier/sounder gnuradio-examples/python/hier/usrp gr-pager/src gr-wxgui/src/python |
|
Date: |
Mon, 27 Aug 2007 01:03:55 -0600 (MDT) |
Author: jcorgan
Date: 2007-08-27 01:03:55 -0600 (Mon, 27 Aug 2007)
New Revision: 6184
Modified:
gnuradio/branches/developers/jcorgan/fg/config/grc_gnuradio_examples.m4
gnuradio/branches/developers/jcorgan/fg/gnuradio-core/src/lib/runtime/gr_top_block.h
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/c++/dial_tone/dial_tone.cc
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/c++/dial_tone/dial_tone.h
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/c++/dial_tone/main.cc
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/audio/dial_tone2.py
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/dect/usrp_dect.py
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/digital/benchmark_loopback.py
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/digital/benchmark_rx.py
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/digital/benchmark_tx.py
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/networking/audio_sink.py
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/networking/audio_source.py
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/networking/dial_tone_sink.py
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/networking/dial_tone_source.py
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/networking/vector_sink.py
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/networking/vector_source.py
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/sounder/usrp_sounder_rx.py
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/sounder/usrp_sounder_tx.py
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/usrp/usrp_siggen.py
gnuradio/branches/developers/jcorgan/fg/gr-pager/src/usrp_flex.py
gnuradio/branches/developers/jcorgan/fg/gr-pager/src/usrp_flex_all.py
gnuradio/branches/developers/jcorgan/fg/gr-pager/src/usrp_flex_band.py
gnuradio/branches/developers/jcorgan/fg/gr-wxgui/src/python/stdgui2.py
Log:
Changes to gnuradio-examples/python/hier for changed API.
Updated stale C++ example and changed build such that
the Makefile gets generated but the directory doesn't
automatically get descended into.
Modified:
gnuradio/branches/developers/jcorgan/fg/config/grc_gnuradio_examples.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/fg/config/grc_gnuradio_examples.m4
2007-08-27 06:30:09 UTC (rev 6183)
+++ gnuradio/branches/developers/jcorgan/fg/config/grc_gnuradio_examples.m4
2007-08-27 07:03:55 UTC (rev 6184)
@@ -22,6 +22,8 @@
AC_CONFIG_FILES([ \
gnuradio-examples/Makefile \
+ gnuradio-examples/c++/Makefile \
+ gnuradio-examples/c++/dial_tone/Makefile \
gnuradio-examples/python/Makefile \
gnuradio-examples/python/apps/hf_explorer/Makefile \
gnuradio-examples/python/apps/hf_radio/Makefile \
Modified:
gnuradio/branches/developers/jcorgan/fg/gnuradio-core/src/lib/runtime/gr_top_block.h
===================================================================
---
gnuradio/branches/developers/jcorgan/fg/gnuradio-core/src/lib/runtime/gr_top_block.h
2007-08-27 06:30:09 UTC (rev 6183)
+++
gnuradio/branches/developers/jcorgan/fg/gnuradio-core/src/lib/runtime/gr_top_block.h
2007-08-27 07:03:55 UTC (rev 6184)
@@ -36,10 +36,12 @@
class gr_top_block : public gr_hier_block2
{
private:
- gr_top_block(const std::string &name);
friend gr_top_block_sptr gr_make_top_block(const std::string &name);
gr_top_block_impl *d_impl;
+
+protected:
+ gr_top_block(const std::string &name);
public:
~gr_top_block();
Modified:
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/c++/dial_tone/dial_tone.cc
===================================================================
---
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/c++/dial_tone/dial_tone.cc
2007-08-27 06:30:09 UTC (rev 6183)
+++
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/c++/dial_tone/dial_tone.cc
2007-08-27 07:03:55 UTC (rev 6184)
@@ -32,9 +32,7 @@
// Hierarchical block constructor, with no inputs or outputs
dial_tone::dial_tone() :
-gr_hier_block2("dial_tone",
- gr_make_io_signature(0,0,0),
- gr_make_io_signature(0,0,0))
+ gr_top_block("dial_tone")
{
gr_sig_source_f_sptr src0 = gr_make_sig_source_f(48000, GR_SIN_WAVE, 350,
0.1);
gr_sig_source_f_sptr src1 = gr_make_sig_source_f(48000, GR_SIN_WAVE, 440,
0.1);
Modified:
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/c++/dial_tone/dial_tone.h
===================================================================
---
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/c++/dial_tone/dial_tone.h
2007-08-27 06:30:09 UTC (rev 6183)
+++
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/c++/dial_tone/dial_tone.h
2007-08-27 07:03:55 UTC (rev 6184)
@@ -19,13 +19,13 @@
* Boston, MA 02110-1301, USA.
*/
-#include <gr_hier_block2.h>
+#include <gr_top_block.h>
class dial_tone;
typedef boost::shared_ptr<dial_tone> dial_tone_sptr;
dial_tone_sptr make_dial_tone();
-class dial_tone : public gr_hier_block2
+class dial_tone : public gr_top_block
{
private:
dial_tone();
Modified:
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/c++/dial_tone/main.cc
===================================================================
---
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/c++/dial_tone/main.cc
2007-08-27 06:30:09 UTC (rev 6183)
+++
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/c++/dial_tone/main.cc
2007-08-27 07:03:55 UTC (rev 6184)
@@ -26,13 +26,10 @@
// Tell the runtime to go...
#include <dial_tone.h>
-#include <gr_runtime.h>
int main()
{
dial_tone_sptr top_block = make_dial_tone();
- gr_runtime_sptr runtime = gr_make_runtime(top_block);
-
- runtime->run();
+ top_block->run();
return 0;
}
Modified:
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/audio/dial_tone2.py
===================================================================
---
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/audio/dial_tone2.py
2007-08-27 06:30:09 UTC (rev 6183)
+++
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/audio/dial_tone2.py
2007-08-27 07:03:55 UTC (rev 6184)
@@ -60,13 +60,9 @@
options.audio_output,
options.amplitude)
- # Create an instance of a runtime, passing it the top block
- # to process
- runtime = gr.runtime(top)
-
try:
# Run forever
- runtime.run()
+ top.run()
except KeyboardInterrupt:
# Ctrl-C exits
pass
Modified:
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/dect/usrp_dect.py
===================================================================
---
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/dect/usrp_dect.py
2007-08-27 06:30:09 UTC (rev 6183)
+++
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/dect/usrp_dect.py
2007-08-27 07:03:55 UTC (rev 6184)
@@ -51,13 +51,9 @@
# Create an instance of a hierarchical block
top_block = dect_receiver(options)
- # Create an instance of a runtime, passing it the top block
- # to process
- runtime = gr.runtime(top_block)
-
try:
# Run forever
- runtime.run()
+ top_block.run()
except KeyboardInterrupt:
# Ctrl-C exits
pass
Modified:
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/digital/benchmark_loopback.py
===================================================================
---
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/digital/benchmark_loopback.py
2007-08-27 06:30:09 UTC (rev 6183)
+++
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/digital/benchmark_loopback.py
2007-08-27 07:03:55 UTC (rev 6184)
@@ -155,10 +155,7 @@
# Create an instance of a hierarchical block
top_block = my_graph(mods[options.modulation], demods[options.modulation],
rx_callback, options)
-
- # Create an instance of a runtime, passing it the top block
- runtime = gr.runtime(top_block)
- runtime.start()
+ top_block.start()
# generate and send packets
nbytes = int(1e6 * options.megabytes)
@@ -175,7 +172,7 @@
send_pkt(eof=True)
- runtime.wait()
+ top_block.wait()
if __name__ == '__main__':
try:
Modified:
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/digital/benchmark_rx.py
===================================================================
---
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/digital/benchmark_rx.py
2007-08-27 06:30:09 UTC (rev 6183)
+++
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/digital/benchmark_rx.py
2007-08-27 07:03:55 UTC (rev 6184)
@@ -95,13 +95,8 @@
# Create an instance of a hierarchical block
top_block = receive_path(demods[options.modulation], rx_callback, options)
-
- # Create an instance of a runtime, passing it the top block
- runtime = gr.runtime(top_block)
- runtime.start()
+ top_block.run()
- runtime.wait() # wait for it to finish
-
if __name__ == '__main__':
try:
main()
Modified:
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/digital/benchmark_tx.py
===================================================================
---
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/digital/benchmark_tx.py
2007-08-27 06:30:09 UTC (rev 6183)
+++
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/digital/benchmark_tx.py
2007-08-27 07:03:55 UTC (rev 6184)
@@ -88,10 +88,7 @@
# Create an instance of a hierarchical block
top_block = transmit_path(mods[options.modulation], options)
-
- # Create an instance of a runtime, passing it the top block
- runtime = gr.runtime(top_block)
- runtime.start()
+ top_block.start()
# generate and send packets
nbytes = int(1e6 * options.megabytes)
@@ -108,7 +105,7 @@
pktno += 1
send_pkt(eof=True)
- runtime.wait()
+ top_block.wait()
if __name__ == '__main__':
try:
Modified:
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/networking/audio_sink.py
===================================================================
---
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/networking/audio_sink.py
2007-08-27 06:30:09 UTC (rev 6183)
+++
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/networking/audio_sink.py
2007-08-27 07:03:55 UTC (rev 6184)
@@ -50,12 +50,9 @@
top_block = audio_sink(options.src_name, options.src_port,
options.packet_size, options.sample_rate)
- # Create an instance of a runtime, passing it the top block
- runtime = gr.runtime(top_block)
-
try:
# Run forever
- runtime.run()
+ top_block.run()
except KeyboardInterrupt:
# Ctrl-C exits
pass
Modified:
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/networking/audio_source.py
===================================================================
---
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/networking/audio_source.py
2007-08-27 06:30:09 UTC (rev 6183)
+++
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/networking/audio_source.py
2007-08-27 07:03:55 UTC (rev 6184)
@@ -52,12 +52,9 @@
top_block = audio_source(options.src_name, options.dst_name,
options.dst_port,
options.packet_size, options.sample_rate)
- # Create an instance of a runtime, passing it the top block
- runtime = gr.runtime(top_block)
-
try:
# Run forever
- runtime.run()
+ top_block.run()
except KeyboardInterrupt:
# Ctrl-C exits
pass
Modified:
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/networking/dial_tone_sink.py
===================================================================
---
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/networking/dial_tone_sink.py
2007-08-27 06:30:09 UTC (rev 6183)
+++
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/networking/dial_tone_sink.py
2007-08-27 07:03:55 UTC (rev 6184)
@@ -50,12 +50,9 @@
top_block = dial_tone_sink(options.src_name, options.src_port,
options.packet_size, options.sample_rate)
- # Create an instance of a runtime, passing it the top block
- runtime = gr.runtime(top_block)
-
try:
# Run forever
- runtime.run()
+ top_block.run()
except KeyboardInterrupt:
# Ctrl-C exits
pass
Modified:
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/networking/dial_tone_source.py
===================================================================
---
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/networking/dial_tone_source.py
2007-08-27 06:30:09 UTC (rev 6183)
+++
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/networking/dial_tone_source.py
2007-08-27 07:03:55 UTC (rev 6184)
@@ -61,12 +61,9 @@
top_block = dial_tone_source(options.src_name, options.dst_name,
options.dst_port,
options.packet_size, options.sample_rate)
- # Create an instance of a runtime, passing it the top block
- runtime = gr.runtime(top_block)
-
try:
# Run forever
- runtime.run()
+ top_block.run()
except KeyboardInterrupt:
# Ctrl-C exits
pass
Modified:
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/networking/vector_sink.py
===================================================================
---
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/networking/vector_sink.py
2007-08-27 06:30:09 UTC (rev 6183)
+++
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/networking/vector_sink.py
2007-08-27 07:03:55 UTC (rev 6184)
@@ -48,12 +48,9 @@
# Create an instance of a hierarchical block
top_block = vector_sink(options.src_name, options.src_port,
options.packet_size)
- # Create an instance of a runtime, passing it the top block
- runtime = gr.runtime(top_block)
-
try:
# Run forever
- runtime.run()
+ top_block.run()
except KeyboardInterrupt:
# Ctrl-C exits
pass
Modified:
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/networking/vector_source.py
===================================================================
---
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/networking/vector_source.py
2007-08-27 06:30:09 UTC (rev 6183)
+++
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/networking/vector_source.py
2007-08-27 07:03:55 UTC (rev 6184)
@@ -51,12 +51,9 @@
top_block = vector_source(options.src_name, options.dst_name,
options.dst_port, options.packet_size)
- # Create an instance of a runtime, passing it the top block
- runtime = gr.runtime(top_block)
-
try:
# Run forever
- runtime.run()
+ top_block.run()
except KeyboardInterrupt:
# Ctrl-C exits
pass
Modified:
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/sounder/usrp_sounder_rx.py
===================================================================
---
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/sounder/usrp_sounder_rx.py
2007-08-27 06:30:09 UTC (rev 6183)
+++
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/sounder/usrp_sounder_rx.py
2007-08-27 07:03:55 UTC (rev 6184)
@@ -85,10 +85,9 @@
sys.exit(1)
top_block = usrp_sounder_rx(options)
- runtime = gr.runtime(top_block)
try:
- runtime.run()
+ top_block.run()
except KeyboardInterrupt:
pass
Modified:
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/sounder/usrp_sounder_tx.py
===================================================================
---
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/sounder/usrp_sounder_tx.py
2007-08-27 06:30:09 UTC (rev 6183)
+++
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/sounder/usrp_sounder_tx.py
2007-08-27 07:03:55 UTC (rev 6184)
@@ -99,13 +99,9 @@
options.verbose, options.degree,
options.chip_rate,
options.amplitude)
- # Create an instance of a runtime, passing it the top block
- # to process
- runtime = gr.runtime(top_block)
-
try:
# Run forever
- runtime.run()
+ top_block.run()
except KeyboardInterrupt:
# Ctrl-C exits
pass
Modified:
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/usrp/usrp_siggen.py
===================================================================
---
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/usrp/usrp_siggen.py
2007-08-27 06:30:09 UTC (rev 6183)
+++
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/python/hier/usrp/usrp_siggen.py
2007-08-27 07:03:55 UTC (rev 6184)
@@ -119,11 +119,9 @@
top_block = my_graph(options.type, options.amplitude,
options.waveform_freq, options.offset,
options.tx_subdev_spec, options.interp,
options.rf_freq)
- runtime = gr.runtime(top_block)
-
try:
# Run forever
- runtime.run()
+ top_block.run()
except KeyboardInterrupt:
# Ctrl-C exits
pass
Modified: gnuradio/branches/developers/jcorgan/fg/gr-pager/src/usrp_flex.py
===================================================================
--- gnuradio/branches/developers/jcorgan/fg/gr-pager/src/usrp_flex.py
2007-08-27 06:30:09 UTC (rev 6183)
+++ gnuradio/branches/developers/jcorgan/fg/gr-pager/src/usrp_flex.py
2007-08-27 07:03:55 UTC (rev 6184)
@@ -160,10 +160,9 @@
# Flow graph emits pages into message queue
queue = gr.msg_queue()
tb = app_top_block(options, queue)
- r = gr.runtime(tb)
try:
- r.start()
+ tb.start()
while 1:
if not queue.empty_p():
msg = queue.delete_head() # Blocking read
@@ -181,7 +180,7 @@
time.sleep(1)
except KeyboardInterrupt:
- r.stop()
+ tb.stop()
if __name__ == "__main__":
main()
Modified: gnuradio/branches/developers/jcorgan/fg/gr-pager/src/usrp_flex_all.py
===================================================================
--- gnuradio/branches/developers/jcorgan/fg/gr-pager/src/usrp_flex_all.py
2007-08-27 06:30:09 UTC (rev 6183)
+++ gnuradio/branches/developers/jcorgan/fg/gr-pager/src/usrp_flex_all.py
2007-08-27 07:03:55 UTC (rev 6184)
@@ -76,10 +76,9 @@
queue = gr.msg_queue()
tb = app_top_block(options, queue)
- r = gr.runtime(tb)
try:
- r.start()
+ tb.start()
while 1:
if not queue.empty_p():
msg = queue.delete_head() # Blocking read
@@ -96,7 +95,7 @@
time.sleep(1)
except KeyboardInterrupt:
- r.stop()
+ tb.stop()
if __name__ == "__main__":
main()
Modified: gnuradio/branches/developers/jcorgan/fg/gr-pager/src/usrp_flex_band.py
===================================================================
--- gnuradio/branches/developers/jcorgan/fg/gr-pager/src/usrp_flex_band.py
2007-08-27 06:30:09 UTC (rev 6183)
+++ gnuradio/branches/developers/jcorgan/fg/gr-pager/src/usrp_flex_band.py
2007-08-27 07:03:55 UTC (rev 6184)
@@ -76,10 +76,9 @@
queue = gr.msg_queue()
tb = app_top_block(options, queue)
- r = gr.runtime(tb)
try:
- r.start()
+ tb.start()
while 1:
if not queue.empty_p():
msg = queue.delete_head() # Blocking read
@@ -96,7 +95,7 @@
time.sleep(1)
except KeyboardInterrupt:
- r.stop()
+ tb.stop()
if __name__ == "__main__":
main()
Modified: gnuradio/branches/developers/jcorgan/fg/gr-wxgui/src/python/stdgui2.py
===================================================================
--- gnuradio/branches/developers/jcorgan/fg/gr-wxgui/src/python/stdgui2.py
2007-08-27 06:30:09 UTC (rev 6183)
+++ gnuradio/branches/developers/jcorgan/fg/gr-wxgui/src/python/stdgui2.py
2007-08-27 07:03:55 UTC (rev 6184)
@@ -65,11 +65,11 @@
vbox.Fit(self)
def OnCloseWindow (self, event):
- self.runtime().stop()
+ self.top_block().stop()
self.Destroy ()
- def runtime (self):
- return self.panel.runtime
+ def top_block (self):
+ return self.panel.top_block
class stdpanel (wx.Panel):
def __init__ (self, parent, frame, top_block_maker):
@@ -83,8 +83,7 @@
self.SetAutoLayout (True)
vbox.Fit (self)
- self.runtime = gr.runtime(self.top_block)
- self.runtime.start ()
+ self.top_block.start ()
class std_top_block (gr.top_block):
def __init__ (self, parent, panel, vbox, argv):
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r6184 - in gnuradio/branches/developers/jcorgan/fg: config gnuradio-core/src/lib/runtime gnuradio-examples/c++/dial_tone gnuradio-examples/python/hier/audio gnuradio-examples/python/hier/dect gnuradio-examples/python/hier/digital gnuradio-examples/python/hier/networking gnuradio-examples/python/hier/sounder gnuradio-examples/python/hier/usrp gr-pager/src gr-wxgui/src/python,
jcorgan <=