osmocom-sdr

osmocom-sdr@lists.osmocom.org

903 discussions

[PATCH] fcd: restore support for FUNcube Dongle and Pro+

by argilo＠gmail.com

From: Clayton Smith <argilo(a)gmail.com> Support for the original FUNcube Dongle used to live in GNU Radio's gr-fcd module, which was removed in version 3.8. As a result, gr-osmosdr lost support for both FUNcube Dongle and FUNcube Dongle Pro+. The gr-fcdproplus out-of-tree module subsequently added support for the original FUNcube Dongle, meaning that it now supports both types. As a result, FUNcube support can easily be restored in gr-osmosdr. The #ifdefs are no longer required, since everything is in a single module now. --- CMakeLists.txt | 1 + cmake/Modules/FindGnuradioFCDPP.cmake | 27 +++++++++++++++++++++++++++ lib/CMakeLists.txt | 8 ++++++++ lib/fcd/CMakeLists.txt | 21 ++++----------------- lib/fcd/fcd_source_c.cc | 18 +----------------- lib/fcd/fcd_source_c.h | 13 ++----------- 6 files changed, 43 insertions(+), 45 deletions(-) create mode 100644 cmake/Modules/FindGnuradioFCDPP.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a2cf9df3d..14a9ddda7f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -176,6 +176,7 @@ find_package(LibHackRF) find_package(LibAIRSPY) find_package(LibAIRSPYHF) find_package(LibbladeRF) +find_package(GnuradioFCDPP) find_package(SoapySDR NO_MODULE) find_package(LibFreeSRP) find_package(Doxygen) diff --git a/cmake/Modules/FindGnuradioFCDPP.cmake b/cmake/Modules/FindGnuradioFCDPP.cmake new file mode 100644 index 0000000000..f81fe8aa41 --- /dev/null +++ b/cmake/Modules/FindGnuradioFCDPP.cmake @@ -0,0 +1,27 @@ +if(NOT GNURADIO_FCDPP_FOUND) + pkg_check_modules (GNURADIO_FCDPP_PKG libgnuradio-fcdproplus) + find_path(GNURADIO_FCDPP_INCLUDE_DIRS NAMES fcdproplus/api.h + PATHS + ${GNURADIO_FCDPP_PKG_INCLUDE_DIRS} + /usr/include + /usr/local/include + ) + + find_library(GNURADIO_FCDPP_LIBRARIES NAMES gnuradio-fcdproplus + PATHS + ${GNURADIO_FCDPP_PKG_LIBRARY_DIRS} + /usr/lib + /usr/local/lib + ) + +if(GNURADIO_FCDPP_INCLUDE_DIRS AND GNURADIO_FCDPP_LIBRARIES) + set(GNURADIO_FCDPP_FOUND TRUE CACHE INTERNAL "gnuradio-fcdproplus found") + message(STATUS "Found gnuradio-fcdproplus: ${GNURADIO_FCDPP_INCLUDE_DIRS}, ${GNURADIO_FCDPP_LIBRARIES}") +else(GNURADIO_FCDPP_INCLUDE_DIRS AND GNURADIO_FCDPP_LIBRARIES) + set(GNURADIO_FCDPP_FOUND FALSE CACHE INTERNAL "gnuradio-fcdproplus found") + message(STATUS "gnuradio-fcdproplus not found.") +endif(GNURADIO_FCDPP_INCLUDE_DIRS AND GNURADIO_FCDPP_LIBRARIES) + +mark_as_advanced(GNURADIO_FCDPP_LIBRARIES GNURADIO_FCDPP_INCLUDE_DIRS) + +endif(NOT GNURADIO_FCDPP_FOUND) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index d04cb1d402..3199ef3d79 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -135,6 +135,14 @@ if(ENABLE_OSMOSDR) add_subdirectory(osmosdr) endif(ENABLE_OSMOSDR) +######################################################################## +# Setup FCD component +######################################################################## +GR_REGISTER_COMPONENT("FUNcube Dongle" ENABLE_FCD GNURADIO_FCDPP_FOUND) +if(ENABLE_FCD) + add_subdirectory(fcd) +endif(ENABLE_FCD) + ######################################################################## # Setup File component ######################################################################## diff --git a/lib/fcd/CMakeLists.txt b/lib/fcd/CMakeLists.txt index 146191f7ac..7a515c71fc 100644 --- a/lib/fcd/CMakeLists.txt +++ b/lib/fcd/CMakeLists.txt @@ -23,25 +23,12 @@ target_include_directories(gnuradio-osmosdr PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} + ${GNURADIO_FCDPP_INCLUDE_DIRS} ) -if(ENABLE_FCD) - target_include_directories(gnuradio-osmosdr PRIVATE - ${Gnuradio-fcd_INCLUDE_DIRS} - ) - target_link_libraries(gnuradio-osmosdr PRIVATE - ${Gnuradio-fcd_LIBRARIES} - ) -endif(ENABLE_FCD) - -if(ENABLE_FCDPP) - target_include_directories(gnuradio-osmosdr PRIVATE - ${Gnuradio-fcdpp_INCLUDE_DIRS} - ) - target_link_libraries(gnuradio-osmosdr PRIVATE - ${Gnuradio-fcdpp_LIBRARIES} - ) -endif(ENABLE_FCDPP) +target_link_libraries(gnuradio-osmosdr + ${GNURADIO_FCDPP_LIBRARIES} +) list(APPEND gr_osmosdr_srcs ${CMAKE_CURRENT_SOURCE_DIR}/fcd_source_c.cc diff --git a/lib/fcd/fcd_source_c.cc b/lib/fcd/fcd_source_c.cc index 885d514787..744fa69553 100644 --- a/lib/fcd/fcd_source_c.cc +++ b/lib/fcd/fcd_source_c.cc @@ -142,18 +142,15 @@ fcd_source_c::fcd_source_c(const std::string &args) : std::cerr << "Using " << name() << " (" << dev_name << ")" << std::endl; -#ifdef HAVE_FCD if ( FUNCUBE_V1 == _type ) { - _src_v1 = gr::fcd::source_c::make( dev_name ); + _src_v1 = gr::fcdproplus::fcd::make( dev_name ); connect( _src_v1, 0, self(), 0 ); set_gain( 20, "LNA" ); set_gain( 12, "MIX" ); } -#endif -#ifdef HAVE_FCDPP if ( FUNCUBE_V2 == _type ) { _src_v2 = gr::fcdproplus::fcdproplus::make( dev_name ); @@ -163,7 +160,6 @@ fcd_source_c::fcd_source_c(const std::string &args) : set_gain( 1, "MIX" ); set_gain( 15, "BB" ); } -#endif } fcd_source_c::~fcd_source_c() @@ -241,15 +237,11 @@ osmosdr::freq_range_t fcd_source_c::get_freq_range( size_t chan ) double fcd_source_c::set_center_freq( double freq, size_t chan ) { -#ifdef HAVE_FCD if ( FUNCUBE_V1 == _type ) _src_v1->set_freq( float(freq) ); -#endif -#ifdef HAVE_FCDPP if ( FUNCUBE_V2 == _type ) _src_v2->set_freq( float(freq) ); -#endif _freq = freq; @@ -263,15 +255,11 @@ double fcd_source_c::get_center_freq( size_t chan ) double fcd_source_c::set_freq_corr( double ppm, size_t chan ) { -#ifdef HAVE_FCD if ( FUNCUBE_V1 == _type ) _src_v1->set_freq_corr( ppm ); -#endif -#ifdef HAVE_FCDPP if ( FUNCUBE_V2 == _type ) _src_v2->set_freq_corr( ppm ); -#endif _correct = ppm; @@ -343,7 +331,6 @@ double fcd_source_c::set_gain( double gain, size_t chan ) double fcd_source_c::set_gain( double gain, const std::string & name, size_t chan ) { -#ifdef HAVE_FCD if ( FUNCUBE_V1 == _type ) { if ( "LNA" == name ) @@ -357,9 +344,7 @@ double fcd_source_c::set_gain( double gain, const std::string & name, size_t cha _src_v1->set_mixer_gain(_mix_gain); } } -#endif -#ifdef HAVE_FCDPP if ( FUNCUBE_V2 == _type ) { if ( "LNA" == name ) @@ -378,7 +363,6 @@ double fcd_source_c::set_gain( double gain, const std::string & name, size_t cha _src_v2->set_if_gain(_bb_gain); } } -#endif return get_gain( name, chan ); } diff --git a/lib/fcd/fcd_source_c.h b/lib/fcd/fcd_source_c.h index 70239f8533..2b02eb1052 100644 --- a/lib/fcd/fcd_source_c.h +++ b/lib/fcd/fcd_source_c.h @@ -22,13 +22,8 @@ #include <gnuradio/hier_block2.h> -#ifdef HAVE_FCD -#include <gnuradio/fcd/source_c.h> -#endif - -#ifdef HAVE_FCDPP +#include <fcdproplus/fcd.h> #include <fcdproplus/fcdproplus.h> -#endif #include "source_iface.h" @@ -86,12 +81,8 @@ public: private: dongle_type _type; -#ifdef HAVE_FCD - gr::fcd::source_c::sptr _src_v1; -#endif -#ifdef HAVE_FCDPP + gr::fcdproplus::fcd::sptr _src_v1; gr::fcdproplus::fcdproplus::sptr _src_v2; -#endif double _lna_gain, _mix_gain, _bb_gain, _freq; int _correct; }; -- 2.25.1

5 years

fl2k on rpi4: no more USB error

by Carl-Fredrik Enell

Dear all, I found that the fix for the USB issue on ARM systems has finally made it into the Linux kernel, 5.6.14 and 5.7-rc6. Today I installed the latest Manjaro 64 unstable mainline kernel on my rpi4 and made some quick tests with fl-wspr (https://github.com/tejeez/fl2k-tool). There are no more USB errors*, but I still get underflow errors at high sample rates. In my quick tests the maximum reliable sample rate was about 20 MHz when running in an X session with other programs. When I stopped the X server and ran in a text console I could go above 30 MHz without underflows. This means that the rpi4 is fine as an SDR transceiver for many purposes- but it would be nice to know if it is possible to tune the system for a bit higher sample rates! All the best SM2YHP Fredrik * Installed AUR package libosmo-fl2k-git to fix other USB device issues -- ------------------ Carl-Fredrik Enell Föraregatan 26B SE-98139 Kiruna +46705508256 -----------------

5 years, 1 month

[PATCH] Loop in soapy_source_c::work() when readStream() returns SOAPY_SDR_OVERFLOW

by Anton Blanchard

I'm using an Airspy HF+ Discovery with the Soapy driver. Whenever I turn AGC off it stops receiving samples. On closer inspection, switching AGC off results in samples stalling for an extended period (hundreds of milliseconds). As such, we hit the timeout in SoapyAirspyHF::readStream() and return SOAPY_SDR_TIMEOUT (-1). Things go wrong at this point. It takes a long time before readStream() is called again, presumably because we returned 0 from work(). By this time our buffers have overflown, readStream() returns SOAPY_SDR_OVERFLOW (-2) and work() returns 0. We loop forever, continually overflowing buffers. Fix this by looping in soapy_source_c::work() when ->readStream() returns SOAPY_SDR_OVERFLOW so that we consume the buffers straight away. Signed-off-by: Anton Blanchard <anton(a)ozlabs.org> --- lib/soapy/soapy_source_c.cc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/soapy/soapy_source_c.cc b/lib/soapy/soapy_source_c.cc index a645361..9dcc885 100644 --- a/lib/soapy/soapy_source_c.cc +++ b/lib/soapy/soapy_source_c.cc @@ -96,9 +96,13 @@ int soapy_source_c::work( int noutput_items, { int flags = 0; long long timeNs = 0; - int ret = _device->readStream( - _stream, &output_items[0], - noutput_items, flags, timeNs); + int ret; + + do { + ret = _device->readStream( + _stream, &output_items[0], + noutput_items, flags, timeNs); + } while (ret == SOAPY_SDR_OVERFLOW); if (ret < 0) return 0; //call again return ret; -- 2.25.2

5 years, 1 month

[PATCH] librtlsdr: cmake: add options to enable/disable static or shared target in build

by Gwenhael Goavec-Merou

When librtlsdr is build with an environment with static libraries, the build fails with messages like: /buildroot/librtl/output/host/lib/gcc/aarch64-buildroot-linux-uclibc/8.4.0/../../../../aarch64-buildroot-linux-uclibc/bin/ld: /buildroot/librtl/output/host/aarch64-buildroot-linux-uclibc/sysroot/usr/lib/libusb-1.0.a(libusb_1_0_la-core.o): relocation R_AARCH64_ADR_PREL_PG_HI21 against symbol `stderr' which may bind externally can not be used when making a shared object; recompile with -fPIC /buildroot/librtl/output/host/aarch64-buildroot-linux-uclibc/sysroot/usr/lib/libusb-1.0.a(libusb_1_0_la-core.o): in function `usbi_log_str': core.c:(.text+0xf8): dangerous relocation: unsupported relocation This patch add options to select if librtlsdr must be build in static mode, shared mode or both. Adapted from https://github.com/steve-m/librtlsdr/pull/46 and https://git.buildroot.net/buildroot/tree/package/librtlsdr/0001-disable_sha… Signed-off-by: Yuvaraj Patil <yuvaraj.patil(a)wipro.com> Signed-off-by: Fabrice Fontaine <fontaine.fabrice(a)gmail.com> Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou(a)trabucayre.com> --- src/CMakeLists.txt | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 33faee7..d82fc87 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -18,6 +18,8 @@ ######################################################################## # Setup shared library variant ######################################################################## +option(BUILD_SHARED_LIBS "Build shared library" ON) +if(BUILD_SHARED_LIBS) add_library(rtlsdr SHARED librtlsdr.c tuner_e4k.c tuner_fc0012.c tuner_fc0013.c tuner_fc2580.c tuner_r82xx.c) target_link_libraries(rtlsdr PkgConfig::LIBUSB) @@ -30,10 +32,14 @@ set_target_properties(rtlsdr PROPERTIES OUTPUT_NAME rtlsdr) set_target_properties(rtlsdr PROPERTIES SOVERSION ${MAJOR_VERSION}) set_target_properties(rtlsdr PROPERTIES VERSION ${LIBVER}) generate_export_header(rtlsdr) +list(APPEND rtlsdr_lib rtlsdr) +endif() ######################################################################## # Setup static library variant ######################################################################## +option(BUILD_STATIC_LIBS "Build static library" ON) +if(BUILD_STATIC_LIBS) add_library(rtlsdr_static STATIC librtlsdr.c tuner_e4k.c tuner_fc0012.c tuner_fc0013.c tuner_fc2580.c tuner_r82xx.c) target_link_libraries(rtlsdr_static PkgConfig::LIBUSB) @@ -47,6 +53,8 @@ if(NOT WIN32) set_target_properties(rtlsdr_static PROPERTIES OUTPUT_NAME rtlsdr) endif() generate_export_header(rtlsdr_static) +list(APPEND rtlsdr_lib rtlsdr_static) +endif() ######################################################################## # Set up Windows DLL resource files @@ -90,37 +98,37 @@ add_executable(rtl_eeprom rtl_eeprom.c) add_executable(rtl_adsb rtl_adsb.c) add_executable(rtl_power rtl_power.c) add_executable(rtl_biast rtl_biast.c) -set(INSTALL_TARGETS rtlsdr rtlsdr_static rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power rtl_biast) +set(INSTALL_TARGETS ${rtlsdr_lib} rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power rtl_biast) -target_link_libraries(rtl_sdr rtlsdr convenience_static +target_link_libraries(rtl_sdr ${rtlsdr_lib} convenience_static ${LIBUSB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) -target_link_libraries(rtl_tcp rtlsdr convenience_static +target_link_libraries(rtl_tcp ${rtlsdr_lib} convenience_static ${LIBUSB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) -target_link_libraries(rtl_test rtlsdr convenience_static +target_link_libraries(rtl_test ${rtlsdr_lib} convenience_static ${LIBUSB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) -target_link_libraries(rtl_fm rtlsdr convenience_static +target_link_libraries(rtl_fm ${rtlsdr_lib} convenience_static ${LIBUSB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) -target_link_libraries(rtl_eeprom rtlsdr convenience_static +target_link_libraries(rtl_eeprom ${rtlsdr_lib} convenience_static ${LIBUSB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) -target_link_libraries(rtl_adsb rtlsdr convenience_static +target_link_libraries(rtl_adsb ${rtlsdr_lib} convenience_static ${LIBUSB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) -target_link_libraries(rtl_power rtlsdr convenience_static +target_link_libraries(rtl_power ${rtlsdr_lib} convenience_static ${LIBUSB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) -target_link_libraries(rtl_biast rtlsdr convenience_static +target_link_libraries(rtl_biast ${rtlsdr_lib} convenience_static ${LIBUSB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) @@ -156,12 +164,16 @@ endif() ######################################################################## # Install built library files & utilities ######################################################################## +if(BUILD_SHARED_LIBS) install(TARGETS rtlsdr EXPORT RTLSDR-export LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} # .so/.dylib file ) +endif() +if(BUILD_STATIC_LIBS) install(TARGETS rtlsdr_static EXPORT RTLSDR-export ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} # .so/.dylib file ) +endif() install(TARGETS rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power DESTINATION ${CMAKE_INSTALL_BINDIR} ) -- 2.26.2

5 years, 1 month

PS Name and PI code modification

by Marco Domenico Cimato

Hi everyone, thanks in advance for the support, where I can modify the subject value. I have found the variable inside rds_mod.c but I didn't find anywhere they are set. The request is made because seems the windows binaries has them but they were set and compiled or it's me that I didn't find where they are? Kind regards, Marco

5 years, 1 month

Bug in rtl_sdr

by John Tiller

I believe there is a bug in rtl_sdr.c at lines 89 and 242. When bytes_to_read == len (or n_read), then bytes_to_read becomes 0 at lines 101 and 258 and the read never terminates since 0 means infinite read. I believe the fix is to change lines 89 and 242 to read: if ((bytes_to_read > 0) && (bytes_to_read <= len)) { // Versus bytes_to_read < len if ((bytes_to_read > 0) && (bytes_to_read <= (uint32_t)n_read)) { // Likewise John Tiller

5 years, 2 months

OSMOCOM TRX_BTS_BSC Connection Issue

by Aalto Koskinen

Hi, I looked at the forum for answers before posting, but I unfortunately couldn't get answers to what I was looking for. I looked into particular https://www.mail-archive.com/openbsc@lists.osmocom.org/msg09819.html for solving my issue. Issue: I cannot connect BTS,TRX and BSC. The other modules of the network are able to connect to each other. I have the RSP POWEROFF message originating in log from TRX-UHD module and the BTS module is shuttiing down. BTS connects via OML but fails to connect RSL. I looked through the configuration files and seem correct to me. As per the previous email archive, I wanted to login to VTY and check the logs, but, it logs out as the BTS module shuts down (I cannot connect and see what's happening). Any suggestions would be appreciated on solving the issue. I am trying to create a test 2G OSMOCOM network. Logs are written below and configuration as attachments. Thanks for your help! *OSMO_BTS_TRX log:* systemd[1]: Started Osmocom osmo-bts for osmo-trx. osmo-bts-trx[23221]: <0017> control_if.c:911 CTRL at 127.0.0.1 4238 osmo-bts-trx[23221]: <0010> telnet_interface.c:104 Available via telnet 127.0.0.1 4241 osmo-bts-trx[23221]: <0012> input/ipaccess.c:1024 enabling ipaccess BTS mode, OML connecting to 192.168.0.9:3002 osmo-bts-trx[23221]: <000b> trx_if.c:1174 phy0.0: Open transceiver osmo-bts-trx[23221]: <000b> trx_if.c:185 phy0.0: No satisfactory response from transceiver(CMD POWEROFF) osmo-bts-trx[23221]: <000b> trx_if.c:185 phy0.0: No satisfactory response from transceiver(CMD POWEROFF) osmo-bts-trx[23221]: <000b> trx_if.c:185 phy0.0: No satisfactory response from transceiver(CMD POWEROFF) osmo-bts-trx[23221]: <000b> trx_if.c:185 phy0.0: No satisfactory response from transceiver(CMD POWEROFF) osmo-bts-trx[23221]: <000b> trx_if.c:185 phy0.0: No satisfactory response from transceiver(CMD POWEROFF) osmo-bts-trx[23221]: <000b> trx_if.c:185 phy0.0: No satisfactory response from transceiver(CMD POWEROFF) osmo-bts-trx[23221]: <000d> abis.c:142 Signalling link down osmo-bts-trx[23221]: <0001> bts.c:292 Shutting down BTS 0, Reason Abis close osmo-bts-trx[23221]: <000b> trx_if.c:185 phy0.0: No satisfactory response from transceiver(CMD POWEROFF) osmo-bts-trx[23221]: Shutdown timer expired osmo-bts-trx[23221]: ((*)) osmo-bts-trx[23221]: | osmo-bts-trx[23221]: / \ OsmoBTS *OSMO_TRX_UHD log:* osmo-trx-lms[7995]: DTRXCTRL <0001> Transceiver.cpp:773 [tid=140437098583808][chan=0] command is 'POWEROFF' osmo-trx-lms[7995]: DTRXCTRL <0001> Transceiver.cpp:918 [tid=140437098583808][chan=0] response is 'RSP POWEROFF 0'

5 years, 2 months

RTL-SDR Installation on Ubuntu 18.04

by Jenrica Decafe

Good day! I am Jenrica from the Philippines and I am currently developing a low-cost SDR ground radio receiver for L/S band satellites. I personally emailed you to ask for your build steps for rtlsdr on gnu radio installation (ubuntu 18.04). I have tried many ways already but I still can't find the rtl-sdr source in the GRC. Your positive response is highly appreciated. Thank you

5 years, 2 months

Request for Comment: Creating a binary format output for rtl_power

by Bill Gaylord

Hello, I am working on making a binary format for rtl_power to save space on my server for observing the spectrum. I am wondering if anyone else would be interested in this idea. I am hoping keep the same format in terms of how the data is organized in the file but instead of using text use some form of binary format. For example for the date and time I think using a unix epoch timestamp would work. I am hoping to receive any comments or criticism. Thanks, KD9KCK

5 years, 3 months

Fix 64 bit casts in librtlsdr

by Christian Ebner

5 years, 4 months

← Newer
1
...
10
11
12
13
14
15
16
...
91
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

osmocom-sdr