Merged upstream from next

6 files changed, 13 insertions, 8 deletions

diff --git a/grc/Makefile.am b/grc/Makefile.am
index 2b5dc730b..330777bb7 100644
--- a/grc/Makefile.am
+++ b/grc/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2008, 2009 Free Software Foundation, Inc.
+# Copyright 2008,2009,2010 Free Software Foundation, Inc.
 #
 # This file is part of GNU Radio
 #
@@ -41,9 +41,9 @@ ourpython_PYTHON = __init__.py
 etcdir = $(gr_prefsdir)
 dist_etc_DATA = grc.conf
 
-EXTRA_DIST = $(srcdir)/grc.conf.in
+EXTRA_DIST += $(srcdir)/grc.conf.in
 
-BUILT_SOURCES = grc.conf
+BUILT_SOURCES += grc.conf
 
 grc.conf: $(srcdir)/grc.conf.in Makefile
 	sed \
diff --git a/grc/base/Param.py b/grc/base/Param.py
index e56eac36e..5cd0f9d6d 100644
--- a/grc/base/Param.py
+++ b/grc/base/Param.py
@@ -94,7 +94,7 @@ class Param(Element):
 				try: assert set(opt_keys) == set(option.get_opt_keys())
 				except AssertionError: raise Exception, 'Opt keys "%s" are not identical across all options.'%opt_keys
 			#if a value is specified, it must be in the options keys
-			self._value = value or self.get_option_keys()[0]
+			self._value = value if value or value in self.get_option_keys() else self.get_option_keys()[0]
 			try: assert self.get_value() in self.get_option_keys()
 			except AssertionError: raise Exception, 'The value "%s" is not in the possible values of "%s".'%(self.get_value(), self.get_option_keys())
 		else: self._value = value or ''
diff --git a/grc/blocks/blks2_pfb_arb_resampler.xml b/grc/blocks/blks2_pfb_arb_resampler.xml
index 062b0dd98..b4e09791f 100644
--- a/grc/blocks/blks2_pfb_arb_resampler.xml
+++ b/grc/blocks/blks2_pfb_arb_resampler.xml
@@ -14,7 +14,10 @@
 	$taps,
 	$size,
 )</make>
-	<callback>set_taps($taps)</callback>
+	<!-- Set taps not implemented yet 
+           <callback>set_taps($taps)</callback>
+         -->
+	<callback>set_rate($rate)</callback>
 	<param>
 		<name>Resample Rate</name>
 		<key>rate</key>
diff --git a/grc/blocks/gr_goertzel_fc.xml b/grc/blocks/gr_goertzel_fc.xml
index 2105445d1..f27d9582e 100644
--- a/grc/blocks/gr_goertzel_fc.xml
+++ b/grc/blocks/gr_goertzel_fc.xml
@@ -9,6 +9,8 @@
 	<key>gr_goertzel_fc</key>
 	<import>from gnuradio import gr</import>
 	<make>gr.goertzel_fc($rate, $len, $freq)</make>
+        <callback>set_freq($freq)</callback>
+        <callback>set_rate($rate)</callback>
 	<param>
 		<name>Rate</name>
 		<key>rate</key>
diff --git a/grc/freedesktop/Makefile.am b/grc/freedesktop/Makefile.am
index f6aa97a93..dd7411bbb 100644
--- a/grc/freedesktop/Makefile.am
+++ b/grc/freedesktop/Makefile.am
@@ -39,8 +39,8 @@ dist_pkglibexec_SCRIPTS = grc_setup_freedesktop
 grc_setup_freedesktop: $(srcdir)/grc_setup_freedesktop.in Makefile
 	sed -e 's|@SRCDIR[@]|$(ourdatadir)|g' $< > $@
 
-EXTRA_DIST = $(srcdir)/grc_setup_freedesktop.in
-BUILT_SOURCES = grc_setup_freedesktop
+EXTRA_DIST += $(srcdir)/grc_setup_freedesktop.in
+BUILT_SOURCES += grc_setup_freedesktop
 
 install-data-hook:
 	@printf "\n*** GRC Post-Install Message ***\
diff --git a/grc/python/Generator.py b/grc/python/Generator.py
index acd98ef84..d53802bef 100644
--- a/grc/python/Generator.py
+++ b/grc/python/Generator.py
@@ -58,7 +58,7 @@ class Generator(object):
 	def write(self):
 		#do throttle warning
 		all_keys = ' '.join(map(lambda b: b.get_key(), self._flow_graph.get_enabled_blocks()))
-		if ('usrp' not in all_keys) and ('audio' not in all_keys) and ('throttle' not in all_keys) and self._generate_options != 'hb':
+		if ('usrp' not in all_keys) and ('uhd' not in all_keys) and ('audio' not in all_keys) and ('throttle' not in all_keys) and self._generate_options != 'hb':
 			Messages.send_warning('''\
 This flow graph may not have flow control: no audio or usrp blocks found. \
 Add a Misc->Throttle block to your flow graph to avoid CPU congestion.''')