summaryrefslogtreecommitdiff
path: root/usrp
diff options
context:
space:
mode:
authorEric Blossom2009-09-04 15:51:52 -0700
committerEric Blossom2009-09-04 15:51:52 -0700
commita1d9c0b4de66eadfdd3f6a217af80f7eb4e22772 (patch)
tree3616fe6e717db881ae98041be8daeb22260c2705 /usrp
parent6528672f2db205b6127f05ad7c7b9da66661b498 (diff)
parent7cb806f71a3bcc52c3c2e5688a9b6b48e3401615 (diff)
downloadgnuradio-a1d9c0b4de66eadfdd3f6a217af80f7eb4e22772.tar.gz
gnuradio-a1d9c0b4de66eadfdd3f6a217af80f7eb4e22772.tar.bz2
gnuradio-a1d9c0b4de66eadfdd3f6a217af80f7eb4e22772.zip
Merge branch 'new_eth' of http://gnuradio.org/git/matt into new_eth
* 'new_eth' of http://gnuradio.org/git/matt: properly set the address filter stop sending short ethernet command packets. Fix problem with commands timing out (specifically stop_rx_streaming) Fix race condition that caused commands such as stop_rx_streaming to fail. Fixing a line in the clock recovery algorithm. This works with a bit larger error than there proably should be. Better fix for broken AC_PROG_F77 macro Fix Python header check failure due to invalid cached state waterfall and fft use a common autoscale function Fix so that the waterfall texture is initialized with a buffer of the same size. Modifications to usrp2 source and sink so that set center freq is called afer set lo offset. Modifications to the usrp blocks and wrapper so that the lo offset is set with the lo frequency. Removed subversion related configuration info. Expand frequency ranges to match hardware capability. Modified log power fft block so ref scale is peak to peak. Adding clock sync algorithm using PFB. This works, but needs a bit more work.
Diffstat (limited to 'usrp')
-rw-r--r--usrp/host/lib/db_flexrf.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/usrp/host/lib/db_flexrf.cc b/usrp/host/lib/db_flexrf.cc
index a8f4684b5..2d2bfabbb 100644
--- a/usrp/host/lib/db_flexrf.cc
+++ b/usrp/host/lib/db_flexrf.cc
@@ -668,7 +668,7 @@ _2400_common::freq_min()
double
_2400_common::freq_max()
{
- return 2700e6;
+ return 2900e6;
}
//----------------------------------------------------------------------
@@ -700,7 +700,7 @@ _1200_common::freq_min()
double
_1200_common::freq_max()
{
- return 1350e6;
+ return 1450e6;
}
//-------------------------------------------------------------------------
@@ -726,13 +726,13 @@ _1800_common::_1800_common()
double
_1800_common::freq_min()
{
- return 1600e6;
+ return 1500e6;
}
double
_1800_common::freq_max()
{
- return 2000e6;
+ return 2100e6;
}
//-------------------------------------------------------------------------
@@ -758,13 +758,13 @@ _900_common::_900_common()
double
_900_common::freq_min()
{
- return 800e6;
+ return 750e6;
}
double
_900_common::freq_max()
{
- return 1000e6;
+ return 1050e6;
}
//-------------------------------------------------------------------------