diff --git a/CMakeLists.txt b/CMakeLists.txt index 58491d7d8..bccb310a7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,8 +38,6 @@ option(ENABLE_RAW_UDP "Enable the use of high-optimized custom UDP packet sample option(ENABLE_FLEXIBAND "Enable the use of the signal source adater for the Teleorbit Flexiband GNU Radio driver" OFF) -option(ENABLE_GN3S "Enable the use of the GN3S dongle as signal source (experimental)" OFF) - option(ENABLE_ARRAY "Enable the use of CTTC's antenna array front-end as signal source (experimental)" OFF) # Performance analysis tools @@ -3032,32 +3030,6 @@ if(ENABLE_FLEXIBAND) endif() -###################### -# GN3S - OPTIONAL -###################### -if(DEFINED ENV{GN3S_DRIVER}) - message(STATUS "GN3S_DRIVER environment variable found.") - set(ENABLE_GN3S ON) -endif() -if(GN3S_DRIVER) - set(ENABLE_GN3S ON) -endif() -find_package(GRGN3S QUIET) -set_package_properties(GRGN3S PROPERTIES - URL "https://github.com/gnss-sdr/gr-gn3s" - DESCRIPTION "The GN3S v2 front-end GNU Radio block." - PURPOSE "Used for communication with the GN3S v2 front-end." - TYPE OPTIONAL -) -if(ENABLE_GN3S) - message(STATUS "The GN3S driver will be compiled.") - message(STATUS " You can disable it with 'cmake -DENABLE_GN3S=OFF ..'") -else() - message(STATUS "The (optional and experimental) GN3S driver is not enabled.") - message(STATUS " Enable it with 'cmake -DENABLE_GN3S=ON ..' to add support for the GN3S dongle.") -endif() - - ####################################################### # CTTC's digital array beamformer prototype - OPTIONAL ####################################################### @@ -3265,7 +3237,6 @@ add_feature_info(ENABLE_PLUTOSDR ENABLE_PLUTOSDR "Enables Plutosdr_Signal_Source add_feature_info(ENABLE_AD9361 ENABLE_AD9361 "Enables Ad9361_Fpga_Signal_Source for devices with the AD9361 chipset. Requires libiio and libad9361-dev.") add_feature_info(ENABLE_RAW_UDP ENABLE_RAW_UDP "Enables Custom_UDP_Signal_Source for custom UDP packet sample source. Requires libpcap.") add_feature_info(ENABLE_FLEXIBAND ENABLE_FLEXIBAND "Enables Flexiband_Signal_Source for using Teleorbit's Flexiband RF front-end. Requires gr-teleorbit.") -add_feature_info(ENABLE_GN3S ENABLE_GN3S "Enables Gn3s_Signal_Source for using the GN3S v2 dongle. Requires gr-gn3s.") add_feature_info(ENABLE_ARRAY ENABLE_ARRAY "Enables Raw_Array_Signal_Source and Array_Signal_Conditioner for using CTTC's antenna array. Requires gr-dbfcttc.") add_feature_info(ENABLE_GPERFTOOLS ENABLE_GPERFTOOLS "Enables performance analysis. Requires Gperftools.") add_feature_info(ENABLE_GPROF ENABLE_GPROF "Enables performance analysis with 'gprof'.") diff --git a/README.md b/README.md index ac124fa2e..7c6a846f9 100644 --- a/README.md +++ b/README.md @@ -2139,8 +2139,8 @@ processed. Another interesting option is working in real-time with an RF front-end. We provide drivers for UHD-compatible hardware such as the [USRP family](https://www.ettus.com/product), for OsmoSDR and other front-ends -(HackRF, bladeRF, LimeSDR), for the GN3S v2 USB dongle, and for some DVB-T USB -dongles. Start with a low number of channels and then increase it in order to +(HackRF, bladeRF, LimeSDR, and for some DVB-T USB dongles). +Start with a low number of channels and then increase it in order to test how many channels your processor can handle in real-time. You can find more information at the diff --git a/cmake/Modules/FindGRGN3S.cmake b/cmake/Modules/FindGRGN3S.cmake deleted file mode 100644 index c53f5da6a..000000000 --- a/cmake/Modules/FindGRGN3S.cmake +++ /dev/null @@ -1,80 +0,0 @@ -# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. -# This file is part of GNSS-SDR. -# -# SPDX-FileCopyrightText: 2011-2020 C. Fernandez-Prades cfernandez(at)cttc.es -# SPDX-License-Identifier: BSD-3-Clause - -######################################################################## -# Find GR-GN3S Module -######################################################################## - -# -# Provides the following imported target: -# Gnuradio::gn3s -# - -if(NOT PKG_CONFIG_FOUND) - include(FindPkgConfig) -endif() - -pkg_check_modules(PC_GR_GN3S gr-gn3s) - -if(NOT GRGN3S_ROOT) - set(GRGN3S_ROOT_USER_DEFINED /usr/local) -else() - set(GRGN3S_ROOT_USER_DEFINED ${GRGN3S_ROOT}) -endif() -if(DEFINED ENV{GRGN3S_ROOT}) - set(GRGN3S_ROOT_USER_DEFINED - ${GRGN3S_ROOT_USER_DEFINED} - $ENV{GRGN3S_ROOT} - ) -endif() -if(DEFINED ENV{GR_GN3S_DIR}) - set(GRGN3S_ROOT_USER_DEFINED - ${GRGN3S_ROOT_USER_DEFINED} - $ENV{GR_GN3S_DIR} - ) -endif() -set(GRGN3S_ROOT_USER_DEFINED - ${GRGN3S_ROOT_USER_DEFINED} - ${CMAKE_INSTALL_PREFIX} -) - -find_path( - GR_GN3S_INCLUDE_DIRS - NAMES gn3s/gn3s_api.h - HINTS ${PC_GR_GN3S_INCLUDEDIR} - PATHS ${GRGN3S_ROOT_USER_DEFINED}/include - /usr/include - /usr/local/include - /opt/local/include -) - -find_library( - GR_GN3S_LIBRARIES - NAMES gr-gn3s - HINTS ${PC_GR_GN3S_LIBDIR} - PATHS ${GRGN3S_ROOT_USER_DEFINED}/lib - ${GRGN3S_ROOT_USER_DEFINED}/lib64 - /usr/lib - /usr/lib64 - /usr/local/lib - /usr/local/lib64 - /opt/local/lib -) - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(GRGN3S DEFAULT_MSG GR_GN3S_LIBRARIES GR_GN3S_INCLUDE_DIRS) - -if(GRGN3S_FOUND AND NOT TARGET Gnuradio::gn3s) - add_library(Gnuradio::gn3s SHARED IMPORTED) - set_target_properties(Gnuradio::gn3s PROPERTIES - IMPORTED_LINK_INTERFACE_LANGUAGES "CXX" - IMPORTED_LOCATION "${GR_GN3S_LIBRARIES}" - INTERFACE_INCLUDE_DIRECTORIES "${GR_GN3S_INCLUDE_DIRS}" - INTERFACE_LINK_LIBRARIES "${GR_GN3S_LIBRARIES}" - ) -endif() - -mark_as_advanced(GR_GN3S_LIBRARIES GR_GN3S_INCLUDE_DIRS) diff --git a/conf/gnss-sdr_GPS_L1_GN3S_realtime.conf b/conf/gnss-sdr_GPS_L1_GN3S_realtime.conf deleted file mode 100644 index 0492c8c2f..000000000 --- a/conf/gnss-sdr_GPS_L1_GN3S_realtime.conf +++ /dev/null @@ -1,115 +0,0 @@ -; This is a GNSS-SDR configuration file -; The configuration API is described at https://gnss-sdr.org/docs/sp-blocks/ -; SPDX-License-Identifier: GPL-3.0-or-later -; SPDX-FileCopyrightText: (C) 2010-2020 (see AUTHORS file for a list of contributors) - -; You can define your own receiver and invoke it by doing -; gnss-sdr --config_file=my_GNSS_SDR_configuration.conf -; - -[GNSS-SDR] - -;######### GLOBAL OPTIONS ################## -;internal_fs_sps: Internal signal sampling frequency after the signal conditioning stage [samples per second]. -GNSS-SDR.internal_fs_sps=2727933.33 ; 8183800/3 - - -;######### SIGNAL_SOURCE CONFIG ############ -;#implementation: -;#Notes for GN3S source: -; - The front-end sampling frequency is fixed to 8.1838 MSPS (8183800 Hz). -; - The baseband signal is shifted to an IF of 38400 Hz. It should be corrected with the signal conditioner block -GNSS-SDR.internal_fs_sps=2727933.33 ; 8183800/3 - -;######### SIGNAL_SOURCE CONFIG ############ -SignalSource.implementation=GN3S_Signal_Source -SignalSource.item_type=gr_complex -SignalSource.sampling_frequency=8183800 -SignalSource.dump=false -SignalSource.dump_filename=../signal_source.dat - -;######### SIGNAL_CONDITIONER CONFIG ############ -SignalConditioner.implementation=Signal_Conditioner - -;######### DATA_TYPE_ADAPTER CONFIG ############ -DataTypeAdapter.implementation=Pass_Through - -;######### INPUT_FILTER CONFIG ############ -InputFilter.implementation=Freq_Xlating_Fir_Filter -InputFilter.dump=false -InputFilter.dump_filename=../data/input_filter.dat -InputFilter.input_item_type=gr_complex -InputFilter.output_item_type=gr_complex -InputFilter.taps_item_type=float -InputFilter.number_of_taps=5 -InputFilter.number_of_bands=2 -InputFilter.band1_begin=0.0 -InputFilter.band1_end=0.45 -InputFilter.band2_begin=0.55 -InputFilter.band2_end=1.0 -InputFilter.ampl1_begin=1.0 -InputFilter.ampl1_end=1.0 -InputFilter.ampl2_begin=0.0 -InputFilter.ampl2_end=0.0 -InputFilter.band1_error=1.0 -InputFilter.band2_error=1.0 -InputFilter.filter_type=bandpass -InputFilter.grid_density=16 -InputFilter.sampling_frequency=8183800 -InputFilter.IF=38400 -InputFilter.decimation_factor=3 - -;######### RESAMPLER CONFIG ############ -Resampler.implementation=Pass_Through -Resampler.dump=false -Resampler.dump_filename=../data/resampler.dat - - -;######### CHANNELS GLOBAL CONFIG ############ -Channels_1C.count=5 -Channels.in_acquisition=1 -Channel.signal=1C - -;######### ACQUISITION GLOBAL CONFIG ############ -Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition -Acquisition_1C.item_type=gr_complex -Acquisition_1C.coherent_integration_time_ms=1 -Acquisition_1C.pfa=0.01 -Acquisition_1C.doppler_max=10000 -Acquisition_1C.doppler_step=500 -Acquisition_1C.dump=false -Acquisition_1C.dump_filename=./acq_dump.dat - -;######### TRACKING GLOBAL CONFIG ############ -Tracking_1C.implementation=GPS_L1_CA_DLL_PLL_Tracking -Tracking_1C.item_type=gr_complex -Tracking_1C.pll_bw_hz=45.0; -Tracking_1C.dll_bw_hz=2.0; -Tracking_1C.order=3; -Tracking_1C.dump=false -Tracking_1C.dump_filename=../data/epl_tracking_ch_ - -;######### TELEMETRY DECODER GPS CONFIG ############ -TelemetryDecoder_1C.implementation=GPS_L1_CA_Telemetry_Decoder -TelemetryDecoder_1C.dump=false - -;######### OBSERVABLES CONFIG ############ -Observables.implementation=Hybrid_Observables -Observables.dump=false. -Observables.dump_filename=./observables.dat - -;######### PVT CONFIG ############ -PVT.implementation=RTKLIB_PVT -PVT.positioning_mode=PPP_Static ; options: Single, Static, Kinematic, PPP_Static, PPP_Kinematic -PVT.iono_model=Broadcast ; options: OFF, Broadcast, SBAS, Iono-Free-LC, Estimate_STEC, IONEX -PVT.trop_model=Saastamoinen ; options: OFF, Saastamoinen, SBAS, Estimate_ZTD, Estimate_ZTD_Grad -PVT.output_rate_ms=10 -PVT.display_rate_ms=500 -PVT.dump_filename=./PVT -PVT.nmea_dump_filename=./gnss_sdr_pvt.nmea -PVT.flag_nmea_tty_port=false; -PVT.nmea_dump_devname=/dev/pts/4 -PVT.dump=false -PVT.flag_rtcm_server=false -PVT.flag_rtcm_tty_port=false -PVT.rtcm_dump_devname=/dev/pts/1 diff --git a/conf/gnss-sdr_GPS_L1_nsr_kf.conf b/conf/gnss-sdr_GPS_L1_nsr_kf.conf index 4baa748d1..91015fc9b 100644 --- a/conf/gnss-sdr_GPS_L1_nsr_kf.conf +++ b/conf/gnss-sdr_GPS_L1_nsr_kf.conf @@ -13,7 +13,7 @@ GNSS-SDR.internal_fs_sps=2560000 ;GNSS-SDR.internal_fs_sps=5120000 ;######### SIGNAL_SOURCE CONFIG ############ -;#implementation: Use [File_Signal_Source] [Nsr_File_Signal_Source] or [UHD_Signal_Source] or [GN3S_Signal_Source] (experimental) +;#implementation: Use [File_Signal_Source] [Nsr_File_Signal_Source] or [UHD_Signal_Source] SignalSource.implementation=Nsr_File_Signal_Source ;#filename: path to file with the captured GNSS signal samples to be processed diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 1211d36b9..27c8441a2 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -676,6 +676,8 @@ features and bug fixes: features.log in the building directory. - Improved information provided to the user in case of building configuration and runtime failures. +- Remove abandoned building option `-DENABLE_GN3S` and `Gn3s_Signal_Source` + implementation. See the definitions of concepts and metrics at https://gnss-sdr.org/design-forces/ diff --git a/docs/doxygen/other/main_page.dox b/docs/doxygen/other/main_page.dox index d5d9fdb51..062b61813 100644 --- a/docs/doxygen/other/main_page.dox +++ b/docs/doxygen/other/main_page.dox @@ -61,7 +61,6 @@ As signal inputs, it accepts: \li Raw data file captured with a data grabber (digitized at some intermediate frequency or directly at baseband). \li Any suitable RF configuration that can be driven by the Universal Software Radio Peripheral Hardware Driver (UHD). This includes all current and future Ettus Research products. The USRP1 + DBSRX 2.2 daughterboard is an example of working configuration for GPS L1 C/A and Galileo E1B and E1C signals. -\li The GN3S v2 USB dongle (GN3S v3 might work with small modifications). \li Experimentally, with some USB DVB-T dongles based on the Realtek RTL2832U chipset. \li For mathematical representations of the targeted signals, check out the \ref the_signal_model page. @@ -630,8 +629,8 @@ of a Radio Frequency front-end's Analog-to_Digital converter. GNSS-SDR needs sig Prepare your configuration file, and then you are ready for going to the gnss-sdr/install folder, running ./gnss-sdr, and see how the file is processed. Please ask the Developer Team for a signal sample if you need one, and they will do their best ;-) -Another interesting option is working in real-time with a RF front-end. We provide drivers for UHD-compatible hardware (see \ref signal_source), for the GN3S v2 USB dongle -and for some DVB-T USB dongles. Start with a low number of channels and then increase it in order to test how many channels your processor can handle in real-time. +Another interesting option is working in real-time with a RF front-end. We provide drivers for UHD-compatible hardware (see \ref signal_source) and for some DVB-T USB dongles. +Start with a low number of channels and then increase it in order to test how many channels your processor can handle in real-time. You can find more information at the GNSS-SDR Documentation page or directly asking to the GNSS-SDR Developers mailing list. diff --git a/src/algorithms/signal_source/adapters/CMakeLists.txt b/src/algorithms/signal_source/adapters/CMakeLists.txt index d4ea3888f..80071aa00 100644 --- a/src/algorithms/signal_source/adapters/CMakeLists.txt +++ b/src/algorithms/signal_source/adapters/CMakeLists.txt @@ -42,19 +42,6 @@ if(ENABLE_AD9361) endif() -if(ENABLE_GN3S) - ############################################## - # GN3S (USB dongle) - ############################################## - if(NOT GRGN3S_FOUND) - message(" gr-gn3s not found, install it from https://github.com/gnss-sdr/gr-gn3s") - message(FATAL_ERROR "gr-gn3s required for building gnss-sdr with this option enabled") - endif() - set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} gn3s_signal_source.cc) - set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} gn3s_signal_source.h) -endif() - - if(ENABLE_FLEXIBAND AND TELEORBIT_FOUND) set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} flexiband_signal_source.cc) set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} flexiband_signal_source.h) @@ -223,13 +210,6 @@ if(ENABLE_FLEXIBAND AND TELEORBIT_FOUND) ) endif() -if(ENABLE_GN3S AND GRGN3S_FOUND) - target_link_libraries(signal_source_adapters - PRIVATE - Gnuradio::gn3s - ) -endif() - if(ENABLE_ARRAY AND GRDBFCTTC_FOUND) target_link_libraries(signal_source_adapters PRIVATE diff --git a/src/algorithms/signal_source/adapters/gn3s_signal_source.cc b/src/algorithms/signal_source/adapters/gn3s_signal_source.cc deleted file mode 100644 index 0262b1a0c..000000000 --- a/src/algorithms/signal_source/adapters/gn3s_signal_source.cc +++ /dev/null @@ -1,104 +0,0 @@ -/*! - * \file gn3s_signal_source.cc - * \brief GN3S USB dongle GPS RF front-end signal sampler driver - * \author Javier Arribas, jarribas(at)cttc.es - * - * ----------------------------------------------------------------------------- - * - * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. - * This file is part of GNSS-SDR. - * - * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) - * SPDX-License-Identifier: GPL-3.0-or-later - * - * ----------------------------------------------------------------------------- - */ - -#include "gn3s_signal_source.h" -#include "configuration_interface.h" -#include "gnss_sdr_string_literals.h" -#include -#include -#include - -using namespace std::string_literals; - - -Gn3sSignalSource::Gn3sSignalSource(const ConfigurationInterface* configuration, - std::string role, - unsigned int in_stream, - unsigned int out_stream, - Concurrent_Queue* queue) - : SignalSourceBase(configuration, role, "Gn3s_Signal_Source"s), in_stream_(in_stream), out_stream_(out_stream) -{ - const std::string default_item_type("short"); - const std::string default_dump_file("./data/gn3s_source.dat"); - item_type_ = configuration->property(role + ".item_type", default_item_type); - dump_ = configuration->property(role + ".dump", false); - dump_filename_ = configuration->property(role + ".dump_filename", default_dump_file); - - if (item_type_.compare("gr_complex") == 0) - { - item_size_ = sizeof(gr_complex); - gn3s_source_ = gn3s_make_source_cc(); - DLOG(INFO) << "Item size " << item_size_; - DLOG(INFO) << "gn3s_source(" << gn3s_source_->unique_id() << ")"; - } - // else if (item_type_.compare("short") == 0) - // { - // item_size_ = sizeof(short); - // resampler_ = direct_resampler_make_conditioner_ss(sample_freq_in_, - // sample_freq_out_); - // } - else - { - LOG(WARNING) << item_type_ - << " unrecognized item type for resampler"; - item_size_ = sizeof(short); - } - if (dump_) - { - DLOG(INFO) << "Dumping output into file " << dump_filename_; - file_sink_ = gr::blocks::file_sink::make(item_size_, dump_filename_.c_str()); - } - if (dump_) - { - DLOG(INFO) << "file_sink(" << file_sink_->unique_id() << ")"; - } -} - - -void Gn3sSignalSource::connect(gr::top_block_sptr top_block) -{ - if (dump_) - { - top_block->connect(gn3s_source_, 0, file_sink_, 0); - DLOG(INFO) << "connected gn3s_source to file sink"; - } - else - { - DLOG(INFO) << "nothing to connect internally"; - } -} - - -void Gn3sSignalSource::disconnect(gr::top_block_sptr top_block) -{ - if (dump_) - { - top_block->disconnect(gn3s_source_, 0, file_sink_, 0); - } -} - - -gr::basic_block_sptr Gn3sSignalSource::get_left_block() -{ - LOG(WARNING) << "Left block of a signal source should not be retrieved"; - return gr::block_sptr(); -} - - -gr::basic_block_sptr Gn3sSignalSource::get_right_block() -{ - return gn3s_source_; -} diff --git a/src/algorithms/signal_source/adapters/gn3s_signal_source.h b/src/algorithms/signal_source/adapters/gn3s_signal_source.h deleted file mode 100644 index 774b14d5f..000000000 --- a/src/algorithms/signal_source/adapters/gn3s_signal_source.h +++ /dev/null @@ -1,75 +0,0 @@ -/*! - * \file gn3s_signal_source.h - * \brief GN3S USB dongle GPS RF front-end signal sampler driver - * \author Javier Arribas, jarribas(at)cttc.es - * - * ----------------------------------------------------------------------------- - * - * GNSS-SDR is a Global Navigation Satellite System software-defined receiver. - * This file is part of GNSS-SDR. - * - * Copyright (C) 2010-2020 (see AUTHORS file for a list of contributors) - * SPDX-License-Identifier: GPL-3.0-or-later - * - * ----------------------------------------------------------------------------- - */ - - -#ifndef GNSS_SDR_GN3S_SIGNAL_SOURCE_H -#define GNSS_SDR_GN3S_SIGNAL_SOURCE_H - -#include "concurrent_queue.h" -#include "signal_source_base.h" -#include -#include -#include -#include -#include -#include - -/** \addtogroup Signal_Source - * \{ */ -/** \addtogroup Signal_Source_adapters - * \{ */ - - -class ConfigurationInterface; - -/*! - * \brief This class reads samples from a GN3S USB dongle, a RF front-end signal sampler - */ -class Gn3sSignalSource : public SignalSourceBase -{ -public: - Gn3sSignalSource(const ConfigurationInterface* configuration, - std::string role, unsigned int in_stream, - unsigned int out_stream, Concurrent_Queue* queue); - - ~Gn3sSignalSource() = default; - - inline size_t item_size() override - { - return item_size_; - } - - void connect(gr::top_block_sptr top_block) override; - void disconnect(gr::top_block_sptr top_block) override; - gr::basic_block_sptr get_left_block() override; - gr::basic_block_sptr get_right_block() override; - -private: - gr::block_sptr gn3s_source_; - gr::blocks::file_sink::sptr file_sink_; - std::string item_type_; - std::string dump_filename_; - size_t item_size_; - [[maybe_unused]] int64_t samples_; - unsigned int in_stream_; - unsigned int out_stream_; - bool dump_; -}; - - -/** \} */ -/** \} */ -#endif // GNSS_SDR_GN3S_SIGNAL_SOURCE_H diff --git a/src/algorithms/signal_source/adapters/raw_array_signal_source.h b/src/algorithms/signal_source/adapters/raw_array_signal_source.h index fc0cd1d64..c58282406 100644 --- a/src/algorithms/signal_source/adapters/raw_array_signal_source.h +++ b/src/algorithms/signal_source/adapters/raw_array_signal_source.h @@ -37,7 +37,7 @@ class ConfigurationInterface; /*! - * \brief This class reads samples from a GN3S USB dongle, a RF front-end signal sampler + * \brief This class reads samples from an antenna array RF front-end signal sampler */ class RawArraySignalSource : public SignalSourceBase { diff --git a/src/core/receiver/CMakeLists.txt b/src/core/receiver/CMakeLists.txt index 896ef5aad..738b09f32 100644 --- a/src/core/receiver/CMakeLists.txt +++ b/src/core/receiver/CMakeLists.txt @@ -100,10 +100,6 @@ if(ENABLE_OSMOSDR) endif() endif() -if(ENABLE_GN3S) - target_compile_definitions(core_receiver PRIVATE -DGN3S_DRIVER=1) -endif() - if(ENABLE_ARRAY) target_compile_definitions(core_receiver PRIVATE -DRAW_ARRAY_DRIVER=1) endif() @@ -224,13 +220,6 @@ if(ENABLE_FLEXIBAND AND TELEORBIT_FOUND) ) endif() -if(ENABLE_GN3S AND GRGN3S_FOUND) - target_link_libraries(core_receiver - PRIVATE - Gnuradio::gn3s - ) -endif() - if(ENABLE_ARRAY AND GRDBFCTTC_FOUND) target_link_libraries(core_receiver PRIVATE diff --git a/src/core/receiver/gnss_block_factory.cc b/src/core/receiver/gnss_block_factory.cc index b99f5a686..789bfa427 100644 --- a/src/core/receiver/gnss_block_factory.cc +++ b/src/core/receiver/gnss_block_factory.cc @@ -137,10 +137,6 @@ #include "gps_l1_ca_pcps_opencl_acquisition.h" #endif -#if GN3S_DRIVER -#include "gn3s_signal_source.h" -#endif - #if RAW_ARRAY_DRIVER #include "raw_array_signal_source.h" #endif @@ -725,15 +721,6 @@ std::unique_ptr GNSSBlockFactory::GetBlock( } #endif -#if GN3S_DRIVER - else if (implementation == "GN3S_Signal_Source") - { - std::unique_ptr block_ = std::make_unique(configuration, role, in_streams, - out_streams, queue); - block = std::move(block_); - } -#endif - #if RAW_ARRAY_DRIVER else if (implementation == "Raw_Array_Signal_Source") { diff --git a/src/utils/reproducibility/ieee-access18/L2-access18.conf b/src/utils/reproducibility/ieee-access18/L2-access18.conf index 40dca25e0..e6524893c 100644 --- a/src/utils/reproducibility/ieee-access18/L2-access18.conf +++ b/src/utils/reproducibility/ieee-access18/L2-access18.conf @@ -8,7 +8,7 @@ GNSS-SDR.internal_fs_sps=3000000 ;######### SIGNAL_SOURCE CONFIG ############ -;#implementation: Use [File_Signal_Source] or [UHD_Signal_Source] or [GN3S_Signal_Source] (experimental) +;#implementation: Use [File_Signal_Source] or [UHD_Signal_Source] SignalSource.implementation=File_Signal_Source ;#filename: path to file with the captured GNSS signal samples to be processed