saymrwulf/uhd
1
0
Fork 0
mirror of https://github.com/saymrwulf/uhd.git synced 2026-05-16 21:10:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'maint'

Browse source 
Conflicts:
	host/include/uhd/transport/nirio/nirio_driver_iface.h
This commit is contained in:
Martin Braun 2015-07-20 13:07:33 -07:00
commit af42e93a6e
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
host/docs/octoclock.dox
View file

@ -92,8 +92,8 @@ The same applies for an external signal.
\subsection available_sensors Available Sensors
The following sensors are available on both the OctoClock and Octoclock-G; these can be queried through the
<a href="classuhd_1_1octoclock.html">API</a>.
The following sensors are available on both the OctoClock and Octoclock-G;
these can be queried through the API (see uhd::usrp_clock::multi_usrp_clock::get_sensor()).
- `ext_ref_detected:` whether or not the device detects an external reference
- `gps_detected:` whether or not the device detects an internal GPSDO

6
host/lib/usrp/e300/e300_eeprom_manager.cpp
View file

@ -38,7 +38,7 @@ static void _string_to_bytes(const std::string &string, size_t max_len, boost::u
for (size_t i = 0; i < len; i++){
buffer[i] = string[i];
}
if (len < max_len - 1)
if (len < max_len)
buffer[len] = '\0';
}
@ -226,10 +226,10 @@ std::string e300_eeprom_manager::get_mb_type_string(void) const
_mb_eeprom["product"]);
switch (product) {
case E300_MB_PID:
return "E300";
return "E3XX";
case E310_MB_PID:
return "E310";
return "E3XX";
default:
return "UNKNOWN";