From b5c1edfd488ccdd8a2c6ff5a2efb3de35a048d67 Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Tue, 16 Mar 2010 19:43:08 -0700
Subject: added set center freq call
---
gr-uhd/grc/uhd_simple_sink.xml | 9 ++++++++-
gr-uhd/grc/uhd_simple_source.xml | 9 ++++++++-
gr-uhd/lib/uhd_simple_sink.cc | 4 ++++
gr-uhd/lib/uhd_simple_sink.h | 2 ++
gr-uhd/lib/uhd_simple_source.cc | 4 ++++
gr-uhd/lib/uhd_simple_source.h | 2 ++
6 files changed, 28 insertions(+), 2 deletions(-)
(limited to 'gr-uhd')
diff --git a/gr-uhd/grc/uhd_simple_sink.xml b/gr-uhd/grc/uhd_simple_sink.xml
index 078288e04a..cad6194ee1 100644
--- a/gr-uhd/grc/uhd_simple_sink.xml
+++ b/gr-uhd/grc/uhd_simple_sink.xml
@@ -10,8 +10,10 @@
<category>UHD</category>
<import>from gnuradio import uhd</import>
<make>uhd.simple_sink($args, "$type.type")
-self.$(id).set_samp_rate($samp_rate)</make>
+self.$(id).set_samp_rate($samp_rate)
+self.$(id).set_center_freq($center_freq)</make>
<callback>set_samp_rate($samp_rate)</callback>
+ <callback>set_center_freq($center_freq)</callback>
<param>
<name>Input Type</name>
<key>type</key>
@@ -41,6 +43,11 @@ self.$(id).set_samp_rate($samp_rate)</make>
<value>samp_rate</value>
<type>real</type>
</param>
+ <param>
+ <name>Center Freq (Hz)</name>
+ <key>center_freq</key>
+ <type>real</type>
+ </param>
<sink>
<name>out</name>
<type>$type</type>
diff --git a/gr-uhd/grc/uhd_simple_source.xml b/gr-uhd/grc/uhd_simple_source.xml
index 45496b0982..519b7ad6c4 100644
--- a/gr-uhd/grc/uhd_simple_source.xml
+++ b/gr-uhd/grc/uhd_simple_source.xml
@@ -10,8 +10,10 @@
<category>UHD</category>
<import>from gnuradio import uhd</import>
<make>uhd.simple_source($args, "$type.type")
-self.$(id).set_samp_rate($samp_rate)</make>
+self.$(id).set_samp_rate($samp_rate)
+self.$(id).set_center_freq($center_freq)</make>
<callback>set_samp_rate($samp_rate)</callback>
+ <callback>set_center_freq($center_freq)</callback>
<param>
<name>Output Type</name>
<key>type</key>
@@ -41,6 +43,11 @@ self.$(id).set_samp_rate($samp_rate)</make>
<value>samp_rate</value>
<type>real</type>
</param>
+ <param>
+ <name>Center Freq (Hz)</name>
+ <key>center_freq</key>
+ <type>real</type>
+ </param>
<source>
<name>out</name>
<type>$type</type>
diff --git a/gr-uhd/lib/uhd_simple_sink.cc b/gr-uhd/lib/uhd_simple_sink.cc
index c1edf29bb5..f208bd2944 100644
--- a/gr-uhd/lib/uhd_simple_sink.cc
+++ b/gr-uhd/lib/uhd_simple_sink.cc
@@ -66,6 +66,10 @@ double uhd_simple_sink::get_samp_rate(void){
return _dev->get_tx_rate();
}
+void uhd_simple_sink::set_center_freq(double freq){
+ _dev->set_tx_freq(freq);
+}
+
/***********************************************************************
* Work
**********************************************************************/
diff --git a/gr-uhd/lib/uhd_simple_sink.h b/gr-uhd/lib/uhd_simple_sink.h
index 301cdd24f1..28965d8706 100644
--- a/gr-uhd/lib/uhd_simple_sink.h
+++ b/gr-uhd/lib/uhd_simple_sink.h
@@ -39,6 +39,8 @@ public:
void set_samp_rate(double rate);
double get_samp_rate(void);
+ void set_center_freq(double freq);
+
int work(
int noutput_items,
gr_vector_const_void_star &input_items,
diff --git a/gr-uhd/lib/uhd_simple_source.cc b/gr-uhd/lib/uhd_simple_source.cc
index 827cad4585..1a0bb2b61b 100644
--- a/gr-uhd/lib/uhd_simple_source.cc
+++ b/gr-uhd/lib/uhd_simple_source.cc
@@ -68,6 +68,10 @@ double uhd_simple_source::get_samp_rate(void){
return _dev->get_rx_rate();
}
+void uhd_simple_source::set_center_freq(double freq){
+ _dev->set_rx_freq(freq);
+}
+
/***********************************************************************
* Work
**********************************************************************/
diff --git a/gr-uhd/lib/uhd_simple_source.h b/gr-uhd/lib/uhd_simple_source.h
index 0ddf9d5633..cfab8b7a48 100644
--- a/gr-uhd/lib/uhd_simple_source.h
+++ b/gr-uhd/lib/uhd_simple_source.h
@@ -39,6 +39,8 @@ public:
void set_samp_rate(double rate);
double get_samp_rate(void);
+ void set_center_freq(double freq);
+
int work(
int noutput_items,
gr_vector_const_void_star &input_items,
--
cgit v1.2.3