diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-05-11 10:32:46 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-05-11 10:32:46 -0700 |
| commit | 5df62fa9e8a86a7dc9c92c5bffa31faec94e5e03 (patch) | |
| tree | 74b18e07e1df95c049da45bc8f36c753024b0e8c | |
| parent | a151a7b78349bfe7954c664154dd59b70171b348 (diff) | |
| parent | 93011c14eb2a9bae0b90cfb21788487b12536f77 (diff) | |
| download | uhd-5df62fa9e8a86a7dc9c92c5bffa31faec94e5e03.tar.gz uhd-5df62fa9e8a86a7dc9c92c5bffa31faec94e5e03.tar.bz2 uhd-5df62fa9e8a86a7dc9c92c5bffa31faec94e5e03.zip | |
Merge branch 'maint'
Conflicts:
fpga-src
host/CMakeLists.txt
host/cmake/Modules/UHDVersion.cmake
| -rw-r--r-- | CHANGELOG | 8 | ||||
| -rw-r--r-- | host/lib/usrp/b200/b200_impl.hpp | 3 |
2 files changed, 9 insertions, 2 deletions
@@ -1,6 +1,14 @@ Change Log for Releases ============================== +## 003.008.004 +* B200: Fixed EEPROM writing bug, updated images for B200 Rev5/6 +* E300: GPS antenna power defaults to staying on, GPS time used as + default if available +* UBX: PDF frequency fix on X300 +* USRP2: Bugfix that allows latest UHD to work with USRP2 +* Documentation: Many fixes for E300 section, added FPGA manual + ## 003.008.003 * UBX: Fixed phase synchronization issues (Related changes: Change X300 daughterboard frequency, increase diff --git a/host/lib/usrp/b200/b200_impl.hpp b/host/lib/usrp/b200/b200_impl.hpp index f5a7b62e9..2491b36ad 100644 --- a/host/lib/usrp/b200/b200_impl.hpp +++ b/host/lib/usrp/b200/b200_impl.hpp @@ -55,8 +55,7 @@ static const double B200_DEFAULT_RATE = 250e3; // Sps static const double B200_DEFAULT_RX_GAIN = 0; // dB static const double B200_DEFAULT_TX_GAIN = 0; // dB static const boost::uint32_t B200_GPSDO_ST_NONE = 0x83; - -static const size_t B200_MAX_RATE_USB2 = 32000000; // bytes/s +static const size_t B200_MAX_RATE_USB2 = 53248000; // bytes/s static const size_t B200_MAX_RATE_USB3 = 500000000; // bytes/s #define FLIP_SID(sid) (((sid)<<16)|((sid)>>16)) |