From 893f946b7a652497994309092fe84fb33504852c Mon Sep 17 00:00:00 2001
From: Thomas Tsou
Date: Fri, 19 Aug 2011 14:50:55 -0700
Subject: gr-uhd: add async metadata source block

Add asynchronous message "block" that is independent of normal
gnuradio scheduler. The block instantiates a thread to wait
for asynchronous messages from UHD and encapsulates them in a
gr_message posted into a message queue.

The interface is empty because the block is internally driven
and accessed through the the constructor specified message
queue.
---
 gr-uhd/grc/Makefile.am         |  1 +
 gr-uhd/grc/uhd_amsg_source.xml | 24 ++++++++++++++++++++++++
 gr-uhd/grc/uhd_block_tree.xml  |  1 +
 3 files changed, 26 insertions(+)
 create mode 100644 gr-uhd/grc/uhd_amsg_source.xml

(limited to 'gr-uhd/grc')

diff --git a/gr-uhd/grc/Makefile.am b/gr-uhd/grc/Makefile.am
index 7e73a5b39..42a35b1c1 100644
--- a/gr-uhd/grc/Makefile.am
+++ b/gr-uhd/grc/Makefile.am
@@ -31,6 +31,7 @@ BUILT_SOURCES += $(generated_uhd_usrp_blocks)
 
 dist_grcblocks_DATA = \
 	uhd_block_tree.xml \
+	uhd_amsg_source.xml \
 	$(BUILT_SOURCES)
 
 ########################################################################
diff --git a/gr-uhd/grc/uhd_amsg_source.xml b/gr-uhd/grc/uhd_amsg_source.xml
new file mode 100644
index 000000000..78c9d7b58
--- /dev/null
+++ b/gr-uhd/grc/uhd_amsg_source.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<block>
+	<name>UHD: USRP Async Msg Source</name>
+	<key>uhd_amsg_source</key>
+	<import>from gnuradio import uhd</import>
+	<make>uhd.amsg_source(device_addr=$dev_addr, msgq=$(id)_msgq_out)</make>
+	<param>
+		<name>Device Addr</name>
+		<key>dev_addr</key>
+		<value></value>
+		<type>string</type>
+		<hide>
+			#if $dev_addr()
+				none
+			#else
+				part
+			#end if
+		</hide>
+	</param>
+        <source>
+                <name>out</name>
+                <type>msg</type>
+        </source>
+</block>
diff --git a/gr-uhd/grc/uhd_block_tree.xml b/gr-uhd/grc/uhd_block_tree.xml
index 8a9f62f7c..5d3b49393 100644
--- a/gr-uhd/grc/uhd_block_tree.xml
+++ b/gr-uhd/grc/uhd_block_tree.xml
@@ -10,5 +10,6 @@
 		<name>UHD</name>
 		<block>uhd_usrp_source</block>
 		<block>uhd_usrp_sink</block>
+		<block>uhd_amsg_source</block>
 	</cat>
 </cat>
-- 
cgit 


From 0ea25051b5126d9761e49ceeb0e5d76aaecd2ca3 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Sat, 20 Aug 2011 18:43:56 -0700
Subject: uhd: changes to support amsg block w/ cmake

---
 gr-uhd/grc/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gr-uhd/grc')

diff --git a/gr-uhd/grc/CMakeLists.txt b/gr-uhd/grc/CMakeLists.txt
index 9e1cdb015..d89b8d77e 100644
--- a/gr-uhd/grc/CMakeLists.txt
+++ b/gr-uhd/grc/CMakeLists.txt
@@ -39,6 +39,7 @@ ADD_CUSTOM_TARGET(uhd_grc_xml_blocks ALL DEPENDS ${xml_blocks})
 
 INSTALL(FILES
     ${xml_blocks}
+    uhd_amsg_source.xml
     uhd_block_tree.xml
     DESTINATION ${GRC_BLOCKS_DIR}
     COMPONENT "uhd_python"
-- 
cgit 


From 91ace5a39a171ec7367c4030a1739d2f709eaed6 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Thu, 22 Sep 2011 20:03:47 -0700
Subject: uhd: added documentation and tag implementations

---
 gr-uhd/grc/gen_uhd_usrp_blocks.py | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'gr-uhd/grc')

diff --git a/gr-uhd/grc/gen_uhd_usrp_blocks.py b/gr-uhd/grc/gen_uhd_usrp_blocks.py
index c77df6c97..b6bc5fb79 100644
--- a/gr-uhd/grc/gen_uhd_usrp_blocks.py
+++ b/gr-uhd/grc/gen_uhd_usrp_blocks.py
@@ -256,6 +256,8 @@ The center frequency is the overall frequency of the RF chain. \\
 For greater control of how the UHD tunes elements in the RF chain, \\
 pass a tune_request object rather than a simple target frequency.
 Tuning with an LO offset example: uhd.tune_request(freq, lo_off)
+Tuning without DSP: uhd.tune_request(target_freq, dsp_freq=0, \\
+dsp_freq_policy=uhd.tune_request.POLICY_MANUAL)
 
 Antenna:
 For subdevices with only one antenna, this may be left blank. \\
@@ -266,6 +268,9 @@ Bandwidth:
 To use the default bandwidth filter setting, this should be zero. \\
 Only certain subdevices have configurable bandwidth filters. \\
 See the daughterboard application notes for possible configurations.
+
+See the UHD manual for more detailed documentation:
+http://code.ettus.com/redmine/ettus/projects/uhd/wiki
 	</doc>
 </block>
 """
-- 
cgit