summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.common3
-rw-r--r--gnuradio-core/src/python/gnuradio/window.py4
-rw-r--r--gr-noaa/grc/Makefile.am2
-rw-r--r--gr-wxgui/src/python/fftsink_gl.py2
-rw-r--r--gr-wxgui/src/python/fftsink_nongl.py2
-rw-r--r--gr-wxgui/src/python/waterfallsink_gl.py2
-rw-r--r--grc/Makefile.am4
-rw-r--r--grc/Makefile.inc24
-rw-r--r--grc/base/Makefile.am6
-rw-r--r--grc/blocks/Makefile.am2
-rw-r--r--grc/blocks/gr_message_sink.xml2
-rw-r--r--grc/blocks/gr_message_source.xml2
-rw-r--r--grc/freedesktop/Makefile.am2
-rw-r--r--grc/gui/Makefile.am4
-rw-r--r--grc/python/Makefile.am6
-rw-r--r--grc/python/flow_graph.tmpl2
-rw-r--r--grc/scripts/Makefile.am4
-rw-r--r--grc/todo.txt3
18 files changed, 29 insertions, 47 deletions
diff --git a/Makefile.common b/Makefile.common
index aca56b34a..64891345b 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -113,6 +113,9 @@ gr_docdir = $(docdir)-$(DOCVER)
# System configuration files
gr_prefsdir = $(GR_PREFSDIR)
+# Data directory for grc block wrappers
+grc_blocksdir = $(pkgdatadir)/grc/blocks
+
# Other common defines; use "+=" to add to these
STAMPS =
MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT
diff --git a/gnuradio-core/src/python/gnuradio/window.py b/gnuradio-core/src/python/gnuradio/window.py
index 7f6d62b7c..e109a9892 100644
--- a/gnuradio-core/src/python/gnuradio/window.py
+++ b/gnuradio-core/src/python/gnuradio/window.py
@@ -1,5 +1,5 @@
#
-# Copyright 2004,2005 Free Software Foundation, Inc.
+# Copyright 2004,2005,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -166,7 +166,7 @@ def kaiser(fft_size,beta):
def coswindow(coeffs):
def closure(fft_size):
window = [0] * fft_size
- print list(enumerate(coeffs))
+ #print list(enumerate(coeffs))
for w_index in range(fft_size):
for (c_index, coeff) in enumerate(coeffs):
window[w_index] += (-1)**c_index * coeff * math.cos(2.0*c_index*math.pi*(w_index+0.5)/(fft_size-1))
diff --git a/gr-noaa/grc/Makefile.am b/gr-noaa/grc/Makefile.am
index 1f056473c..a290204b0 100644
--- a/gr-noaa/grc/Makefile.am
+++ b/gr-noaa/grc/Makefile.am
@@ -21,7 +21,7 @@
include $(top_srcdir)/Makefile.common
-grcblocksdir = $(prefix)/share/gnuradio/grc/blocks
+grcblocksdir = $(grc_blocksdir)
dist_grcblocks_DATA = \
noaa_hrpt_decoder.xml \
diff --git a/gr-wxgui/src/python/fftsink_gl.py b/gr-wxgui/src/python/fftsink_gl.py
index 9b2f9a487..8ddea9a8e 100644
--- a/gr-wxgui/src/python/fftsink_gl.py
+++ b/gr-wxgui/src/python/fftsink_gl.py
@@ -1,5 +1,5 @@
#
-# Copyright 2008 Free Software Foundation, Inc.
+# Copyright 2008,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
diff --git a/gr-wxgui/src/python/fftsink_nongl.py b/gr-wxgui/src/python/fftsink_nongl.py
index b3a48a716..937eb27cc 100644
--- a/gr-wxgui/src/python/fftsink_nongl.py
+++ b/gr-wxgui/src/python/fftsink_nongl.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright 2003,2004,2005,2006,2007 Free Software Foundation, Inc.
+# Copyright 2003,2004,2005,2006,2007,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
diff --git a/gr-wxgui/src/python/waterfallsink_gl.py b/gr-wxgui/src/python/waterfallsink_gl.py
index c6b0df65c..c2c4e8df7 100644
--- a/gr-wxgui/src/python/waterfallsink_gl.py
+++ b/gr-wxgui/src/python/waterfallsink_gl.py
@@ -1,5 +1,5 @@
#
-# Copyright 2008 Free Software Foundation, Inc.
+# Copyright 2008,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
diff --git a/grc/Makefile.am b/grc/Makefile.am
index 30b955a1e..2b5dc730b 100644
--- a/grc/Makefile.am
+++ b/grc/Makefile.am
@@ -19,7 +19,7 @@
# Boston, MA 02110-1301, USA.
#
-include $(top_srcdir)/grc/Makefile.inc
+include $(top_srcdir)/Makefile.common
if PYTHON
SUBDIRS = \
@@ -35,7 +35,7 @@ if XDG_UTILS
SUBDIRS += freedesktop
endif
-ourpythondir = $(grc_src_prefix)
+ourpythondir = $(pkgpythondir)/grc
ourpython_PYTHON = __init__.py
etcdir = $(gr_prefsdir)
diff --git a/grc/Makefile.inc b/grc/Makefile.inc
deleted file mode 100644
index c45d1ce1f..000000000
--- a/grc/Makefile.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Copyright 2008, 2009 Free Software Foundation, Inc.
-#
-# This file is part of GNU Radio
-#
-# GNU Radio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-#
-# GNU Radio is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Radio; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-#
-
-include $(top_srcdir)/Makefile.common
-grc_src_prefix = $(pkgpythondir)/grc
-grc_blocksdir = $(pkgdatadir)/grc/blocks
diff --git a/grc/base/Makefile.am b/grc/base/Makefile.am
index e489601db..6a95e33b9 100644
--- a/grc/base/Makefile.am
+++ b/grc/base/Makefile.am
@@ -19,9 +19,9 @@
# Boston, MA 02110-1301, USA.
#
-include $(top_srcdir)/grc/Makefile.inc
+include $(top_srcdir)/Makefile.common
-ourpythondir = $(grc_src_prefix)/base
+ourpythondir = $(pkgpythondir)/grc/base
ourpython_PYTHON = \
odict.py \
ParseXML.py \
@@ -35,7 +35,7 @@ ourpython_PYTHON = \
Port.py \
__init__.py
-ourdatadir = $(grc_src_prefix)/base
+ourdatadir = $(pkgpythondir)/grc/base
dist_ourdata_DATA = \
block_tree.dtd \
flow_graph.dtd
diff --git a/grc/blocks/Makefile.am b/grc/blocks/Makefile.am
index 61c003803..9194d99ec 100644
--- a/grc/blocks/Makefile.am
+++ b/grc/blocks/Makefile.am
@@ -19,7 +19,7 @@
# Boston, MA 02110-1301, USA.
#
-include $(top_srcdir)/grc/Makefile.inc
+include $(top_srcdir)/Makefile.common
ourdatadir = $(grc_blocksdir)
dist_ourdata_DATA = \
diff --git a/grc/blocks/gr_message_sink.xml b/grc/blocks/gr_message_sink.xml
index 76537f283..18e92adb9 100644
--- a/grc/blocks/gr_message_sink.xml
+++ b/grc/blocks/gr_message_sink.xml
@@ -8,7 +8,7 @@
<name>Message Sink</name>
<key>gr_message_sink</key>
<import>from gnuradio import gr</import>
- <make>gr.message_sink($type.size*$vlen, $(id)_msgq, $dont_block)</make>
+ <make>gr.message_sink($type.size*$vlen, $(id)_msgq_out, $dont_block)</make>
<param>
<name>Input Type</name>
<key>type</key>
diff --git a/grc/blocks/gr_message_source.xml b/grc/blocks/gr_message_source.xml
index 44378ae83..72367b21b 100644
--- a/grc/blocks/gr_message_source.xml
+++ b/grc/blocks/gr_message_source.xml
@@ -8,7 +8,7 @@
<name>Message Source</name>
<key>gr_message_source</key>
<import>from gnuradio import gr</import>
- <make>gr.message_source($type.size*$vlen, $(id)_msgq)</make>
+ <make>gr.message_source($type.size*$vlen, $(id)_msgq_in)</make>
<param>
<name>Output Type</name>
<key>type</key>
diff --git a/grc/freedesktop/Makefile.am b/grc/freedesktop/Makefile.am
index 79388ba3a..bfbdee940 100644
--- a/grc/freedesktop/Makefile.am
+++ b/grc/freedesktop/Makefile.am
@@ -19,7 +19,7 @@
# Boston, MA 02110-1301, USA.
#
-include $(top_srcdir)/grc/Makefile.inc
+include $(top_srcdir)/Makefile.common
ourdatadir = $(pkgdatadir)/grc/freedesktop
diff --git a/grc/gui/Makefile.am b/grc/gui/Makefile.am
index b14817d04..a73b6855d 100644
--- a/grc/gui/Makefile.am
+++ b/grc/gui/Makefile.am
@@ -19,9 +19,9 @@
# Boston, MA 02110-1301, USA.
#
-include $(top_srcdir)/grc/Makefile.inc
+include $(top_srcdir)/Makefile.common
-ourpythondir = $(grc_src_prefix)/gui
+ourpythondir = $(pkgpythondir)/grc/gui
ourpython_PYTHON = \
Block.py \
Colors.py \
diff --git a/grc/python/Makefile.am b/grc/python/Makefile.am
index 0a62c0825..67b71bc47 100644
--- a/grc/python/Makefile.am
+++ b/grc/python/Makefile.am
@@ -19,9 +19,9 @@
# Boston, MA 02110-1301, USA.
#
-include $(top_srcdir)/grc/Makefile.inc
+include $(top_srcdir)/Makefile.common
-ourpythondir = $(grc_src_prefix)/python
+ourpythondir = $(pkgpythondir)/grc/python
ourpython_PYTHON = \
convert_hier.py \
expr_utils.py \
@@ -37,7 +37,7 @@ ourpython_PYTHON = \
Port.py \
__init__.py
-ourdatadir = $(grc_src_prefix)/python
+ourdatadir = $(pkgpythondir)/grc/python
dist_ourdata_DATA = \
block.dtd \
default_flow_graph.grc \
diff --git a/grc/python/flow_graph.tmpl b/grc/python/flow_graph.tmpl
index 31d99a61c..ab764006c 100644
--- a/grc/python/flow_graph.tmpl
+++ b/grc/python/flow_graph.tmpl
@@ -135,7 +135,7 @@ class $(class_name)(gr.hier_block2):
$DIVIDER
#end if
#for $msg in $messages
- $(msg.get_source().get_parent().get_id())_msgq = $(msg.get_sink().get_parent().get_id())_msgq = gr.msg_queue(2)
+ $(msg.get_source().get_parent().get_id())_msgq_out = $(msg.get_sink().get_parent().get_id())_msgq_in = gr.msg_queue(2)
#end for
########################################################
##Create Blocks
diff --git a/grc/scripts/Makefile.am b/grc/scripts/Makefile.am
index 35c75d5fe..e24f88800 100644
--- a/grc/scripts/Makefile.am
+++ b/grc/scripts/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2008 Free Software Foundation, Inc.
+# Copyright 2008, 2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -19,6 +19,6 @@
# Boston, MA 02110-1301, USA.
#
-include $(top_srcdir)/grc/Makefile.inc
+include $(top_srcdir)/Makefile.common
dist_bin_SCRIPTS = grc usrp2_probe usrp_probe
diff --git a/grc/todo.txt b/grc/todo.txt
index e4fd4647a..9dad05730 100644
--- a/grc/todo.txt
+++ b/grc/todo.txt
@@ -26,6 +26,7 @@
* callbacks for set average on fft, waterfall, number sinks
* add units to params: Sps, Hz, dB...
* add bool type to command line option store_true or store_false
+* messages for packet blocks and probe blocks
##################################################
# Features
@@ -53,6 +54,7 @@
* concept of a project, or project flow graph
* collection of blocks, hier and top
* system-wide, default/work, and user created
+* use templates/macros to generate the repetative stuff in the xml
##################################################
# Problems
@@ -68,6 +70,7 @@
* threads dont die on exit in probe and variable sink
* align param titles in properties dialog
* weird grid params misbehaving
+* gr hier blocks have more diverse IO capabilities than we allow for
##################################################
# Future
generated by cgit (git 2.34.1) at 2024-12-21 17:55:09 +0000