diff options
| -rw-r--r-- | host/include/uhd/usrp/usrp.h | 2 | ||||
| -rw-r--r-- | host/include/uhd/version.hpp.in | 8 | ||||
| -rwxr-xr-x | host/lib/rfnoc/nocscript/gen_basic_funcs.py | 8 | ||||
| -rw-r--r-- | host/lib/utils/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | host/lib/utils/gain_group.cpp | 8 | ||||
| -rw-r--r-- | host/utils/uhd_images_downloader.py.in | 6 |
6 files changed, 24 insertions, 12 deletions
diff --git a/host/include/uhd/usrp/usrp.h b/host/include/uhd/usrp/usrp.h index f24d12b85..bb186a278 100644 --- a/host/include/uhd/usrp/usrp.h +++ b/host/include/uhd/usrp/usrp.h @@ -30,6 +30,8 @@ #include <uhd/usrp/mboard_eeprom.h> #include <uhd/usrp/dboard_eeprom.h> #include <uhd/usrp/subdev_spec.h> +/* version.hpp is safe to include in C: */ +#include <uhd/version.hpp> /* Provides UHD_VERSION */ #include <stdbool.h> #include <stdlib.h> diff --git a/host/include/uhd/version.hpp.in b/host/include/uhd/version.hpp.in index f63d973e9..c16739a78 100644 --- a/host/include/uhd/version.hpp.in +++ b/host/include/uhd/version.hpp.in @@ -18,9 +18,6 @@ #ifndef INCLUDED_UHD_VERSION_HPP #define INCLUDED_UHD_VERSION_HPP -#include <uhd/config.hpp> -#include <string> - /*! * The ABI version string that the client application builds against. * Call get_abi_string() to check this against the library build. @@ -36,6 +33,10 @@ */ #define UHD_VERSION @UHD_VERSION_ADDED@ +#ifdef __cplusplus +#include <uhd/config.hpp> +#include <string> + namespace uhd{ //! Get the version string (dotted version number + build info) @@ -45,5 +46,6 @@ namespace uhd{ UHD_API std::string get_abi_string(void); } //namespace uhd +#endif #endif /* INCLUDED_UHD_VERSION_HPP */ diff --git a/host/lib/rfnoc/nocscript/gen_basic_funcs.py b/host/lib/rfnoc/nocscript/gen_basic_funcs.py index 702b3e884..e4971d2e9 100755 --- a/host/lib/rfnoc/nocscript/gen_basic_funcs.py +++ b/host/lib/rfnoc/nocscript/gen_basic_funcs.py @@ -331,9 +331,9 @@ REGISTER_COMMANDS_TEMPLATE = """ );""" DOXY_TEMPLATE = """/*! \page page_nocscript_funcs NocScript Function Reference -% for cat, func_by_name in func_list_tree.iteritems(): +% for cat, func_by_name in func_list_tree.items(): - ${cat} -% for func_name, func_info_list in func_by_name.iteritems(): +% for func_name, func_info_list in func_by_name.items(): - ${func_name}: ${func_info_list[0]['docstring']} % for func_info in func_info_list: - ${func_info['arglist']} -> ${func_info['retval']} @@ -452,9 +452,9 @@ def write_manual_file(output_filename): func_list = prep_function_list() func_list_tree = {} for func in func_list: - if not func_list_tree.has_key(func['category']): + if func['category'] not in func_list_tree: func_list_tree[func['category']] = {} - if not func_list_tree[func['category']].has_key(func['name']): + if func['name'] not in func_list_tree[func['category']]: func_list_tree[func['category']][func['name']] = [] func_list_tree[func['category']][func['name']].append(func) open(output_filename, 'w').write(parse_tmpl(DOXY_TEMPLATE, func_list_tree=func_list_tree)) diff --git a/host/lib/utils/CMakeLists.txt b/host/lib/utils/CMakeLists.txt index 790ef72ad..128d7c00a 100644 --- a/host/lib/utils/CMakeLists.txt +++ b/host/lib/utils/CMakeLists.txt @@ -116,8 +116,8 @@ SET_SOURCE_FILES_PROPERTIES( ######################################################################## # Define UHD_PKG_DATA_PATH for paths.cpp ######################################################################## -FILE(TO_NATIVE_PATH ${CMAKE_INSTALL_PREFIX} UHD_PKG_PATH) -STRING(REPLACE "\\" "\\\\" UHD_PKG_PATH ${UHD_PKG_PATH}) +FILE(TO_NATIVE_PATH "${CMAKE_INSTALL_PREFIX}" UHD_PKG_PATH) +STRING(REPLACE "\\" "\\\\" UHD_PKG_PATH "${UHD_PKG_PATH}") STRING(REGEX MATCH ".*/.*" SLASH "${LIB_SUFFIX}") IF(SLASH STREQUAL "") diff --git a/host/lib/utils/gain_group.cpp b/host/lib/utils/gain_group.cpp index 9428702d1..71caf33be 100644 --- a/host/lib/utils/gain_group.cpp +++ b/host/lib/utils/gain_group.cpp @@ -39,7 +39,7 @@ static bool compare_by_step_size( * * Due to small doubleing-point inaccuracies: * num = n*step + e, where e is a small inaccuracy. - * When e is negative, floor would yeild (n-1)*step, + * When e is negative, floor would yield (n-1)*step, * despite that n*step is really the desired result. * This function is designed to mitigate that issue. * @@ -49,7 +49,11 @@ static bool compare_by_step_size( * \return a multiple of step approximating num */ template <typename T> static T floor_step(T num, T step, T e = T(0.001)){ - return step*int(num/step + e); + if (num < T(0)) { + return step*int(num/step - e); + } else { + return step*int(num/step + e); + } } gain_group::~gain_group(void){ diff --git a/host/utils/uhd_images_downloader.py.in b/host/utils/uhd_images_downloader.py.in index 7a3ff8ddf..593f7759f 100644 --- a/host/utils/uhd_images_downloader.py.in +++ b/host/utils/uhd_images_downloader.py.in @@ -91,8 +91,12 @@ class uhd_images_downloader(): filesize_dl += len(buff) if print_progress: status = r"%05d kB / %05d kB (%03d%%)" % (int(math.ceil(filesize_dl/1000.)), int(math.ceil(filesize/1000.)), int(math.ceil(filesize_dl*100.)/filesize)) - status += chr(8)*(len(status)+1) + if os.name == "nt": + status += chr(8)*(len(status)+1) + else: + sys.stdout.write("\x1b[2K\r") #Clear previos line sys.stdout.write(status) + sys.stdout.flush() if print_progress: print('') return (filesize, filesize_dl) |