From d1d210da036af0723c15d1c1f85fbacebe456bb5 Mon Sep 17 00:00:00 2001
From: Tim O'Shea
Date: Thu, 10 Jan 2013 11:39:05 -0500
Subject: core: adding gr_random_pdu message passing block
Conflicts:
gnuradio-core/src/lib/general/CMakeLists.txt
gnuradio-core/src/lib/general/general.i
---
grc/blocks/block_tree.xml | 1 +
grc/blocks/gr_random_pdu.xml | 35 +++++++++++++++++++++++++++++++++++
2 files changed, 36 insertions(+)
create mode 100644 grc/blocks/gr_random_pdu.xml
(limited to 'grc')
diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml
index 183883959..dcd6c5448 100644
--- a/grc/blocks/block_tree.xml
+++ b/grc/blocks/block_tree.xml
@@ -45,6 +45,7 @@
gr_tagged_stream_to_pdu
gr_tuntap_pdu
gr_socket_pdu
+ gr_random_pdu
Operators
diff --git a/grc/blocks/gr_random_pdu.xml b/grc/blocks/gr_random_pdu.xml
new file mode 100644
index 000000000..ed5a79a92
--- /dev/null
+++ b/grc/blocks/gr_random_pdu.xml
@@ -0,0 +1,35 @@
+
+
+
+ Random PDU Generator
+ gr_random_pdu
+ from gnuradio import gr
+ from gruel import pmt
+ gr.random_pdu($minsize, $maxsize)
+
+ Min Bytes
+ minsize
+ 50
+ int
+
+
+ Max Bytes
+ maxsize
+ 2000
+ int
+
+
+ generate
+ message
+ 1
+
+
+ pdus
+ message
+ 1
+
+
--
cgit
From cf2a4f174bb49a6c9e839217369b1e22741a10da Mon Sep 17 00:00:00 2001
From: Martin Braun
Date: Tue, 15 Jan 2013 14:30:39 +0100
Subject: grc: Fixed Bug #485 by gracefully exiting when user sets
GR_DONT_LOAD_PREFS=1 GRC_BLOCKS_PATH=
---
grc/gui/MainWindow.py | 3 +++
grc/scripts/gnuradio-companion | 11 ++++++++++-
2 files changed, 13 insertions(+), 1 deletion(-)
(limited to 'grc')
diff --git a/grc/gui/MainWindow.py b/grc/gui/MainWindow.py
index 37a100c94..1dc02dabb 100644
--- a/grc/gui/MainWindow.py
+++ b/grc/gui/MainWindow.py
@@ -180,6 +180,9 @@ class MainWindow(gtk.Window):
if file_path: Messages.send_end_load()
except Exception, e: #return on failure
Messages.send_fail_load(e)
+ if isinstance(e, KeyError) and str(e) == "'options'":
+ # This error is unrecoverable, so crash gracefully
+ exit(-1)
return
#add this page to the notebook
self.notebook.append_page(page, page.get_tab())
diff --git a/grc/scripts/gnuradio-companion b/grc/scripts/gnuradio-companion
index e76322b4d..dabca3028 100755
--- a/grc/scripts/gnuradio-companion
+++ b/grc/scripts/gnuradio-companion
@@ -39,10 +39,19 @@ Is the library path environment variable set correctly?
d.run()
exit(-1)
-from gnuradio import gr
from optparse import OptionParser
+import os
if __name__ == "__main__":
+ if ('GR_DONT_LOAD_PREFS' in os.environ.keys() and
+ (not 'GRC_BLOCKS_PATH' in os.environ.keys() or len(os.environ['GRC_BLOCKS_PATH']) == 0)):
+ d = gtk.MessageDialog(
+ type=gtk.MESSAGE_ERROR,
+ buttons=gtk.BUTTONS_CLOSE,
+ message_format="""Can't find block definitions. Use config.conf or GRC_BLOCKS_PATH. """)
+ d.set_title("No block definitions available.")
+ d.run()
+ exit(-1)
usage = 'usage: %prog [options] [saved flow graphs]'
version = """
GNU Radio Companion %s
--
cgit
From 4202152bfd2015cba2e52592761b5e64bfb46c0f Mon Sep 17 00:00:00 2001
From: Tim O'Shea
Date: Wed, 13 Feb 2013 16:38:20 -0500
Subject: grc: add callback for gr_throttle sample_rate
---
grc/blocks/gr_throttle.xml | 1 +
1 file changed, 1 insertion(+)
(limited to 'grc')
diff --git a/grc/blocks/gr_throttle.xml b/grc/blocks/gr_throttle.xml
index dc825f167..e3a5a2ba1 100644
--- a/grc/blocks/gr_throttle.xml
+++ b/grc/blocks/gr_throttle.xml
@@ -10,6 +10,7 @@
1
from gnuradio import gr
gr.throttle($type.size*$vlen, $samples_per_second)
+ set_sample_rate($samples_per_second)
Type
type
--
cgit