summaryrefslogtreecommitdiffstats
path: root/host
diff options
context:
space:
mode:
Diffstat (limited to 'host')
-rw-r--r--host/CMakeLists.txt4
-rw-r--r--host/cmake/Modules/UHDPackage.cmake16
-rw-r--r--host/docs/usrp_b200.rst74
-rw-r--r--host/lib/transport/nirio/rpc/rpc_client.cpp5
-rw-r--r--host/lib/usrp/x300/x300_impl.cpp4
-rw-r--r--host/lib/utils/log.cpp6
6 files changed, 101 insertions, 8 deletions
diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt
index b53e6208e..1973f7b0a 100644
--- a/host/CMakeLists.txt
+++ b/host/CMakeLists.txt
@@ -210,8 +210,8 @@ UHD_INSTALL(FILES
# Images download directory for utils/uhd_images_downloader.py
########################################################################
-SET(UHD_IMAGES_MD5SUM "6a51f54fb440860f3023fc888c6a5898")
-SET(UHD_IMAGES_DOWNLOAD_SRC "http://files.ettus.com/binaries/maint_images/archive/uhd-images_003.007.001-release.zip")
+SET(UHD_IMAGES_MD5SUM "fb5b36972c453e5b7954879873bbcf74")
+SET(UHD_IMAGES_DOWNLOAD_SRC "http://files.ettus.com/binaries/maint_images/archive/uhd-images_003.007.001-20-g468e7f35.zip")
########################################################################
# Register top level components
diff --git a/host/cmake/Modules/UHDPackage.cmake b/host/cmake/Modules/UHDPackage.cmake
index 8422c24d6..d1c0fc099 100644
--- a/host/cmake/Modules/UHDPackage.cmake
+++ b/host/cmake/Modules/UHDPackage.cmake
@@ -87,7 +87,21 @@ IF(${CPACK_GENERATOR} STREQUAL NSIS)
include(CheckTypeSize)
check_type_size("void*[8]" BIT_WIDTH BUILTIN_TYPES_ONLY)
- SET(CPACK_PACKAGE_FILE_NAME "uhd_${UHD_VERSION}_Win${BIT_WIDTH}")
+ # If CMake option given, specify MSVC version in installer filename
+ IF(SPECIFY_MSVC_VERSION)
+ IF(MSVC90) # Visual Studio 2008 (9.0)
+ SET(MSVC_VERSION "VS2008")
+ ELSEIF(MSVC10) # Visual Studio 2010 (10.0)
+ SET(MSVC_VERSION "VS2010")
+ ELSEIF(MSVC11) # Visual Studio 2012 (11.0)
+ SET(MSVC_VERSION "VS2012")
+ ELSEIF(MSVC12) # Visual Studio 2013 (12.0)
+ SET(MSVC_VERSION "VS2013")
+ ENDIF()
+ SET(CPACK_PACKAGE_FILE_NAME "uhd_${UHD_VERSION}_Win${BIT_WIDTH}_${MSVC_VERSION}")
+ ELSE()
+ SET(CPACK_PACKAGE_FILE_NAME "uhd_${UHD_VERSION}_Win${BIT_WIDTH}")
+ ENDIF(SPECIFY_MSVC_VERSION)
SET(CPACK_PACKAGE_INSTALL_DIRECTORY "${CMAKE_PROJECT_NAME}")
ENDIF()
diff --git a/host/docs/usrp_b200.rst b/host/docs/usrp_b200.rst
index b282ec424..327bbb6df 100644
--- a/host/docs/usrp_b200.rst
+++ b/host/docs/usrp_b200.rst
@@ -76,3 +76,77 @@ and the transmit frontends have 89.5 dB of available gain.
Gain settings are application specific,
but it is recommended that users consider using at least
half of the available gain to get reasonable dynamic range.
+
+------------------------------------------------------------------------
+Hardware Reference
+------------------------------------------------------------------------
+
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LED Indicators
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Below is a table of the LED indicators and their meanings:
+
+=============== ======================== ========================================================
+Component ID Description Details
+=============== ======================== ========================================================
+ LED600 Power Indicator | off = no power applied
+ | red = power applied (external or USB)
+ LED800 Channel 2 RX2 Activity | off = no activity
+ | green = receiving
+ LED801 Channel 2 TX/RX Activity | off = no activity
+ | green = receiving
+ | red = transmitting
+ | orange = switching between transmitting and receiving
+ LED802 Channel 1 TX/RX Activity | off = no activity
+ | green = receiving
+ | red = transmitting
+ | orange = switching between transmitting and receiving
+ LED803 Channel 1 RX2 Activity | off = no activity
+ | green = receiving
+ LED100 GPS lock indicator | off = no lock
+ | green = lock
+=============== ======================== ========================================================
+
+TX LED indicators are on when transimitting data and off when no samples are available to transmit. RX LED indicators are on when sending samples to the host and off when unable to do so. This means that TX/RX activity LED indicators will blink off in a temporary transmit underflow or receive overflow condition, indicating that the host is not sending or receiving samples fast enough. The host will be notified of the condition and output a "U" or "O" as well.
+
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+External Connections
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Below is a table showing the external connections and respective power information:
+
+=============== ======================== ========================================================
+Component ID Description Details
+=============== ======================== ========================================================
+ J601 External Power | 6 V
+ | 3 A
+ J701 USB Connector | USB 3.0
+ J104 External PPS Input | 1.8 V - 5 V
+ J101 GPS Antenna | GPSDO will supply nominal voltage to antenna.
+ J100 External 10 MHz Input | +15 dBm max
+ J800 RF B: TX/RX | TX power +20dBm max
+ | RX power -15dBm max
+ J802 RF B: RX2 | RX power -15dBm max
+ J803 RF A: RX2 | RX power -15dBm max
+ J801 RF A: TX/RX | TX power +20dBm max
+ | RX power -15dBm max
+=============== ======================== ========================================================
+
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+On-Board Connectors and Switches
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Below is a table showing the on-board connectors and switches:
+
+=============== ======================== ========================================================
+Component ID Description Details
+=============== ======================== ========================================================
+ J502* Mictor Connector | Interface to FPGA for I/O and inspection.
+ J503* JTAG Header | Interface to FPGA for programming and debugging.
+ S700 FX3 Hard Reset Switch
+=============== ======================== ========================================================
+
+\* B210 Only
+
+
diff --git a/host/lib/transport/nirio/rpc/rpc_client.cpp b/host/lib/transport/nirio/rpc/rpc_client.cpp
index f8dc26b50..0c4b8fe3c 100644
--- a/host/lib/transport/nirio/rpc/rpc_client.cpp
+++ b/host/lib/transport/nirio/rpc/rpc_client.cpp
@@ -104,6 +104,11 @@ rpc_client::rpc_client (
} catch (boost::exception&) {
UHD_LOG << "rpc_client connection request cancelled/aborted." << std::endl;
_exec_err.assign(boost::asio::error::connection_aborted, boost::asio::error::get_system_category());
+#if BOOST_VERSION < 104700
+ } catch (std::exception& e) {
+ UHD_LOG << "rpc_client connection error: " << e.what() << std::endl;
+ _exec_err.assign(boost::asio::error::connection_aborted, boost::asio::error::get_system_category());
+#endif
}
}
diff --git a/host/lib/usrp/x300/x300_impl.cpp b/host/lib/usrp/x300/x300_impl.cpp
index e931b7983..698d98f55 100644
--- a/host/lib/usrp/x300/x300_impl.cpp
+++ b/host/lib/usrp/x300/x300_impl.cpp
@@ -1321,8 +1321,8 @@ void x300_impl::update_atr_leds(gpio_core_200_32wo::sptr leds, const std::string
{
const bool is_txrx = (rx_ant == "TX/RX");
const int rx_led = (1 << 2);
- const int txrx_led = (1 << 1);
- const int tx_led = (1 << 0);
+ const int tx_led = (1 << 1);
+ const int txrx_led = (1 << 0);
leds->set_atr_reg(dboard_iface::ATR_REG_IDLE, 0);
leds->set_atr_reg(dboard_iface::ATR_REG_RX_ONLY, is_txrx? txrx_led : rx_led);
leds->set_atr_reg(dboard_iface::ATR_REG_TX_ONLY, tx_led);
diff --git a/host/lib/utils/log.cpp b/host/lib/utils/log.cpp
index d6d1786c7..31ee0c991 100644
--- a/host/lib/utils/log.cpp
+++ b/host/lib/utils/log.cpp
@@ -1,5 +1,5 @@
//
-// Copyright 2012 Ettus Research LLC
+// Copyright 2012,2014 Ettus Research LLC
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -117,11 +117,11 @@ UHD_SINGLETON_FCN(log_resource_type, log_rs);
**********************************************************************/
//! get the relative file path from the host directory
static std::string get_rel_file_path(const fs::path &file){
- fs::path abs_path = file.branch_path();
+ fs::path abs_path = file.parent_path();
fs::path rel_path = file.leaf();
while (not abs_path.empty() and abs_path.leaf() != "host"){
rel_path = abs_path.leaf() / rel_path;
- abs_path = abs_path.branch_path();
+ abs_path = abs_path.parent_path();
}
return rel_path.string();
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-27 10:17:17 +0000