From ae0efeb9c39942027835980a2e7f271a3b9a557c Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Wed, 29 Jun 2011 18:29:53 -0700
Subject: uhd: added per motherboard reference source option (includes mimo
cable)
---
gr-uhd/grc/gen_uhd_usrp_blocks.py | 65 ++++++++++++++++++++++++++-------------
1 file changed, 44 insertions(+), 21 deletions(-)
diff --git a/gr-uhd/grc/gen_uhd_usrp_blocks.py b/gr-uhd/grc/gen_uhd_usrp_blocks.py
index 82b6aa964..20f3ba489 100644
--- a/gr-uhd/grc/gen_uhd_usrp_blocks.py
+++ b/gr-uhd/grc/gen_uhd_usrp_blocks.py
@@ -29,20 +29,34 @@ MAIN_TMPL = """\
io_type=uhd.io_type.\$type.type,
num_channels=\$nchan,
)
-\#if \$ref_clk()
-self.\$(id).set_clock_config(uhd.clock_config.external(), uhd.ALL_MBOARDS)
-\#end if
-\#if \$sync()
-self.\$(id).set_time_unknown_pps(uhd.time_spec())
-\#end if
\#if \$clock_rate()
self.\$(id).set_clock_rate(\$clock_rate, uhd.ALL_MBOARDS)
\#end if
#for $m in range($max_mboards)
+########################################################################
+\#if \$num_mboards() > $m and \$ref_source$(m)() == 'external'
+self.\$(id).set_clock_config(uhd.clock_config.external(), $m)
+\#end if
+########################################################################
+\#if \$num_mboards() > $m and \$ref_source$(m)() == 'internal'
+self.\$(id).set_clock_config(uhd.clock_config.internal(), $m)
+\#end if
+########################################################################
+\#if \$num_mboards() > $m and \$ref_source$(m)() == 'mimo'
+_config = uhd.clock_config
+_config.ref_source = uhd.clock_config.REF_MIMO
+_config.pps_source = uhd.clock_config.PPS_MIMO
+self.\$(id).set_clock_config(_config, $m)
+\#end if
+########################################################################
\#if \$num_mboards() > $m and \$sd_spec$(m)()
self.\$(id).set_subdev_spec(\$sd_spec$(m), $m)
\#end if
+########################################################################
#end for
+\#if \$sync()
+self.\$(id).set_time_unknown_pps(uhd.time_spec())
+\#end if
self.\$(id).set_samp_rate(\$samp_rate)
#for $n in range($max_nchan)
\#if \$nchan() > $n
@@ -94,21 +108,6 @@ self.\$(id).set_bandwidth(\$bw$(n), $n)
\#end if
-
- Ref Clock
- ref_clk
-
- enum
- \#if \$ref_clk() then 'none' else 'part'#
-
-
-
Sync
sync
@@ -149,6 +148,25 @@ self.\$(id).set_bandwidth(\$bw$(n), $n)
#end for
#for $m in range($max_mboards)
+
+ Mb$(m): Ref Source
+ ref_source$(m)
+
+ enum
+
+ \#if not \$num_mboards() > $m
+ all
+ \#elif \$ref_source$(m)()
+ none
+ \#else
+ part
+ \#end if
+
+
+
+
+
+
Mb$(m): Subdev Spec
sd_spec$(m)
@@ -209,6 +227,11 @@ USRP2 Example: addr0=192.168.10.2, addr1=192.168.10.3
Num Motherboards:
Selects the number of USRP motherboards in this device configuration.
+Reference Source:
+Where the motherboard should sync its time and clock references.
+If source and sink blocks reference the same device,
+it is only necessary to set the reference source on one of the blocks.
+
Subdevice specification:
Each motherboard should have its own subdevice specification \\
and all subdevice specifications should be the same length. \\
--
cgit
From b0a162579ededbcbc16889a4f948da6096564f26 Mon Sep 17 00:00:00 2001
From: Johnathan Corgan
Date: Sun, 3 Jul 2011 08:27:13 -0700
Subject: Fix URL in ChangeLog
---
ChangeLog | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index af3c825fb..170a7f7d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,7 +19,6 @@
# Boston, MA 02110-1301, USA.
#
-For the blow by blow changes for each file, please consult
-http://gnuradio.org/trac/timeline
-
-It's got everything that used to be in here ;)
+For the blow by blow changes for each file, please consult:
+
+http://gnuradio.org/redmine/projects/gnuradio/repository
--
cgit
From 0943610314d15abeecd0547de9541560bf373811 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Sun, 3 Jul 2011 11:35:16 -0700
Subject: uhd: typo fix for initing a new clock_config()
---
gr-uhd/grc/gen_uhd_usrp_blocks.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gr-uhd/grc/gen_uhd_usrp_blocks.py b/gr-uhd/grc/gen_uhd_usrp_blocks.py
index 20f3ba489..c77df6c97 100644
--- a/gr-uhd/grc/gen_uhd_usrp_blocks.py
+++ b/gr-uhd/grc/gen_uhd_usrp_blocks.py
@@ -43,7 +43,7 @@ self.\$(id).set_clock_config(uhd.clock_config.internal(), $m)
\#end if
########################################################################
\#if \$num_mboards() > $m and \$ref_source$(m)() == 'mimo'
-_config = uhd.clock_config
+_config = uhd.clock_config()
_config.ref_source = uhd.clock_config.REF_MIMO
_config.pps_source = uhd.clock_config.PPS_MIMO
self.\$(id).set_clock_config(_config, $m)
--
cgit
From f6fedf278c08fb0083808c6baf42ba2972a43ef1 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Sun, 3 Jul 2011 11:35:55 -0700
Subject: gr: added to the .gitignores to various components for in-tree builds
---
gr-qtgui/.gitignore | 1 +
gr-qtgui/lib/.gitignore | 1 +
gr-qtgui/swig/.gitignore | 2 ++
gr-uhd/.gitignore | 1 +
gruel/src/python/.gitignore | 1 +
gruel/src/swig/.gitignore | 2 ++
6 files changed, 8 insertions(+)
diff --git a/gr-qtgui/.gitignore b/gr-qtgui/.gitignore
index b336cc7ce..a37fc0c1a 100644
--- a/gr-qtgui/.gitignore
+++ b/gr-qtgui/.gitignore
@@ -1,2 +1,3 @@
/Makefile
/Makefile.in
+/*.pc
diff --git a/gr-qtgui/lib/.gitignore b/gr-qtgui/lib/.gitignore
index fc4f8cdfe..7754ad227 100644
--- a/gr-qtgui/lib/.gitignore
+++ b/gr-qtgui/lib/.gitignore
@@ -10,6 +10,7 @@
/spectrumdisplayform.ui.h
/FrequencyDisplayPlot.moc.cc
/ConstellationDisplayPlot.moc.cc
+/timedisplayform.moc.cc
/gnuradio
/guile
/python
diff --git a/gr-qtgui/swig/.gitignore b/gr-qtgui/swig/.gitignore
index 282522db0..26647d4c1 100644
--- a/gr-qtgui/swig/.gitignore
+++ b/gr-qtgui/swig/.gitignore
@@ -1,2 +1,4 @@
Makefile
Makefile.in
+/qtgui_swig.py
+/python
diff --git a/gr-uhd/.gitignore b/gr-uhd/.gitignore
index b336cc7ce..a37fc0c1a 100644
--- a/gr-uhd/.gitignore
+++ b/gr-uhd/.gitignore
@@ -1,2 +1,3 @@
/Makefile
/Makefile.in
+/*.pc
diff --git a/gruel/src/python/.gitignore b/gruel/src/python/.gitignore
index b336cc7ce..604b402c5 100644
--- a/gruel/src/python/.gitignore
+++ b/gruel/src/python/.gitignore
@@ -1,2 +1,3 @@
/Makefile
/Makefile.in
+/run_tests
diff --git a/gruel/src/swig/.gitignore b/gruel/src/swig/.gitignore
index b336cc7ce..f99fdb19b 100644
--- a/gruel/src/swig/.gitignore
+++ b/gruel/src/swig/.gitignore
@@ -1,2 +1,4 @@
/Makefile
/Makefile.in
+/python
+/pmt_swig.py
--
cgit