1
0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-11-10 20:10:05 +00:00

Sort out building flags and improve their reporting

This commit is contained in:
Carles Fernandez 2024-08-27 15:14:01 +02:00
parent 98a8a0ac64
commit 3f3321f5a7
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
7 changed files with 42 additions and 40 deletions

View File

@ -3715,12 +3715,13 @@ add_subdirectory(src)
add_feature_info(ENABLE_UHD ENABLE_UHD "Enables UHD_Signal_Source for using RF front-ends from the USRP family. Requires gr-uhd.") add_feature_info(ENABLE_UHD ENABLE_UHD "Enables UHD_Signal_Source for using RF front-ends from the USRP family. Requires gr-uhd.")
add_feature_info(ENABLE_OSMOSDR ENABLE_OSMOSDR "Enables Osmosdr_Signal_Source and RtlTcp_Signal_Source for using RF front-ends compatible with the OsmoSDR driver. Requires gr-osmosdr.") add_feature_info(ENABLE_OSMOSDR ENABLE_OSMOSDR "Enables Osmosdr_Signal_Source and RtlTcp_Signal_Source for using RF front-ends compatible with the OsmoSDR driver. Requires gr-osmosdr.")
add_feature_info(ENABLE_LIMESDR ENABLE_LIMESDR "Enables Limesdr_Signal_Source. Requires gr-limesdr.") add_feature_info(ENABLE_LIMESDR ENABLE_LIMESDR "Enables Limesdr_Signal_Source. Requires gr-limesdr.")
add_feature_info(ENABLE_FMCOMMS2 ENABLE_FMCOMMS2 "Enables Fmcomms2_Signal_Source for FMCOMMS2/3/4 devices. Requires gr-iio and libad9361-dev.") add_feature_info(ENABLE_FMCOMMS2 ENABLE_FMCOMMS2 "Enables Fmcomms2_Signal_Source for FMCOMMS2/3/4 devices. Requires libiio, libad9361-dev, and gr-iio.")
add_feature_info(ENABLE_PLUTOSDR ENABLE_PLUTOSDR "Enables Plutosdr_Signal_Source for using ADALM-PLUTO boards. Requires gr-iio.") add_feature_info(ENABLE_PLUTOSDR ENABLE_PLUTOSDR "Enables Plutosdr_Signal_Source and Ad936x_Custom_Signal_Source for using ADALM-PLUTO boards. Requires libiio, libad9361-dev, and gr-iio.")
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_AD936X_SDR ENABLE_AD936X_SDR "Enables Ad936x_Custom_Signal_Source for using ADALM-PLUTO boards with custom firmware. Requires libiio and libad9361-dev.")
add_feature_info(ENABLE_MAX2771 ENABLE_MAX2771 "Enables FPGA_MAX2771_EVKIT_Signal_Source for devices with the MAX2771 chipset. Requires the spidev driver") add_feature_info(ENABLE_FPGA ENABLE_FPGA "Enables building of processing blocks for FPGA offloading.")
add_feature_info(ENABLE_DMA_PROXY ENABLE_DMA_PROXY "Enables DMA Signal_Source. Requires the DMA Proxy driver") add_feature_info(ENABLE_AD9361 ENABLE_AD9361 "Enables ADRV9361_Z7035_Signal_Source_FPGA and the FMCOMMS5_Signal_Source_FPGA for FPGA SoC devices with the AD9361 chipset. Requires libiio, libad9361-dev, and -DENABLE_FPGA=ON.")
add_feature_info(ENABLE_AD936X_SDR ENABLE_AD936X_SDR "Enables Ad936x_Iio_Signal_Source to access AD936X front-ends using libiio. Requires libiio and libad9361-dev.") add_feature_info(ENABLE_MAX2771 ENABLE_MAX2771 "Enables FPGA_MAX2771_EVKIT_Signal_Source for FPGA SoC devices with the with the MAX2771 chipset. Requires the spidev driver and -DENABLE_FPGA=ON.")
add_feature_info(ENABLE_DMA_PROXY ENABLE_DMA_PROXY "Enables DMA_Signal_Source_FPGA for file post-processing in FPGA SoC devices. Requires the DMA Proxy driver and -DENABLE_FPGA=ON.")
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_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_FLEXIBAND ENABLE_FLEXIBAND "Enables Flexiband_Signal_Source for using Teleorbit's Flexiband RF front-end. Requires gr-teleorbit.")
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_ARRAY ENABLE_ARRAY "Enables Raw_Array_Signal_Source and Array_Signal_Conditioner for using CTTC's antenna array. Requires gr-dbfcttc.")
@ -3732,7 +3733,6 @@ add_feature_info(ENABLE_CLANG_TIDY ENABLE_CLANG_TIDY "Runs clang-tidy along with
add_feature_info(ENABLE_PROFILING ENABLE_PROFILING "Runs volk_gnsssdr_profile at the end of the building.") add_feature_info(ENABLE_PROFILING ENABLE_PROFILING "Runs volk_gnsssdr_profile at the end of the building.")
add_feature_info(ENABLE_OPENCL ENABLE_OPENCL "Enables GPS_L1_CA_PCPS_OpenCl_Acquisition (experimental). Requires OpenCL.") add_feature_info(ENABLE_OPENCL ENABLE_OPENCL "Enables GPS_L1_CA_PCPS_OpenCl_Acquisition (experimental). Requires OpenCL.")
add_feature_info(ENABLE_CUDA ENABLE_CUDA "Enables GPS_L1_CA_DLL_PLL_Tracking_GPU (experimental). Requires CUDA.") add_feature_info(ENABLE_CUDA ENABLE_CUDA "Enables GPS_L1_CA_DLL_PLL_Tracking_GPU (experimental). Requires CUDA.")
add_feature_info(ENABLE_FPGA ENABLE_FPGA "Enables building of processing blocks for FPGA offloading.")
add_feature_info(ENABLE_ARMA_NO_DEBUG ENABLE_ARMA_NO_DEBUG "Enables passing the ARMA_NO_DEBUG macro to Armadillo, hence disabling bound checking.") add_feature_info(ENABLE_ARMA_NO_DEBUG ENABLE_ARMA_NO_DEBUG "Enables passing the ARMA_NO_DEBUG macro to Armadillo, hence disabling bound checking.")
add_feature_info(ENABLE_PACKAGING ENABLE_PACKAGING "Enables software packaging.") add_feature_info(ENABLE_PACKAGING ENABLE_PACKAGING "Enables software packaging.")
add_feature_info(ENABLE_OWN_GLOG ENABLE_OWN_GLOG "Forces the downloading and building of Google glog.") add_feature_info(ENABLE_OWN_GLOG ENABLE_OWN_GLOG "Forces the downloading and building of Google glog.")

View File

@ -25,6 +25,14 @@ if(ENABLE_PLUTOSDR)
set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} ad936x_custom_signal_source.h) set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} ad936x_custom_signal_source.h)
endif() endif()
if(ENABLE_AD936X_SDR AND NOT ENABLE_PLUTOSDR)
##############################################
# CUSTOM AD936X IIO SOURCE
##############################################
set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} ad936x_custom_signal_source.cc)
set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} ad936x_custom_signal_source.h)
endif()
if(ENABLE_FMCOMMS2) if(ENABLE_FMCOMMS2)
############################################### ###############################################
# FMCOMMS2 based SDR Hardware # FMCOMMS2 based SDR Hardware

View File

@ -10,13 +10,7 @@ if(ENABLE_RAW_UDP AND PCAP_FOUND)
list(APPEND OPT_DRIVER_HEADERS gr_complex_ip_packet_source.h) list(APPEND OPT_DRIVER_HEADERS gr_complex_ip_packet_source.h)
endif() endif()
if(ENABLE_AD936X_SDR) if(ENABLE_PLUTOSDR OR ENABLE_AD936X_SDR)
set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} gr_complex_ip_packet_source.cc)
set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} gr_complex_ip_packet_source.h)
endif()
if(ENABLE_PLUTOSDR)
set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} ad936x_iio_source.cc) set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} ad936x_iio_source.cc)
set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} ad936x_iio_source.h) set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} ad936x_iio_source.h)
endif() endif()

View File

@ -1,6 +1,7 @@
/*! /*!
* \file ad936x_iio_source.cc * \file ad936x_iio_source.cc
* \brief A direct IIO custom front-end gnss-sdr signal gnuradio block for the AD936x AD front-end family with special FPGA custom functionalities. * \brief A direct IIO custom front-end gnss-sdr signal gnuradio block for the
* AD936x AD front-end family with special FPGA custom functionalities.
* \author Javier Arribas, jarribas(at)cttc.es * \author Javier Arribas, jarribas(at)cttc.es
* *
* ----------------------------------------------------------------------------- * -----------------------------------------------------------------------------
@ -35,9 +36,9 @@
ad936x_iio_source_sptr ad936x_iio_make_source_sptr( ad936x_iio_source_sptr ad936x_iio_make_source_sptr(
const std::string& pluto_uri_, const std::string& pluto_uri_,
const std::string& board_type_, const std::string& board_type_,
long long bandwidth_, int64_t bandwidth_,
long long sample_rate_, int64_t sample_rate_,
long long freq_, int64_t freq_,
const std::string& rf_port_select_, const std::string& rf_port_select_,
const std::string& rf_filter, const std::string& rf_filter,
const std::string& gain_mode_rx0_, const std::string& gain_mode_rx0_,
@ -46,7 +47,7 @@ ad936x_iio_source_sptr ad936x_iio_make_source_sptr(
double rf_gain_rx1_, double rf_gain_rx1_,
bool enable_ch0, bool enable_ch0,
bool enable_ch1, bool enable_ch1,
long long freq_2ch, int64_t freq_2ch,
bool ppsmode_, bool ppsmode_,
bool customsamplesize_, bool customsamplesize_,
const std::string& fe_ip_, const std::string& fe_ip_,
@ -106,9 +107,9 @@ void ad936x_iio_source::ad9361_channel_demux_and_record(ad936x_iio_samples* samp
ad936x_iio_source::ad936x_iio_source( ad936x_iio_source::ad936x_iio_source(
const std::string& pluto_uri_, const std::string& pluto_uri_,
const std::string& board_type_, const std::string& board_type_,
long long bandwidth_, int64_t bandwidth_,
long long sample_rate_, int64_t sample_rate_,
long long freq_, int64_t freq_,
const std::string& rf_port_select_, const std::string& rf_port_select_,
const std::string& rf_filter, const std::string& rf_filter,
const std::string& gain_mode_rx0_, const std::string& gain_mode_rx0_,
@ -117,7 +118,7 @@ ad936x_iio_source::ad936x_iio_source(
double rf_gain_rx1_, double rf_gain_rx1_,
bool enable_ch0, bool enable_ch0,
bool enable_ch1, bool enable_ch1,
long long freq_2ch, int64_t freq_2ch,
bool ppsmode_, bool ppsmode_,
bool customsamplesize_, bool customsamplesize_,
const std::string& fe_ip_, const std::string& fe_ip_,

View File

@ -1,6 +1,7 @@
/*! /*!
* \file ad936x_iio_source.h * \file ad936x_iio_source.h
* \brief A direct IIO custom front-end gnss-sdr signal gnuradio block for the AD936x AD front-end family with special FPGA custom functionalities. * \brief A direct IIO custom front-end gnss-sdr signal gnuradio block for the
* AD936x AD front-end family with special FPGA custom functionalities.
* \author Javier Arribas, jarribas(at)cttc.es * \author Javier Arribas, jarribas(at)cttc.es
* *
* ----------------------------------------------------------------------------- * -----------------------------------------------------------------------------
@ -46,9 +47,9 @@ using ad936x_iio_source_sptr = gnss_shared_ptr<ad936x_iio_source>;
ad936x_iio_source_sptr ad936x_iio_make_source_sptr( ad936x_iio_source_sptr ad936x_iio_make_source_sptr(
const std::string &pluto_uri_, const std::string &pluto_uri_,
const std::string &board_type_, const std::string &board_type_,
long long bandwidth_, int64_t bandwidth_,
long long sample_rate_, int64_t sample_rate_,
long long freq_, int64_t freq_,
const std::string &rf_port_select_, const std::string &rf_port_select_,
const std::string &rf_filter, const std::string &rf_filter,
const std::string &gain_mode_rx0_, const std::string &gain_mode_rx0_,
@ -57,7 +58,7 @@ ad936x_iio_source_sptr ad936x_iio_make_source_sptr(
double rf_gain_rx1_, double rf_gain_rx1_,
bool enable_ch0, bool enable_ch0,
bool enable_ch1, bool enable_ch1,
long long freq_2ch, int64_t freq_2ch,
bool ppsmode_, bool ppsmode_,
bool customsamplesize_, bool customsamplesize_,
const std::string &fe_ip_, const std::string &fe_ip_,
@ -92,9 +93,9 @@ private:
friend ad936x_iio_source_sptr ad936x_iio_make_source_sptr( friend ad936x_iio_source_sptr ad936x_iio_make_source_sptr(
const std::string &pluto_uri_, const std::string &pluto_uri_,
const std::string &board_type_, const std::string &board_type_,
long long bandwidth_, int64_t bandwidth_,
long long sample_rate_, int64_t sample_rate_,
long long freq_, int64_t freq_,
const std::string &rf_port_select_, const std::string &rf_port_select_,
const std::string &rf_filter, const std::string &rf_filter,
const std::string &gain_mode_rx0_, const std::string &gain_mode_rx0_,
@ -103,7 +104,7 @@ private:
double rf_gain_rx1_, double rf_gain_rx1_,
bool enable_ch0, bool enable_ch0,
bool enable_ch1, bool enable_ch1,
long long freq_2ch, int64_t freq_2ch,
bool ppsmode_, bool ppsmode_,
bool customsamplesize_, bool customsamplesize_,
const std::string &fe_ip_, const std::string &fe_ip_,
@ -118,9 +119,9 @@ private:
ad936x_iio_source( ad936x_iio_source(
const std::string &pluto_uri_, const std::string &pluto_uri_,
const std::string &board_type_, const std::string &board_type_,
long long bandwidth_, int64_t bandwidth_,
long long sample_rate_, int64_t sample_rate_,
long long freq_, int64_t freq_,
const std::string &rf_port_select_, const std::string &rf_port_select_,
const std::string &rf_filter, const std::string &rf_filter,
const std::string &gain_mode_rx0_, const std::string &gain_mode_rx0_,
@ -129,7 +130,7 @@ private:
double rf_gain_rx1_, double rf_gain_rx1_,
bool enable_ch0, bool enable_ch0,
bool enable_ch1, bool enable_ch1,
long long freq_2ch, int64_t freq_2ch,
bool ppsmode_, bool ppsmode_,
bool customsamplesize_, bool customsamplesize_,
const std::string &fe_ip_, const std::string &fe_ip_,
@ -141,7 +142,6 @@ private:
bool high_side_lo_, bool high_side_lo_,
int tx_lo_channel_); int tx_lo_channel_);
void ad9361_channel_demux_to_buffer(ad936x_iio_samples *samples_in, int nchannels, gr_vector_void_star &output_items); void ad9361_channel_demux_to_buffer(ad936x_iio_samples *samples_in, int nchannels, gr_vector_void_star &output_items);
void ad9361_channel_demux_and_record(ad936x_iio_samples *samples_in, int nchannels, std::vector<std::fstream> *files_out); void ad9361_channel_demux_and_record(ad936x_iio_samples *samples_in, int nchannels, std::vector<std::fstream> *files_out);

View File

@ -35,7 +35,7 @@ if((ENABLE_FPGA AND ENABLE_AD9361) OR ENABLE_MAX2771)
set(OPT_SIGNAL_SOURCE_LIB_HEADERS ${OPT_SIGNAL_SOURCE_LIB_HEADERS} fpga_buffer_monitor.h) set(OPT_SIGNAL_SOURCE_LIB_HEADERS ${OPT_SIGNAL_SOURCE_LIB_HEADERS} fpga_buffer_monitor.h)
endif() endif()
if(ENABLE_PLUTOSDR) if(ENABLE_PLUTOSDR OR ENABLE_AD936X_SDR)
set(OPT_SIGNAL_SOURCE_LIB_HEADERS ${OPT_SIGNAL_SOURCE_LIB_HEADERS} ad936x_iio_samples.h) set(OPT_SIGNAL_SOURCE_LIB_HEADERS ${OPT_SIGNAL_SOURCE_LIB_HEADERS} ad936x_iio_samples.h)
set(OPT_SIGNAL_SOURCE_LIB_SOURCES ${OPT_SIGNAL_SOURCE_LIB_SOURCES} ad936x_iio_custom.cc) set(OPT_SIGNAL_SOURCE_LIB_SOURCES ${OPT_SIGNAL_SOURCE_LIB_SOURCES} ad936x_iio_custom.cc)
set(OPT_SIGNAL_SOURCE_LIB_HEADERS ${OPT_SIGNAL_SOURCE_LIB_HEADERS} ad936x_iio_custom.h) set(OPT_SIGNAL_SOURCE_LIB_HEADERS ${OPT_SIGNAL_SOURCE_LIB_HEADERS} ad936x_iio_custom.h)
@ -51,7 +51,6 @@ if(ENABLE_ION)
set(OPT_SIGNAL_SOURCE_LIB_HEADERS ${OPT_SIGNAL_SOURCE_LIB_HEADERS} ion_gsms_chunk_unpacking_ctx.h) set(OPT_SIGNAL_SOURCE_LIB_HEADERS ${OPT_SIGNAL_SOURCE_LIB_HEADERS} ion_gsms_chunk_unpacking_ctx.h)
endif() endif()
set(SIGNAL_SOURCE_LIB_SOURCES set(SIGNAL_SOURCE_LIB_SOURCES
rtl_tcp_commands.cc rtl_tcp_commands.cc
rtl_tcp_dongle_info.cc rtl_tcp_dongle_info.cc

View File

@ -21,8 +21,8 @@
#define IIO_DEFAULTAD936XAPIFIFOSIZE_SAMPLES 32768 * 4 #define IIO_DEFAULTAD936XAPIFIFOSIZE_SAMPLES 32768 * 4
#define IIO_INPUTRAMFIFOSIZE 256 #define IIO_INPUTRAMFIFOSIZE 256
#include <cstdint>
#include <memory> #include <memory>
#include <stdint.h>
#include <vector> #include <vector>
/** \addtogroup Signal_Source /** \addtogroup Signal_Source