osmocom-sdr

osmocom-sdr@lists.osmocom.org

3 participants
909 discussions

[PATCH 2/2] Remove Doxygen warnings.
by Ron Economos 28 Jan '21

28 Jan '21

Signed-off-by: Ron Economos <w6rz(a)comcast.net> --- include/osmosdr/source.h | 1 + lib/sink_iface.h | 1 + lib/source_iface.h | 2 ++ python/bindings/python_bindings.cc | 12 ++++++------ python/bindings/source_python.cc | 2 +- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/include/osmosdr/source.h b/include/osmosdr/source.h index 3ea716d..20c77b1 100644 --- a/include/osmosdr/source.h +++ b/include/osmosdr/source.h @@ -63,6 +63,7 @@ public: * * \param seek_point sample offset in file * \param whence one of SEEK_SET, SEEK_CUR, SEEK_END (man fseek) + * \param chan the channel index 0 to N-1 * \return true on success */ virtual bool seek( long seek_point, int whence, size_t chan = 0 ) = 0; diff --git a/lib/sink_iface.h b/lib/sink_iface.h index 39aabc7..15ea952 100644 --- a/lib/sink_iface.h +++ b/lib/sink_iface.h @@ -201,6 +201,7 @@ public: /*! * Select the active antenna of the underlying radio hardware. + * \param antenna the antenna name * \param chan the channel index 0 to N-1 * \return the actual antenna's name */ diff --git a/lib/source_iface.h b/lib/source_iface.h index abb70eb..14f05bb 100644 --- a/lib/source_iface.h +++ b/lib/source_iface.h @@ -43,6 +43,7 @@ public: * * \param seek_point sample offset in file * \param whence one of SEEK_SET, SEEK_CUR, SEEK_END (man fseek) + * \param chan the channel index 0 to N-1 * \return true on success */ virtual bool seek( long seek_point, int whence, size_t chan = 0 ) { return false; } @@ -210,6 +211,7 @@ public: /*! * Select the active antenna of the underlying radio hardware. + * \param antenna the antenna name * \param chan the channel index 0 to N-1 * \return the actual antenna's name */ diff --git a/python/bindings/python_bindings.cc b/python/bindings/python_bindings.cc index 7204b2b..428417d 100644 --- a/python/bindings/python_bindings.cc +++ b/python/bindings/python_bindings.cc @@ -16,9 +16,9 @@ namespace py = pybind11; // Headers for binding functions /**************************************/ -/* The following comment block is used for -/* gr_modtool to insert function prototypes -/* Please do not delete +// The following comment block is used for +// gr_modtool to insert function prototypes +// Please do not delete /**************************************/ // BINDING_FUNCTION_PROTOTYPES( void bind_sink(py::module& m); @@ -50,9 +50,9 @@ PYBIND11_MODULE(osmosdr_python, m) py::module::import("gnuradio.gr"); /**************************************/ - /* The following comment block is used for - /* gr_modtool to insert binding function calls - /* Please do not delete + // The following comment block is used for + // gr_modtool to insert binding function calls + // Please do not delete /**************************************/ // BINDING_FUNCTION_CALLS( bind_sink(m); diff --git a/python/bindings/source_python.cc b/python/bindings/source_python.cc index 48bf10c..0cab394 100644 --- a/python/bindings/source_python.cc +++ b/python/bindings/source_python.cc @@ -14,7 +14,7 @@ /* BINDTOOL_GEN_AUTOMATIC(1) */ /* BINDTOOL_USE_PYGCCXML(0) */ /* BINDTOOL_HEADER_FILE(source.h) */ -/* BINDTOOL_HEADER_FILE_HASH(574373c3c7682569b0fd7eea577739da) */ +/* BINDTOOL_HEADER_FILE_HASH(d1a3d9ea3d815fe4f18acc3eef21f1b6) */ /***********************************************************************************/ #include <pybind11/complex.h> -- 2.17.1

1 0

[PATCH 1/2] Remove CMake warnings.
by Ron Economos 28 Jan '21

28 Jan '21

Signed-off-by: Ron Economos <w6rz(a)comcast.net> --- CMakeLists.txt | 3 ++- cmake/Modules/FindLibAIRSPY.cmake | 6 ++++-- cmake/Modules/FindLibAIRSPYHF.cmake | 6 ++++-- cmake/Modules/FindLibHackRF.cmake | 6 ++++-- lib/CMakeLists.txt | 2 +- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b4bb535..96a2c90 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,8 +21,8 @@ # Project setup ######################################################################## cmake_minimum_required(VERSION 3.8) -include(GNUInstallDirs) project(gr-osmosdr CXX C) +include(GNUInstallDirs) enable_testing() #policy setup @@ -41,6 +41,7 @@ set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "") list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/Modules) # Find GNURadio (pmt and runtime are core, always included) +include(FindPkgConfig) find_package(Gnuradio "3.9" REQUIRED COMPONENTS blocks fft filter) # Set the version information here diff --git a/cmake/Modules/FindLibAIRSPY.cmake b/cmake/Modules/FindLibAIRSPY.cmake index 221edcc..437adc4 100644 --- a/cmake/Modules/FindLibAIRSPY.cmake +++ b/cmake/Modules/FindLibAIRSPY.cmake @@ -1,4 +1,6 @@ -INCLUDE(FindPkgConfig) +if(NOT PKG_CONFIG_FOUND) + INCLUDE(FindPkgConfig) +endif() PKG_CHECK_MODULES(PC_LIBAIRSPY libairspy) FIND_PATH( @@ -20,5 +22,5 @@ FIND_LIBRARY( ) INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBAIRSPY DEFAULT_MSG LIBAIRSPY_LIBRARIES LIBAIRSPY_INCLUDE_DIRS) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibAIRSPY DEFAULT_MSG LIBAIRSPY_LIBRARIES LIBAIRSPY_INCLUDE_DIRS) MARK_AS_ADVANCED(LIBAIRSPY_LIBRARIES LIBAIRSPY_INCLUDE_DIRS) diff --git a/cmake/Modules/FindLibAIRSPYHF.cmake b/cmake/Modules/FindLibAIRSPYHF.cmake index edb0dda..8c06128 100644 --- a/cmake/Modules/FindLibAIRSPYHF.cmake +++ b/cmake/Modules/FindLibAIRSPYHF.cmake @@ -1,4 +1,6 @@ -INCLUDE(FindPkgConfig) +if(NOT PKG_CONFIG_FOUND) + INCLUDE(FindPkgConfig) +endif() PKG_CHECK_MODULES(PC_LIBAIRSPYHF libairspyhf) FIND_PATH( @@ -20,5 +22,5 @@ FIND_LIBRARY( ) INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBAIRSPYHF DEFAULT_MSG LIBAIRSPYHF_LIBRARIES LIBAIRSPYHF_INCLUDE_DIRS) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibAIRSPYHF DEFAULT_MSG LIBAIRSPYHF_LIBRARIES LIBAIRSPYHF_INCLUDE_DIRS) MARK_AS_ADVANCED(LIBAIRSPYHF_LIBRARIES LIBAIRSPYHF_INCLUDE_DIRS) diff --git a/cmake/Modules/FindLibHackRF.cmake b/cmake/Modules/FindLibHackRF.cmake index a0d57ef..bc2bc3e 100644 --- a/cmake/Modules/FindLibHackRF.cmake +++ b/cmake/Modules/FindLibHackRF.cmake @@ -1,4 +1,6 @@ -INCLUDE(FindPkgConfig) +if(NOT PKG_CONFIG_FOUND) + INCLUDE(FindPkgConfig) +endif() PKG_CHECK_MODULES(PC_LIBHACKRF libhackrf) FIND_PATH( @@ -20,6 +22,6 @@ FIND_LIBRARY( ) INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBHACKRF DEFAULT_MSG LIBHACKRF_LIBRARIES LIBHACKRF_INCLUDE_DIRS) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibHackRF DEFAULT_MSG LIBHACKRF_LIBRARIES LIBHACKRF_INCLUDE_DIRS) MARK_AS_ADVANCED(LIBHACKRF_LIBRARIES LIBHACKRF_INCLUDE_DIRS) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 1bb8655..c7cfec3 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -44,7 +44,7 @@ endif() #this appends all unnamed implicit macro args! MACRO (APPEND_LIB_LIST) SET (gr_osmosdr_libs "${gr_osmosdr_libs};${ARGN}" CACHE INTERNAL "lib list") -ENDMACRO (APPEND_INTERNAL_LIST) +ENDMACRO (APPEND_LIB_LIST) set(gr_osmosdr_libs "" CACHE INTERNAL "lib that accumulates link targets") -- 2.17.1

1 0

[PATCH] Remove CMake and build noise.
by Ron Economos 28 Jan '21

28 Jan '21

Signed-off-by: Ron Economos <w6rz(a)comcast.net> --- CMakeLists.txt | 3 ++- cmake/Modules/FindLibAIRSPY.cmake | 6 ++++-- cmake/Modules/FindLibAIRSPYHF.cmake | 6 ++++-- cmake/Modules/FindLibHackRF.cmake | 6 ++++-- include/osmosdr/source.h | 1 + lib/CMakeLists.txt | 2 +- lib/sink_iface.h | 1 + lib/source_iface.h | 2 ++ python/bindings/python_bindings.cc | 12 ++++++------ python/bindings/source_python.cc | 2 +- 10 files changed, 26 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b4bb535..96a2c90 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,8 +21,8 @@ # Project setup ######################################################################## cmake_minimum_required(VERSION 3.8) -include(GNUInstallDirs) project(gr-osmosdr CXX C) +include(GNUInstallDirs) enable_testing() #policy setup @@ -41,6 +41,7 @@ set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "") list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/Modules) # Find GNURadio (pmt and runtime are core, always included) +include(FindPkgConfig) find_package(Gnuradio "3.9" REQUIRED COMPONENTS blocks fft filter) # Set the version information here diff --git a/cmake/Modules/FindLibAIRSPY.cmake b/cmake/Modules/FindLibAIRSPY.cmake index 221edcc..437adc4 100644 --- a/cmake/Modules/FindLibAIRSPY.cmake +++ b/cmake/Modules/FindLibAIRSPY.cmake @@ -1,4 +1,6 @@ -INCLUDE(FindPkgConfig) +if(NOT PKG_CONFIG_FOUND) + INCLUDE(FindPkgConfig) +endif() PKG_CHECK_MODULES(PC_LIBAIRSPY libairspy) FIND_PATH( @@ -20,5 +22,5 @@ FIND_LIBRARY( ) INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBAIRSPY DEFAULT_MSG LIBAIRSPY_LIBRARIES LIBAIRSPY_INCLUDE_DIRS) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibAIRSPY DEFAULT_MSG LIBAIRSPY_LIBRARIES LIBAIRSPY_INCLUDE_DIRS) MARK_AS_ADVANCED(LIBAIRSPY_LIBRARIES LIBAIRSPY_INCLUDE_DIRS) diff --git a/cmake/Modules/FindLibAIRSPYHF.cmake b/cmake/Modules/FindLibAIRSPYHF.cmake index edb0dda..8c06128 100644 --- a/cmake/Modules/FindLibAIRSPYHF.cmake +++ b/cmake/Modules/FindLibAIRSPYHF.cmake @@ -1,4 +1,6 @@ -INCLUDE(FindPkgConfig) +if(NOT PKG_CONFIG_FOUND) + INCLUDE(FindPkgConfig) +endif() PKG_CHECK_MODULES(PC_LIBAIRSPYHF libairspyhf) FIND_PATH( @@ -20,5 +22,5 @@ FIND_LIBRARY( ) INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBAIRSPYHF DEFAULT_MSG LIBAIRSPYHF_LIBRARIES LIBAIRSPYHF_INCLUDE_DIRS) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibAIRSPYHF DEFAULT_MSG LIBAIRSPYHF_LIBRARIES LIBAIRSPYHF_INCLUDE_DIRS) MARK_AS_ADVANCED(LIBAIRSPYHF_LIBRARIES LIBAIRSPYHF_INCLUDE_DIRS) diff --git a/cmake/Modules/FindLibHackRF.cmake b/cmake/Modules/FindLibHackRF.cmake index a0d57ef..bc2bc3e 100644 --- a/cmake/Modules/FindLibHackRF.cmake +++ b/cmake/Modules/FindLibHackRF.cmake @@ -1,4 +1,6 @@ -INCLUDE(FindPkgConfig) +if(NOT PKG_CONFIG_FOUND) + INCLUDE(FindPkgConfig) +endif() PKG_CHECK_MODULES(PC_LIBHACKRF libhackrf) FIND_PATH( @@ -20,6 +22,6 @@ FIND_LIBRARY( ) INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBHACKRF DEFAULT_MSG LIBHACKRF_LIBRARIES LIBHACKRF_INCLUDE_DIRS) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibHackRF DEFAULT_MSG LIBHACKRF_LIBRARIES LIBHACKRF_INCLUDE_DIRS) MARK_AS_ADVANCED(LIBHACKRF_LIBRARIES LIBHACKRF_INCLUDE_DIRS) diff --git a/include/osmosdr/source.h b/include/osmosdr/source.h index 3ea716d..20c77b1 100644 --- a/include/osmosdr/source.h +++ b/include/osmosdr/source.h @@ -63,6 +63,7 @@ public: * * \param seek_point sample offset in file * \param whence one of SEEK_SET, SEEK_CUR, SEEK_END (man fseek) + * \param chan the channel index 0 to N-1 * \return true on success */ virtual bool seek( long seek_point, int whence, size_t chan = 0 ) = 0; diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 1bb8655..c7cfec3 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -44,7 +44,7 @@ endif() #this appends all unnamed implicit macro args! MACRO (APPEND_LIB_LIST) SET (gr_osmosdr_libs "${gr_osmosdr_libs};${ARGN}" CACHE INTERNAL "lib list") -ENDMACRO (APPEND_INTERNAL_LIST) +ENDMACRO (APPEND_LIB_LIST) set(gr_osmosdr_libs "" CACHE INTERNAL "lib that accumulates link targets") diff --git a/lib/sink_iface.h b/lib/sink_iface.h index 39aabc7..15ea952 100644 --- a/lib/sink_iface.h +++ b/lib/sink_iface.h @@ -201,6 +201,7 @@ public: /*! * Select the active antenna of the underlying radio hardware. + * \param antenna the antenna name * \param chan the channel index 0 to N-1 * \return the actual antenna's name */ diff --git a/lib/source_iface.h b/lib/source_iface.h index abb70eb..14f05bb 100644 --- a/lib/source_iface.h +++ b/lib/source_iface.h @@ -43,6 +43,7 @@ public: * * \param seek_point sample offset in file * \param whence one of SEEK_SET, SEEK_CUR, SEEK_END (man fseek) + * \param chan the channel index 0 to N-1 * \return true on success */ virtual bool seek( long seek_point, int whence, size_t chan = 0 ) { return false; } @@ -210,6 +211,7 @@ public: /*! * Select the active antenna of the underlying radio hardware. + * \param antenna the antenna name * \param chan the channel index 0 to N-1 * \return the actual antenna's name */ diff --git a/python/bindings/python_bindings.cc b/python/bindings/python_bindings.cc index 7204b2b..428417d 100644 --- a/python/bindings/python_bindings.cc +++ b/python/bindings/python_bindings.cc @@ -16,9 +16,9 @@ namespace py = pybind11; // Headers for binding functions /**************************************/ -/* The following comment block is used for -/* gr_modtool to insert function prototypes -/* Please do not delete +// The following comment block is used for +// gr_modtool to insert function prototypes +// Please do not delete /**************************************/ // BINDING_FUNCTION_PROTOTYPES( void bind_sink(py::module& m); @@ -50,9 +50,9 @@ PYBIND11_MODULE(osmosdr_python, m) py::module::import("gnuradio.gr"); /**************************************/ - /* The following comment block is used for - /* gr_modtool to insert binding function calls - /* Please do not delete + // The following comment block is used for + // gr_modtool to insert binding function calls + // Please do not delete /**************************************/ // BINDING_FUNCTION_CALLS( bind_sink(m); diff --git a/python/bindings/source_python.cc b/python/bindings/source_python.cc index 48bf10c..0cab394 100644 --- a/python/bindings/source_python.cc +++ b/python/bindings/source_python.cc @@ -14,7 +14,7 @@ /* BINDTOOL_GEN_AUTOMATIC(1) */ /* BINDTOOL_USE_PYGCCXML(0) */ /* BINDTOOL_HEADER_FILE(source.h) */ -/* BINDTOOL_HEADER_FILE_HASH(574373c3c7682569b0fd7eea577739da) */ +/* BINDTOOL_HEADER_FILE_HASH(d1a3d9ea3d815fe4f18acc3eef21f1b6) */ /***********************************************************************************/ #include <pybind11/complex.h> -- 2.17.1

1 0

[PATCH] Remove CMake and build noise.
by Ron Economos 28 Jan '21

28 Jan '21

Signed-off-by: Ron Economos <w6rz(a)comcast.net> --- CMakeLists.txt | 3 ++- cmake/Modules/FindLibAIRSPY.cmake | 6 ++++-- cmake/Modules/FindLibAIRSPYHF.cmake | 6 ++++-- cmake/Modules/FindLibHackRF.cmake | 6 ++++-- include/osmosdr/source.h | 1 + lib/CMakeLists.txt | 2 +- lib/sink_iface.h | 1 + lib/source_iface.h | 2 ++ python/bindings/python_bindings.cc | 12 ++++++------ python/bindings/source_python.cc | 2 +- 10 files changed, 26 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b4bb535..96a2c90 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,8 +21,8 @@ # Project setup ######################################################################## cmake_minimum_required(VERSION 3.8) -include(GNUInstallDirs) project(gr-osmosdr CXX C) +include(GNUInstallDirs) enable_testing() #policy setup @@ -41,6 +41,7 @@ set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "") list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/Modules) # Find GNURadio (pmt and runtime are core, always included) +include(FindPkgConfig) find_package(Gnuradio "3.9" REQUIRED COMPONENTS blocks fft filter) # Set the version information here diff --git a/cmake/Modules/FindLibAIRSPY.cmake b/cmake/Modules/FindLibAIRSPY.cmake index 221edcc..437adc4 100644 --- a/cmake/Modules/FindLibAIRSPY.cmake +++ b/cmake/Modules/FindLibAIRSPY.cmake @@ -1,4 +1,6 @@ -INCLUDE(FindPkgConfig) +if(NOT PKG_CONFIG_FOUND) + INCLUDE(FindPkgConfig) +endif() PKG_CHECK_MODULES(PC_LIBAIRSPY libairspy) FIND_PATH( @@ -20,5 +22,5 @@ FIND_LIBRARY( ) INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBAIRSPY DEFAULT_MSG LIBAIRSPY_LIBRARIES LIBAIRSPY_INCLUDE_DIRS) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibAIRSPY DEFAULT_MSG LIBAIRSPY_LIBRARIES LIBAIRSPY_INCLUDE_DIRS) MARK_AS_ADVANCED(LIBAIRSPY_LIBRARIES LIBAIRSPY_INCLUDE_DIRS) diff --git a/cmake/Modules/FindLibAIRSPYHF.cmake b/cmake/Modules/FindLibAIRSPYHF.cmake index edb0dda..8c06128 100644 --- a/cmake/Modules/FindLibAIRSPYHF.cmake +++ b/cmake/Modules/FindLibAIRSPYHF.cmake @@ -1,4 +1,6 @@ -INCLUDE(FindPkgConfig) +if(NOT PKG_CONFIG_FOUND) + INCLUDE(FindPkgConfig) +endif() PKG_CHECK_MODULES(PC_LIBAIRSPYHF libairspyhf) FIND_PATH( @@ -20,5 +22,5 @@ FIND_LIBRARY( ) INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBAIRSPYHF DEFAULT_MSG LIBAIRSPYHF_LIBRARIES LIBAIRSPYHF_INCLUDE_DIRS) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibAIRSPYHF DEFAULT_MSG LIBAIRSPYHF_LIBRARIES LIBAIRSPYHF_INCLUDE_DIRS) MARK_AS_ADVANCED(LIBAIRSPYHF_LIBRARIES LIBAIRSPYHF_INCLUDE_DIRS) diff --git a/cmake/Modules/FindLibHackRF.cmake b/cmake/Modules/FindLibHackRF.cmake index a0d57ef..bc2bc3e 100644 --- a/cmake/Modules/FindLibHackRF.cmake +++ b/cmake/Modules/FindLibHackRF.cmake @@ -1,4 +1,6 @@ -INCLUDE(FindPkgConfig) +if(NOT PKG_CONFIG_FOUND) + INCLUDE(FindPkgConfig) +endif() PKG_CHECK_MODULES(PC_LIBHACKRF libhackrf) FIND_PATH( @@ -20,6 +22,6 @@ FIND_LIBRARY( ) INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBHACKRF DEFAULT_MSG LIBHACKRF_LIBRARIES LIBHACKRF_INCLUDE_DIRS) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibHackRF DEFAULT_MSG LIBHACKRF_LIBRARIES LIBHACKRF_INCLUDE_DIRS) MARK_AS_ADVANCED(LIBHACKRF_LIBRARIES LIBHACKRF_INCLUDE_DIRS) diff --git a/include/osmosdr/source.h b/include/osmosdr/source.h index 3ea716d..20c77b1 100644 --- a/include/osmosdr/source.h +++ b/include/osmosdr/source.h @@ -63,6 +63,7 @@ public: * * \param seek_point sample offset in file * \param whence one of SEEK_SET, SEEK_CUR, SEEK_END (man fseek) + * \param chan the channel index 0 to N-1 * \return true on success */ virtual bool seek( long seek_point, int whence, size_t chan = 0 ) = 0; diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 1bb8655..c7cfec3 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -44,7 +44,7 @@ endif() #this appends all unnamed implicit macro args! MACRO (APPEND_LIB_LIST) SET (gr_osmosdr_libs "${gr_osmosdr_libs};${ARGN}" CACHE INTERNAL "lib list") -ENDMACRO (APPEND_INTERNAL_LIST) +ENDMACRO (APPEND_LIB_LIST) set(gr_osmosdr_libs "" CACHE INTERNAL "lib that accumulates link targets") diff --git a/lib/sink_iface.h b/lib/sink_iface.h index 39aabc7..15ea952 100644 --- a/lib/sink_iface.h +++ b/lib/sink_iface.h @@ -201,6 +201,7 @@ public: /*! * Select the active antenna of the underlying radio hardware. + * \param antenna the antenna name * \param chan the channel index 0 to N-1 * \return the actual antenna's name */ diff --git a/lib/source_iface.h b/lib/source_iface.h index abb70eb..14f05bb 100644 --- a/lib/source_iface.h +++ b/lib/source_iface.h @@ -43,6 +43,7 @@ public: * * \param seek_point sample offset in file * \param whence one of SEEK_SET, SEEK_CUR, SEEK_END (man fseek) + * \param chan the channel index 0 to N-1 * \return true on success */ virtual bool seek( long seek_point, int whence, size_t chan = 0 ) { return false; } @@ -210,6 +211,7 @@ public: /*! * Select the active antenna of the underlying radio hardware. + * \param antenna the antenna name * \param chan the channel index 0 to N-1 * \return the actual antenna's name */ diff --git a/python/bindings/python_bindings.cc b/python/bindings/python_bindings.cc index 7204b2b..428417d 100644 --- a/python/bindings/python_bindings.cc +++ b/python/bindings/python_bindings.cc @@ -16,9 +16,9 @@ namespace py = pybind11; // Headers for binding functions /**************************************/ -/* The following comment block is used for -/* gr_modtool to insert function prototypes -/* Please do not delete +// The following comment block is used for +// gr_modtool to insert function prototypes +// Please do not delete /**************************************/ // BINDING_FUNCTION_PROTOTYPES( void bind_sink(py::module& m); @@ -50,9 +50,9 @@ PYBIND11_MODULE(osmosdr_python, m) py::module::import("gnuradio.gr"); /**************************************/ - /* The following comment block is used for - /* gr_modtool to insert binding function calls - /* Please do not delete + // The following comment block is used for + // gr_modtool to insert binding function calls + // Please do not delete /**************************************/ // BINDING_FUNCTION_CALLS( bind_sink(m); diff --git a/python/bindings/source_python.cc b/python/bindings/source_python.cc index 48bf10c..984ab8c 100644 --- a/python/bindings/source_python.cc +++ b/python/bindings/source_python.cc @@ -14,7 +14,7 @@ /* BINDTOOL_GEN_AUTOMATIC(1) */ /* BINDTOOL_USE_PYGCCXML(0) */ /* BINDTOOL_HEADER_FILE(source.h) */ -/* BINDTOOL_HEADER_FILE_HASH(574373c3c7682569b0fd7eea577739da) */ +/* BINDTOOL_HEADER_FILE_HASH(3e34b808713596a20401ddcccc7952d9) */ /***********************************************************************************/ #include <pybind11/complex.h> -- 2.17.1

1 1

Re: osmocom-sdr Digest, Vol 69, Issue 8
by 雪碧 0xroot 20 Jan '21

20 Jan '21

Dear Eric, Thank you so much for your speedy reply. Follow the link you gave, add > export > PYTHONPATH=/usr/local/lib/python3/dist-packages:/usr/local/lib/python3.6/dist-packages:$PYTHONPATH export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH > to .zshrc osmocom_fft -f 850e6 -s 2e6 > CPU Features: SSE2+ SSE4.1+ AVX+ FMA+ > Using avx for xtrxdsp_iq16_sc32 > Using avx for xtrxdsp_iq8_ic16 > Using avx for xtrxdsp_iq16_ic16i > Using avx for xtrxdsp_iq8_ic8i > Using avx for xtrxdsp_sc32i_iq16 > Using avx for xtrxdsp_iq8_sc32 > Using avx for xtrxdsp_iq8_sc32i > Using avx for xtrxdsp_iq16_sc32i > Using avx for xtrxdsp_sc32_iq16 > Using avx for xtrxdsp_ic16i_iq16 > linux; GNU C++ version 7.5.0; Boost_106501; > UHD_003.010.000.heads-release_003_010_000_000-0-g6e1ac3fc > > Error importing GNU Radio's Qtgui. > It seems like didn't work <osmocom-sdr-request(a)lists.osmocom.org> 于2021年1月20日周三上午12:38写道： > Send osmocom-sdr mailing list submissions to > osmocom-sdr(a)lists.osmocom.org > > To subscribe or unsubscribe via the World Wide Web, visit > https://lists.osmocom.org/mailman/listinfo/osmocom-sdr > or, via email, send a message with subject or body 'help' to > osmocom-sdr-request(a)lists.osmocom.org > > You can reach the person managing the list at > osmocom-sdr-owner(a)lists.osmocom.org > > When replying, please edit your Subject line so it is more specific > than "Re: Contents of osmocom-sdr digest..." > > > Today's Topics: > > 1. Re: gr-osmosdr xtrx_obj.cc:71:13: error: ?xtrx_open_string? > was not declared in this scope (Eric Wild) > > > ---------------------------------------------------------------------- > > Message: 1 > Date: Tue, 19 Jan 2021 17:37:38 +0100 > From: Eric Wild <ewild(a)sysmocom.de> > To: osmocom-sdr(a)lists.osmocom.org > Subject: Re: gr-osmosdr xtrx_obj.cc:71:13: error: ?xtrx_open_string? > was not declared in this scope > Message-ID: <7507da36-ce0b-af5b-7717-2ffccf7f2e1b(a)sysmocom.de> > Content-Type: text/plain; charset="utf-8"; Format="flowed" > > Check your paths, your native system prefix appears to be /usr, but you > chose /usr/local, see > https://wiki.gnuradio.org/index.php/ModuleNotFoundError > > -Eric > > Am 19.01.2021 um 08:41 schrieb ?? 0xroot: > > Hi, I build gr-osmocom?+ XTRX again. And compile successfully > > But when I run?osmocom_fft : > > > > > > osmocom_fft -F -f 850e6 -s 4e6 > > Traceback (most recent call last): > > ? File "/usr/local/bin/osmocom_fft", line 23, in <module> > > ? ? import osmosdr > > ModuleNotFoundError: No module named 'osmosdr' > > > > > > > > clone gr-osmosdr from https://github.com/osmocom/gr-osmosdr > > <https://github.com/osmocom/gr-osmosdr> > > ?Try master and gr-3.8?branch, get the same?result > > > > gnuradio-config-info -v > > 3.8.2.0 > > > > > > > > output of cmake: > > > > cmake .. > > -- Build type not specified: defaulting to release. > > -- Checking for module 'gmp' > > -- ? No package 'gmp' found > > -- Checking for module 'mpir >= 3.0' > > -- ? No package 'mpir' found > > -- Could NOT find MPIR (missing: MPIRXX_LIBRARY MPIR_LIBRARY > > MPIR_INCLUDE_DIR) > > -- Boost version: 1.65.1 > > -- Found the following Boost libraries: > > -- ? date_time > > -- ? program_options > > -- ? filesystem > > -- ? system > > -- ? regex > > -- ? thread > > -- ? unit_test_framework > > -- ? chrono > > -- ? atomic > > -- User set python executable /usr/bin/python3 > > -- Found PythonLibs: /usr/lib/x86_64-linux-gnu/libpython3.6m.so > > <http://libpython3.6m.so> (found suitable exact version "3.6.9") > > -- Extracting version information from git describe... > > -- Boost version: 1.65.1 > > -- Found the following Boost libraries: > > -- ? chrono > > -- ? thread > > -- ? system > > -- ? date_time > > -- ? atomic > > -- > > -- The build system will automatically enable all components. > > -- Use -DENABLE_DEFAULT=OFF to disable components by default. > > -- Searching for GNURadio-Blocks... > > -- ?Found GNURadio-Blocks: 1 > > -- Searching for IQ Balance... > > -- Could NOT find gnuradio-iqbalance (missing: gnuradio-iqbalance_DIR) > > -- ?Found IQ Balance: 0 > > -- Searching for UHD Drivers... > > -- ?Found UHD Driver: TRUE > > -- Searching for UHD Block... > > -- ?Found UHD Block: 1 > > -- Searching for Volk... > > -- ?Found Volk: 1 > > -- Checking for module 'libairspyhf' > > -- ? No package 'libairspyhf' found > > -- Could NOT find LIBAIRSPYHF (missing: LIBAIRSPYHF_LIBRARIES > > LIBAIRSPYHF_INCLUDE_DIRS) > > -- Checking for module 'libgnuradio-fcdproplus' > > -- ? No package 'libgnuradio-fcdproplus' found > > -- gnuradio-fcdproplus not found. > > -- Checking for module 'libfreesrp' > > -- ? No package 'libfreesrp' found > > -- libfreesrp not found. > > -- Found PythonLibs: /usr/lib/x86_64-linux-gnu/libpython3.6m.so > > <http://libpython3.6m.so> (found suitable version "3.6.9", minimum > > required is "3") > > -- > > -- Checking for module SWIG > > -- Found SWIG version 3.0.12. > > -- Minimum SWIG version required is 1.3.31 > > -- > > -- Configuring Python support support... > > -- ? Dependency PYTHONLIBS_FOUND = TRUE > > -- ? Dependency SWIG_FOUND = TRUE > > -- ? Dependency SWIG_VERSION_CHECK = TRUE > > -- ? Enabling Python support support. > > -- ? Override with -DENABLE_PYTHON=ON/OFF > > CMake Warning (dev) in lib/CMakeLists.txt: > > ? A logical block opening on the line > > > > ? ? /home/init3/SDR/gr-osmosdr/lib/CMakeLists.txt:45 (MACRO) > > > > ? closes on the line > > > > ? ? /home/init3/SDR/gr-osmosdr/lib/CMakeLists.txt:47 (ENDMACRO) > > > > ? with mis-matching arguments. > > This warning is for project developers.? Use -Wno-dev to suppress it. > > > > You have called ADD_LIBRARY for library gnuradio-osmosdr without any > > source files. This typically indicates a problem with your > > CMakeLists.txt file > > -- > > -- Configuring high resolution timing... > > -- ? High resolution timing supported through clock_gettime. > > -- > > -- Configuring Osmocom IQ Imbalance Correction support... > > -- ? Dependency gnuradio-iqbalance_FOUND = 0 > > -- ? Disabling Osmocom IQ Imbalance Correction support. > > -- ? Override with -DENABLE_IQBALANCE=ON/OFF > > -- > > -- Configuring FUNcube Dongle support... > > -- ? Dependency GNURADIO_FCDPP_FOUND = FALSE > > -- ? Disabling FUNcube Dongle support. > > -- ? Override with -DENABLE_FCD=ON/OFF > > -- > > -- Configuring IQ File Source & Sink support... > > -- ? Dependency gnuradio-blocks_FOUND = 1 > > -- ? Enabling IQ File Source & Sink support. > > -- ? Override with -DENABLE_FILE=ON/OFF > > -- > > -- > > -- Configuring Osmocom RTLSDR support... > > -- ? Dependency LIBRTLSDR_FOUND = TRUE > > -- ? Enabling Osmocom RTLSDR support. > > -- ? Override with -DENABLE_RTL=ON/OFF > > -- > > -- Configuring RTLSDR TCP Client support... > > -- ? Dependency gnuradio-blocks_FOUND = 1 > > -- ? Enabling RTLSDR TCP Client support. > > -- ? Override with -DENABLE_RTL_TCP=ON/OFF > > -- > > -- Configuring Ettus USRP Devices support... > > -- ? Dependency UHD_FOUND = TRUE > > -- ? Dependency gnuradio-uhd_FOUND = 1 > > -- ? Enabling Ettus USRP Devices support. > > -- ? Override with -DENABLE_UHD=ON/OFF > > -- > > -- Configuring HackRF & rad1o Badge support... > > -- ? Dependency LIBHACKRF_FOUND = TRUE > > -- ? Enabling HackRF & rad1o Badge support. > > -- ? Override with -DENABLE_HACKRF=ON/OFF > > -- > > -- Configuring nuand bladeRF support... > > -- ? Dependency LIBBLADERF_FOUND = TRUE > > -- ? Enabling nuand bladeRF support. > > -- ? Override with -DENABLE_BLADERF=ON/OFF > > -- > > -- Configuring RFSPACE Receivers support... > > -- ? Enabling RFSPACE Receivers support. > > -- ? Override with -DENABLE_RFSPACE=ON/OFF > > -- > > -- Configuring AIRSPY Receiver support... > > -- ? Dependency LIBAIRSPY_FOUND = TRUE > > -- ? Enabling AIRSPY Receiver support. > > -- ? Override with -DENABLE_AIRSPY=ON/OFF > > -- > > -- Configuring AIRSPY HF+ Receiver support... > > -- ? Dependency LIBAIRSPYHF_FOUND = FALSE > > -- ? Disabling AIRSPY HF+ Receiver support. > > -- ? Override with -DENABLE_AIRSPYHF=ON/OFF > > -- > > -- Configuring SoapySDR support support... > > -- ? Dependency SoapySDR_FOUND = 1 > > -- ? Enabling SoapySDR support support. > > -- ? Override with -DENABLE_SOAPY=ON/OFF > > -- > > -- Configuring Red Pitaya SDR support... > > -- ? Enabling Red Pitaya SDR support. > > -- ? Override with -DENABLE_REDPITAYA=ON/OFF > > -- > > -- Configuring FreeSRP support support... > > -- ? Dependency LIBFREESRP_FOUND = FALSE > > -- ? Disabling FreeSRP support support. > > -- ? Override with -DENABLE_FREESRP=ON/OFF > > -- > > -- Configuring XTRX SDR support... > > -- ? Dependency LIBXTRX_FOUND = TRUE > > -- ? Enabling XTRX SDR support. > > -- ? Override with -DENABLE_XTRX=ON/OFF > > -- > > -- ###################################################### > > -- # Gnuradio enabled components > > -- ###################################################### > > -- ? * Python support > > -- ? * IQ File Source & Sink > > -- ? * Osmocom RTLSDR > > -- ? * RTLSDR TCP Client > > -- ? * Ettus USRP Devices > > -- ? * HackRF & rad1o Badge > > -- ? * nuand bladeRF > > -- ? * RFSPACE Receivers > > -- ? * AIRSPY Receiver > > -- ? * SoapySDR support > > -- ? * Red Pitaya SDR > > -- ? * XTRX SDR > > -- > > -- ###################################################### > > -- # Gnuradio disabled components > > -- ###################################################### > > -- ? * Osmocom IQ Imbalance Correction > > -- ? * FUNcube Dongle > > -- ? * AIRSPY HF+ Receiver > > -- ? * FreeSRP support > > -- > > -- Building for version: 0.2.0.0 / 0.2.0 > > -- Using install prefix: /usr/local > > -- Configuring done > > -- Generating done > > > > -- Build files have been written to: > /home/init3/SDR/gr-osmosdr/build > > > > > > Clayton Smith <argilo(a)gmail.com <mailto:argilo@gmail.com>> > > ?2021?1?18??? ??10:10??? > > > > Are you using the latest version of libxtrx? The xtrx_open_list > > function was removed from its API a couple years ago and replaced > > with xtrx_open_string. I recently updated gr-osmosdr to use the > > new function. > > > > On Mon, Jan 18, 2021 at 8:43 AM ?? 0xroot <renxianyuanqi(a)gmail.com > > <mailto:renxianyuanqi@gmail.com>> wrote: > > > > Dear??osmocom community, > > I am using XTRX?+ gr-osmosdr on ubuntu 18 > > when i try to build gr-osmosdr : > > > > [ 81%] Building CXX object > > > lib/CMakeFiles/gnuradio-osmosdr.dir/redpitaya/redpitaya_sink_c.cc.o > > [ 83%] Building CXX object > > > lib/CMakeFiles/gnuradio-osmosdr.dir/redpitaya/redpitaya_common.cc.o > > [ 85%] Building CXX object > > lib/CMakeFiles/gnuradio-osmosdr.dir/xtrx/xtrx_obj.cc.o > > [ 87%] Building CXX object > > lib/CMakeFiles/gnuradio-osmosdr.dir/xtrx/xtrx_source_c.cc.o > > /home/init3/SDR/gr-osmosdr/lib/xtrx/xtrx_obj.cc: In > > constructor ?xtrx_obj::xtrx_obj(const string&, unsigned > > int, bool)?: > > /home/init3/SDR/gr-osmosdr/lib/xtrx/xtrx_obj.cc:71:13: > > error: ?xtrx_open_string? was not declared in this scope > > ? ?int res = xtrx_open_string(path.c_str(), &_obj); > > ? ? ? ? ? ? ?^~~~~~~~~~~~~~~~ > > /home/init3/SDR/gr-osmosdr/lib/xtrx/xtrx_obj.cc:71:13: > > note: suggested alternative: ?xtrx_open_list? > > ? ?int res = xtrx_open_string(path.c_str(), &_obj); > > ? ? ? ? ? ? ?^~~~~~~~~~~~~~~~ > > ? ? ? ? ? ? ?xtrx_open_list > > lib/CMakeFiles/gnuradio-osmosdr.dir/build.make:662: recipe > > for target > > 'lib/CMakeFiles/gnuradio-osmosdr.dir/xtrx/xtrx_obj.cc.o' > > failed > > make[2]: *** > > [lib/CMakeFiles/gnuradio-osmosdr.dir/xtrx/xtrx_obj.cc.o] > > Error 1 > > make[2]: *** ??????????.... > > CMakeFiles/Makefile2:167: recipe for target > > 'lib/CMakeFiles/gnuradio-osmosdr.dir/all' failed > > make[1]: *** [lib/CMakeFiles/gnuradio-osmosdr.dir/all] Error > 2 > > Makefile:140: recipe for target 'all' failed > > make: *** [all] Error 2 > > > > > > Info: > > > > gnuradio?3.8.2.0 > > gr-osmosdr gr-3.8 > > > > > > How to fix it? > > > > cmake output: > > > > cmake .. > > -- Build type not specified: defaulting to release. > > -- Checking for module 'gmp' > > -- ? No package 'gmp' found > > -- Checking for module 'mpir >= 3.0' > > -- ? No package 'mpir' found > > -- Could NOT find MPIR (missing: MPIRXX_LIBRARY > > MPIR_LIBRARY MPIR_INCLUDE_DIR) > > -- Boost version: 1.65.1 > > -- Found the following Boost libraries: > > -- ? date_time > > -- ? program_options > > -- ? filesystem > > -- ? system > > -- ? regex > > -- ? thread > > -- ? unit_test_framework > > -- ? chrono > > -- ? atomic > > -- User set python executable /usr/bin/python3.6 > > -- Found PythonLibs: > > /usr/lib/x86_64-linux-gnu/libpython3.6m.so > > <http://libpython3.6m.so> (found suitable exact version > > "3.6.9") > > -- Extracting version information from git describe... > > -- Boost version: 1.65.1 > > -- Found the following Boost libraries: > > -- ? chrono > > -- ? thread > > -- ? system > > -- ? date_time > > -- ? atomic > > -- > > -- The build system will automatically enable all components. > > -- Use -DENABLE_DEFAULT=OFF to disable components by default. > > -- Searching for GNURadio-Blocks... > > -- ?Found GNURadio-Blocks: 1 > > -- Searching for IQ Balance... > > -- Could NOT find gnuradio-iqbalance (missing: > > gnuradio-iqbalance_DIR) > > -- ?Found IQ Balance: 0 > > -- Searching for UHD Drivers... > > -- ?Found UHD Driver: TRUE > > -- Searching for UHD Block... > > -- ?Found UHD Block: 1 > > -- Searching for Volk... > > -- ?Found Volk: 1 > > -- Checking for module 'libairspyhf' > > -- ? No package 'libairspyhf' found > > -- Could NOT find LIBAIRSPYHF (missing: > > LIBAIRSPYHF_LIBRARIES LIBAIRSPYHF_INCLUDE_DIRS) > > -- Checking for module 'libgnuradio-fcdproplus' > > -- ? No package 'libgnuradio-fcdproplus' found > > -- gnuradio-fcdproplus not found. > > -- Checking for module 'libfreesrp' > > -- ? No package 'libfreesrp' found > > -- libfreesrp not found. > > -- Found PythonLibs: > > /usr/lib/x86_64-linux-gnu/libpython3.6m.so > > <http://libpython3.6m.so> (found suitable version "3.6.9", > > minimum required is "3") > > -- > > -- Checking for module SWIG > > -- Found SWIG version 3.0.12. > > -- Minimum SWIG version required is 1.3.31 > > -- > > -- Configuring Python support support... > > -- ? Dependency PYTHONLIBS_FOUND = TRUE > > -- ? Dependency SWIG_FOUND = TRUE > > -- ? Dependency SWIG_VERSION_CHECK = TRUE > > -- ? Enabling Python support support. > > -- ? Override with -DENABLE_PYTHON=ON/OFF > > CMake Warning (dev) in lib/CMakeLists.txt: > > ? A logical block opening on the line > > > > ? ? /home/init3/SDR/gr-osmosdr/lib/CMakeLists.txt:45 (MACRO) > > > > ? closes on the line > > > > ? ? /home/init3/SDR/gr-osmosdr/lib/CMakeLists.txt:47 > > (ENDMACRO) > > > > ? with mis-matching arguments. > > This warning is for project developers.? Use -Wno-dev to > > suppress it. > > > > You have called ADD_LIBRARY for library gnuradio-osmosdr > > without any source files. This typically indicates a > > problem with your CMakeLists.txt file > > -- > > -- Configuring high resolution timing... > > -- ? High resolution timing supported through clock_gettime. > > -- > > -- Configuring Osmocom IQ Imbalance Correction support... > > -- ? Dependency gnuradio-iqbalance_FOUND = 0 > > -- ? Disabling Osmocom IQ Imbalance Correction support. > > -- ? Override with -DENABLE_IQBALANCE=ON/OFF > > -- > > -- Configuring FUNcube Dongle support... > > -- ? Dependency GNURADIO_FCDPP_FOUND = FALSE > > -- ? Disabling FUNcube Dongle support. > > -- ? Override with -DENABLE_FCD=ON/OFF > > -- > > -- Configuring IQ File Source & Sink support... > > -- ? Dependency gnuradio-blocks_FOUND = 1 > > -- ? Enabling IQ File Source & Sink support. > > -- ? Override with -DENABLE_FILE=ON/OFF > > -- > > -- > > -- Configuring Osmocom RTLSDR support... > > -- ? Dependency LIBRTLSDR_FOUND = TRUE > > -- ? Enabling Osmocom RTLSDR support. > > -- ? Override with -DENABLE_RTL=ON/OFF > > -- > > -- Configuring RTLSDR TCP Client support... > > -- ? Dependency gnuradio-blocks_FOUND = 1 > > -- ? Enabling RTLSDR TCP Client support. > > -- ? Override with -DENABLE_RTL_TCP=ON/OFF > > -- > > -- Configuring Ettus USRP Devices support... > > -- ? Dependency UHD_FOUND = TRUE > > -- ? Dependency gnuradio-uhd_FOUND = 1 > > -- ? Enabling Ettus USRP Devices support. > > -- ? Override with -DENABLE_UHD=ON/OFF > > -- > > -- Configuring HackRF & rad1o Badge support... > > -- ? Dependency LIBHACKRF_FOUND = TRUE > > -- ? Enabling HackRF & rad1o Badge support. > > -- ? Override with -DENABLE_HACKRF=ON/OFF > > -- > > -- Configuring nuand bladeRF support... > > -- ? Dependency LIBBLADERF_FOUND = TRUE > > -- ? Enabling nuand bladeRF support. > > -- ? Override with -DENABLE_BLADERF=ON/OFF > > -- > > -- Configuring RFSPACE Receivers support... > > -- ? Enabling RFSPACE Receivers support. > > -- ? Override with -DENABLE_RFSPACE=ON/OFF > > -- > > -- Configuring AIRSPY Receiver support... > > -- ? Dependency LIBAIRSPY_FOUND = TRUE > > -- ? Enabling AIRSPY Receiver support. > > -- ? Override with -DENABLE_AIRSPY=ON/OFF > > -- > > -- Configuring AIRSPY HF+ Receiver support... > > -- ? Dependency LIBAIRSPYHF_FOUND = FALSE > > -- ? Disabling AIRSPY HF+ Receiver support. > > -- ? Override with -DENABLE_AIRSPYHF=ON/OFF > > -- > > -- Configuring SoapySDR support support... > > -- ? Dependency SoapySDR_FOUND = 1 > > -- ? Enabling SoapySDR support support. > > -- ? Override with -DENABLE_SOAPY=ON/OFF > > -- > > -- Configuring Red Pitaya SDR support... > > -- ? Enabling Red Pitaya SDR support. > > -- ? Override with -DENABLE_REDPITAYA=ON/OFF > > -- > > -- Configuring FreeSRP support support... > > -- ? Dependency LIBFREESRP_FOUND = FALSE > > -- ? Disabling FreeSRP support support. > > -- ? Override with -DENABLE_FREESRP=ON/OFF > > -- > > -- Configuring XTRX SDR support... > > -- ? Dependency LIBXTRX_FOUND = TRUE > > -- ? Enabling XTRX SDR support. > > -- ? Override with -DENABLE_XTRX=ON/OFF > > -- > > -- ###################################################### > > -- # Gnuradio enabled components > > -- ###################################################### > > -- ? * Python support > > -- ? * IQ File Source & Sink > > -- ? * Osmocom RTLSDR > > -- ? * RTLSDR TCP Client > > -- ? * Ettus USRP Devices > > -- ? * HackRF & rad1o Badge > > -- ? * nuand bladeRF > > -- ? * RFSPACE Receivers > > -- ? * AIRSPY Receiver > > -- ? * SoapySDR support > > -- ? * Red Pitaya SDR > > -- ? * XTRX SDR > > -- > > -- ###################################################### > > -- # Gnuradio disabled components > > -- ###################################################### > > -- ? * Osmocom IQ Imbalance Correction > > -- ? * FUNcube Dongle > > -- ? * AIRSPY HF+ Receiver > > -- ? * FreeSRP support > > -- > > -- Building for version: 0.2.0.0 / 0.2.0 > > -- Using install prefix: /usr/local > > -- Configuring done > > -- Generating done > > -- Build files have been written to: > > /home/init3/SDR/gr-osmosdr/build > > > > > > -------------------------- > > Thanks > > > >

1 0

gl_cmap shader compilation failed
by Sipos Csaba 20 Jan '21

20 Jan '21

Hi Sylvain, Since I switched to Ubuntu 20.04, I am not able to get Posphor working with osmocom_fft. I am getting the following error: [!] gl_cmap shader compilation failed (cmap_simple.glsl) [w] Color map shader 'simple' failed to load, will use fallback [!] gl_cmap shader compilation failed (cmap_bicubic.glsl) [w] Color map shader 'bicubic' failed to load, will use fallback [!] gl_cmap shader compilation failed (cmap_fallback.glsl) [!] Color map shader 'fallback' failed, aborting gr::log :ERROR: qt_sink_c0 - Failed to initialize fosphor The app is running, but the render area of the spectrum is completely blank. I am on your "gr3.8" branch. OpenCL is exactly the same as on Ubuntu 18.04 (I need the older 340 Nvidia driver on my old NVS 4200M, if you remember), GLFW is the latest master. Everything compiles just fine, only at runtime this issue presents itself. If you have any idea, that would be lovely. Regards, Csaba

2 2

gr-osmosdr xtrx_obj.cc:71:13: error: ‘xtrx_open_string’ was not declared in this scope
by 雪碧 0xroot 19 Jan '21

19 Jan '21

Dear osmocom community, I am using XTRX + gr-osmosdr on ubuntu 18 when i try to build gr-osmosdr : [ 81%] Building CXX object > lib/CMakeFiles/gnuradio-osmosdr.dir/redpitaya/redpitaya_sink_c.cc.o > [ 83%] Building CXX object > lib/CMakeFiles/gnuradio-osmosdr.dir/redpitaya/redpitaya_common.cc.o > [ 85%] Building CXX object > lib/CMakeFiles/gnuradio-osmosdr.dir/xtrx/xtrx_obj.cc.o > [ 87%] Building CXX object > lib/CMakeFiles/gnuradio-osmosdr.dir/xtrx/xtrx_source_c.cc.o > /home/init3/SDR/gr-osmosdr/lib/xtrx/xtrx_obj.cc: In constructor > ‘xtrx_obj::xtrx_obj(const string&, unsigned int, bool)’: > /home/init3/SDR/gr-osmosdr/lib/xtrx/xtrx_obj.cc:71:13: error: > ‘xtrx_open_string’ was not declared in this scope > int res = xtrx_open_string(path.c_str(), &_obj); > ^~~~~~~~~~~~~~~~ > /home/init3/SDR/gr-osmosdr/lib/xtrx/xtrx_obj.cc:71:13: note: suggested > alternative: ‘xtrx_open_list’ > int res = xtrx_open_string(path.c_str(), &_obj); > ^~~~~~~~~~~~~~~~ > xtrx_open_list > lib/CMakeFiles/gnuradio-osmosdr.dir/build.make:662: recipe for target > 'lib/CMakeFiles/gnuradio-osmosdr.dir/xtrx/xtrx_obj.cc.o' failed > make[2]: *** [lib/CMakeFiles/gnuradio-osmosdr.dir/xtrx/xtrx_obj.cc.o] > Error 1 > make[2]: *** 正在等待未完成的任务.... > CMakeFiles/Makefile2:167: recipe for target > 'lib/CMakeFiles/gnuradio-osmosdr.dir/all' failed > make[1]: *** [lib/CMakeFiles/gnuradio-osmosdr.dir/all] Error 2 > Makefile:140: recipe for target 'all' failed > make: *** [all] Error 2 Info: gnuradio 3.8.2.0 > gr-osmosdr gr-3.8 How to fix it? cmake output: > cmake .. > -- Build type not specified: defaulting to release. > -- Checking for module 'gmp' > -- No package 'gmp' found > -- Checking for module 'mpir >= 3.0' > -- No package 'mpir' found > -- Could NOT find MPIR (missing: MPIRXX_LIBRARY MPIR_LIBRARY > MPIR_INCLUDE_DIR) > -- Boost version: 1.65.1 > -- Found the following Boost libraries: > -- date_time > -- program_options > -- filesystem > -- system > -- regex > -- thread > -- unit_test_framework > -- chrono > -- atomic > -- User set python executable /usr/bin/python3.6 > -- Found PythonLibs: /usr/lib/x86_64-linux-gnu/libpython3.6m.so (found > suitable exact version "3.6.9") > -- Extracting version information from git describe... > -- Boost version: 1.65.1 > -- Found the following Boost libraries: > -- chrono > -- thread > -- system > -- date_time > -- atomic > -- > -- The build system will automatically enable all components. > -- Use -DENABLE_DEFAULT=OFF to disable components by default. > -- Searching for GNURadio-Blocks... > -- Found GNURadio-Blocks: 1 > -- Searching for IQ Balance... > -- Could NOT find gnuradio-iqbalance (missing: gnuradio-iqbalance_DIR) > -- Found IQ Balance: 0 > -- Searching for UHD Drivers... > -- Found UHD Driver: TRUE > -- Searching for UHD Block... > -- Found UHD Block: 1 > -- Searching for Volk... > -- Found Volk: 1 > -- Checking for module 'libairspyhf' > -- No package 'libairspyhf' found > -- Could NOT find LIBAIRSPYHF (missing: LIBAIRSPYHF_LIBRARIES > LIBAIRSPYHF_INCLUDE_DIRS) > -- Checking for module 'libgnuradio-fcdproplus' > -- No package 'libgnuradio-fcdproplus' found > -- gnuradio-fcdproplus not found. > -- Checking for module 'libfreesrp' > -- No package 'libfreesrp' found > -- libfreesrp not found. > -- Found PythonLibs: /usr/lib/x86_64-linux-gnu/libpython3.6m.so (found > suitable version "3.6.9", minimum required is "3") > -- > -- Checking for module SWIG > -- Found SWIG version 3.0.12. > -- Minimum SWIG version required is 1.3.31 > -- > -- Configuring Python support support... > -- Dependency PYTHONLIBS_FOUND = TRUE > -- Dependency SWIG_FOUND = TRUE > -- Dependency SWIG_VERSION_CHECK = TRUE > -- Enabling Python support support. > -- Override with -DENABLE_PYTHON=ON/OFF > CMake Warning (dev) in lib/CMakeLists.txt: > A logical block opening on the line > > /home/init3/SDR/gr-osmosdr/lib/CMakeLists.txt:45 (MACRO) > > closes on the line > > /home/init3/SDR/gr-osmosdr/lib/CMakeLists.txt:47 (ENDMACRO) > > with mis-matching arguments. > This warning is for project developers. Use -Wno-dev to suppress it. > > You have called ADD_LIBRARY for library gnuradio-osmosdr without any > source files. This typically indicates a problem with your CMakeLists.txt > file > -- > -- Configuring high resolution timing... > -- High resolution timing supported through clock_gettime. > -- > -- Configuring Osmocom IQ Imbalance Correction support... > -- Dependency gnuradio-iqbalance_FOUND = 0 > -- Disabling Osmocom IQ Imbalance Correction support. > -- Override with -DENABLE_IQBALANCE=ON/OFF > -- > -- Configuring FUNcube Dongle support... > -- Dependency GNURADIO_FCDPP_FOUND = FALSE > -- Disabling FUNcube Dongle support. > -- Override with -DENABLE_FCD=ON/OFF > -- > -- Configuring IQ File Source & Sink support... > -- Dependency gnuradio-blocks_FOUND = 1 > -- Enabling IQ File Source & Sink support. > -- Override with -DENABLE_FILE=ON/OFF > -- > -- > -- Configuring Osmocom RTLSDR support... > -- Dependency LIBRTLSDR_FOUND = TRUE > -- Enabling Osmocom RTLSDR support. > -- Override with -DENABLE_RTL=ON/OFF > -- > -- Configuring RTLSDR TCP Client support... > -- Dependency gnuradio-blocks_FOUND = 1 > -- Enabling RTLSDR TCP Client support. > -- Override with -DENABLE_RTL_TCP=ON/OFF > -- > -- Configuring Ettus USRP Devices support... > -- Dependency UHD_FOUND = TRUE > -- Dependency gnuradio-uhd_FOUND = 1 > -- Enabling Ettus USRP Devices support. > -- Override with -DENABLE_UHD=ON/OFF > -- > -- Configuring HackRF & rad1o Badge support... > -- Dependency LIBHACKRF_FOUND = TRUE > -- Enabling HackRF & rad1o Badge support. > -- Override with -DENABLE_HACKRF=ON/OFF > -- > -- Configuring nuand bladeRF support... > -- Dependency LIBBLADERF_FOUND = TRUE > -- Enabling nuand bladeRF support. > -- Override with -DENABLE_BLADERF=ON/OFF > -- > -- Configuring RFSPACE Receivers support... > -- Enabling RFSPACE Receivers support. > -- Override with -DENABLE_RFSPACE=ON/OFF > -- > -- Configuring AIRSPY Receiver support... > -- Dependency LIBAIRSPY_FOUND = TRUE > -- Enabling AIRSPY Receiver support. > -- Override with -DENABLE_AIRSPY=ON/OFF > -- > -- Configuring AIRSPY HF+ Receiver support... > -- Dependency LIBAIRSPYHF_FOUND = FALSE > -- Disabling AIRSPY HF+ Receiver support. > -- Override with -DENABLE_AIRSPYHF=ON/OFF > -- > -- Configuring SoapySDR support support... > -- Dependency SoapySDR_FOUND = 1 > -- Enabling SoapySDR support support. > -- Override with -DENABLE_SOAPY=ON/OFF > -- > -- Configuring Red Pitaya SDR support... > -- Enabling Red Pitaya SDR support. > -- Override with -DENABLE_REDPITAYA=ON/OFF > -- > -- Configuring FreeSRP support support... > -- Dependency LIBFREESRP_FOUND = FALSE > -- Disabling FreeSRP support support. > -- Override with -DENABLE_FREESRP=ON/OFF > -- > -- Configuring XTRX SDR support... > -- Dependency LIBXTRX_FOUND = TRUE > -- Enabling XTRX SDR support. > -- Override with -DENABLE_XTRX=ON/OFF > -- > -- ###################################################### > -- # Gnuradio enabled components > -- ###################################################### > -- * Python support > -- * IQ File Source & Sink > -- * Osmocom RTLSDR > -- * RTLSDR TCP Client > -- * Ettus USRP Devices > -- * HackRF & rad1o Badge > -- * nuand bladeRF > -- * RFSPACE Receivers > -- * AIRSPY Receiver > -- * SoapySDR support > -- * Red Pitaya SDR > -- * XTRX SDR > -- > -- ###################################################### > -- # Gnuradio disabled components > -- ###################################################### > -- * Osmocom IQ Imbalance Correction > -- * FUNcube Dongle > -- * AIRSPY HF+ Receiver > -- * FreeSRP support > -- > -- Building for version: 0.2.0.0 / 0.2.0 > -- Using install prefix: /usr/local > -- Configuring done > -- Generating done > -- Build files have been written to: /home/init3/SDR/gr-osmosdr/build > -------------------------- Thanks

3 3

[PATCH] lib/xtrx: add missing libraries
by Gwenhael Goavec-Merou 11 Jan '21

11 Jan '21

When using gr-osmosdr with an xtrx board Executing: /usr/bin/python3 -u /home/gwe/sources/nop.py Traceback (most recent call last): File "/usr/lib/python3/dist-packages/osmosdr/osmosdr_swig.py", line 14, in swig_import_helper return importlib.import_module(mname) File "/usr/lib/python3.7/importlib/__init__.py", line 127, in import_module return _bootstrap._gcd_import(name[level:], package, level) File "<frozen importlib._bootstrap>", line 1006, in _gcd_import File "<frozen importlib._bootstrap>", line 983, in _find_and_load File "<frozen importlib._bootstrap>", line 967, in _find_and_load_unlocked File "<frozen importlib._bootstrap>", line 670, in _load_unlocked File "<frozen importlib._bootstrap>", line 583, in module_from_spec File "<frozen importlib._bootstrap_external>", line 1043, in create_module File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed ImportError: /usr/lib/libgnuradio-osmosdr.so.0.2.0: undefined symbol: xtrx_tune_rx_bandwidth libgnuradio-osmosdr has no references to libxtrx*.so*: $ ldd /usr/lib/libgnuradio-osmosdr.so.0.2.0.0 | grep xtrx $ After adding the mandatory library in CMakeLists.txt, flowgraph start correctly: Executing: /usr/bin/python3 -u /home/gwe/sources/nop.py CPU Features: SSE2+ SSE4.1+ AVX- FMA- Using sse2 for xtrxdsp_iq16_sc32 Using sse2 for xtrxdsp_iq8_ic16 Using sse2 for xtrxdsp_iq16_ic16i Using sse2 for xtrxdsp_iq8_ic8i Using sse2 for xtrxdsp_sc32i_iq16 Using sse2 for xtrxdsp_iq8_sc32 Using sse2 for xtrxdsp_iq8_sc32i Using sse2 for xtrxdsp_iq16_sc32i Using sse2 for xtrxdsp_sc32_iq16 Using sse2 for xtrxdsp_iq8_ic16i Using sse2 for xtrxdsp_ic16i_iq16 gr-osmosdr 0.2.0.0 (0.2.0) gnuradio 3.8.2.0 built-in source types: file xtrx xtrx xtrx_obj::xtrx_obj = 4 And the libgnuradio-osmosdr is correctly linked to libxtrx*.so* $ ldd /usr/lib/libgnuradio-osmosdr.so.0.2.0.0 | grep xtrx libxtrx.so.0 => /usr/local/lib/libxtrx.so.0 (0x00007f0cf7188000) libxtrxll.so.0 => /usr/local/lib/libxtrxll.so.0 (0x00007f0cf6535000) libxtrxdsp.so.0 => /usr/local/lib/libxtrxdsp.so.0 (0x00007f0cf6526000) $ Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou(a)trabucayre.com> --- lib/xtrx/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/xtrx/CMakeLists.txt b/lib/xtrx/CMakeLists.txt index 9297bf0..7f31829 100644 --- a/lib/xtrx/CMakeLists.txt +++ b/lib/xtrx/CMakeLists.txt @@ -26,6 +26,10 @@ target_include_directories(gnuradio-osmosdr PRIVATE ${LIBXTRX_INCLUDE_DIRS} ) +APPEND_LIB_LIST( + ${LIBXTRX_LIBRARIES} +) + list(APPEND gr_osmosdr_srcs ${CMAKE_CURRENT_SOURCE_DIR}/xtrx_obj.cc ${CMAKE_CURRENT_SOURCE_DIR}/xtrx_source_c.cc -- 2.26.2

1 0

[PATCH] xtrx: remove BOOST_FOREACH and obsolete API call
by argilo＠gmail.com 10 Jan '21

10 Jan '21

From: Clayton Smith <argilo(a)gmail.com> All instances of BOOST_FOREACH were removed in an earlier commit, but it was reintroduced when xtrx support was merged. I removed BOOST_FOREACH again here. Also, xtrx support fails to build because it relies on the xtrx_open_list function, which was removed from the xtrx API in 2019. It was replaced with xtrx_open_string. I don't have xtrx hardware, so I've only tested that gr-osmosdr compiles with these changes. --- lib/sink_impl.cc | 3 ++- lib/source_impl.cc | 2 +- lib/xtrx/xtrx_obj.cc | 2 +- lib/xtrx/xtrx_sink_c.cc | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/sink_impl.cc b/lib/sink_impl.cc index 24938838ae..317855a4ff 100644 --- a/lib/sink_impl.cc +++ b/lib/sink_impl.cc @@ -154,7 +154,8 @@ sink_impl::sink_impl( const std::string &args ) dev_list.push_back( dev ); #endif #ifdef ENABLE_XTRX - BOOST_FOREACH( std::string dev, xtrx_sink_c::get_devices() ) + for (std::string dev : xtrx_sink_c::get_devices()) + dev_list.push_back( dev ); #endif #ifdef ENABLE_FILE for (std::string dev : file_sink_c::get_devices()) diff --git a/lib/source_impl.cc b/lib/source_impl.cc index 84f5024bb6..8f2028bb3e 100644 --- a/lib/source_impl.cc +++ b/lib/source_impl.cc @@ -242,7 +242,7 @@ source_impl::source_impl( const std::string &args ) dev_list.push_back( dev ); #endif #ifdef ENABLE_XTRX - BOOST_FOREACH( std::string dev, xtrx_source_c::get_devices() ) + for (std::string dev : xtrx_source_c::get_devices()) dev_list.push_back( dev ); #endif diff --git a/lib/xtrx/xtrx_obj.cc b/lib/xtrx/xtrx_obj.cc index a971df4647..016b420980 100644 --- a/lib/xtrx/xtrx_obj.cc +++ b/lib/xtrx/xtrx_obj.cc @@ -68,7 +68,7 @@ xtrx_obj::xtrx_obj(const std::string &path, unsigned loglevel, bool lmsreset) unsigned xtrxflag = (loglevel & XTRX_O_LOGLVL_MASK) | ((lmsreset) ? XTRX_O_RESET : 0); std::cerr << "xtrx_obj::xtrx_obj = " << xtrxflag << std::endl; - int res = xtrx_open_list(path.c_str(), NULL, &_obj); + int res = xtrx_open_string(path.c_str(), &_obj); if (res < 0) { std::stringstream message; message << "Couldn't open " ": Error: " << -res; diff --git a/lib/xtrx/xtrx_sink_c.cc b/lib/xtrx/xtrx_sink_c.cc index 46ce1b035c..5253311af9 100644 --- a/lib/xtrx/xtrx_sink_c.cc +++ b/lib/xtrx/xtrx_sink_c.cc @@ -394,7 +394,7 @@ void xtrx_sink_c::tag_process(int ninput_items) uint64_t max_count = samp0_count + ninput_items; bool found_time_tag = false; - BOOST_FOREACH(const gr::tag_t &my_tag, _tags) { + for (const gr::tag_t &my_tag : _tags) { const uint64_t my_tag_count = my_tag.offset; const pmt::pmt_t &key = my_tag.key; const pmt::pmt_t &value = my_tag.value; @@ -416,7 +416,7 @@ void xtrx_sink_c::tag_process(int ninput_items) std::cerr << "TX_TIME: " << seconds << ":" << fractional << std::endl; } - } // end foreach + } // end for if (found_time_tag) { //_metadata.has_time_spec = true; -- 2.25.1

2 1

[PATCH] hackrf: fix bandwidth setting
by argilo＠gmail.com 01 Jan '21

01 Jan '21

From: Clayton Smith <argilo(a)gmail.com> The T/R switching code added in ae2253c516bfdc9ae4575ecd61fe0e6cd8608a0d fails to set custom filter bandwidths because it sets bandwidth and sample rate in the wrong order. As noted in the documentation for hackrf_set_sample_rate: "If you want to override the baseband filter selection, you must do so after setting the sample rate." To solve this problem I moved the set_bandwidth call after set_sample_rate. It was also necessary to skip the call if a custom bandwidth was not requested. --- lib/hackrf/hackrf_common.cc | 5 ++++- lib/hackrf/hackrf_common.h | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/hackrf/hackrf_common.cc b/lib/hackrf/hackrf_common.cc index a6de22aab6..666dc60f84 100644 --- a/lib/hackrf/hackrf_common.cc +++ b/lib/hackrf/hackrf_common.cc @@ -37,6 +37,7 @@ hackrf_common::hackrf_common(const std::string &args) : _center_freq(0), _freq_corr(0), _auto_gain(false), + _requested_bandwidth(0), _bandwidth(0), _bias(false), _started(false) @@ -339,6 +340,7 @@ double hackrf_common::set_bandwidth( double bandwidth, size_t chan ) int ret; // osmosdr::freq_range_t bandwidths = get_bandwidth_range( chan ); + _requested_bandwidth = bandwidth; if ( bandwidth == 0.0 ) /* bandwidth of 0 means automatic filter selection */ bandwidth = _sample_rate * 0.75; /* select narrower filters to prevent aliasing */ @@ -411,9 +413,10 @@ bool hackrf_common::get_bias() void hackrf_common::start() { _started = true; - set_bandwidth(get_bandwidth()); set_center_freq(get_center_freq()); set_sample_rate(get_sample_rate()); + if (_requested_bandwidth != 0) + set_bandwidth(get_bandwidth()); set_gain(get_gain()); set_bias(get_bias()); } diff --git a/lib/hackrf/hackrf_common.h b/lib/hackrf/hackrf_common.h index bb553c3bc6..d1ab47b6fb 100644 --- a/lib/hackrf/hackrf_common.h +++ b/lib/hackrf/hackrf_common.h @@ -104,6 +104,7 @@ private: double _freq_corr; bool _auto_gain; double _amp_gain; + double _requested_bandwidth; double _bandwidth; bool _bias; bool _started; -- 2.25.1

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
91
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

osmocom-sdr