mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-03-04 18:48:17 +00:00
Code Issues Releases Wiki Activity

Fixes for the embedded Abseil

Browse Source
This commit is contained in:
Carles Fernandez 2024-05-01 08:39:22 +02:00
parent 7f097af73c
commit 4515e67b3f
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.cc
View File

@ -46,6 +46,7 @@
#if USE_GLOG_AND_GFLAGS #if USE_GLOG_AND_GFLAGS
#include <glog/logging.h> #include <glog/logging.h>
#else #else
#include <absl/log/check.h>
#include <absl/log/log.h> #include <absl/log/log.h>
#endif #endif
@ -94,7 +95,11 @@ Ad9361FpgaSignalSource::Ad9361FpgaSignalSource(const ConfigurationInterface *con
enable_dynamic_bit_selection_(configuration->property(role + ".enable_dynamic_bit_selection", true)), enable_dynamic_bit_selection_(configuration->property(role + ".enable_dynamic_bit_selection", true)),
enable_ovf_check_buffer_monitor_active_(false), enable_ovf_check_buffer_monitor_active_(false),
dump_(configuration->property(role + ".dump", false)), dump_(configuration->property(role + ".dump", false)),
#if USE_GLOG_AND_GFLAGS
rf_shutdown_(configuration->property(role + ".rf_shutdown", FLAGS_rf_shutdown)), rf_shutdown_(configuration->property(role + ".rf_shutdown", FLAGS_rf_shutdown)),
#else
rf_shutdown_(configuration->property(role + ".rf_shutdown", absl::GetFlag(FLAGS_rf_shutdown))),
#endif
repeat_(configuration->property(role + ".repeat", false)) repeat_(configuration->property(role + ".repeat", false))
{ {
const double seconds_to_skip = configuration->property(role + ".seconds_to_skip", 0.0); const double seconds_to_skip = configuration->property(role + ".seconds_to_skip", 0.0);
@ -121,7 +126,7 @@ Ad9361FpgaSignalSource::Ad9361FpgaSignalSource(const ConfigurationInterface *con
{ {
filter_source_ = configuration->property(role + ".filter_source", std::string("Off")); filter_source_ = configuration->property(role + ".filter_source", std::string("Off"));
} }
#if USE_GLOG_AND_GFLAGS
// override value with commandline flag, if present // override value with commandline flag, if present
if (FLAGS_signal_source != "-") if (FLAGS_signal_source != "-")
{ {
@ -131,7 +136,16 @@ Ad9361FpgaSignalSource::Ad9361FpgaSignalSource(const ConfigurationInterface *con
{ {
filename0_ = FLAGS_s; filename0_ = FLAGS_s;
} }
#else
if (absl::GetFlag(FLAGS_signal_source) != "-")
{
filename0_ = absl::GetFlag(FLAGS_signal_source);
}
if (absl::GetFlag(FLAGS_s) != "-")
{
filename0_ = absl::GetFlag(FLAGS_s);
}
#endif
if (filename0_.empty()) if (filename0_.empty())
{ {
num_input_files_ = 2; num_input_files_ = 2;

4
src/algorithms/signal_source/adapters/fmcomms2_signal_source.cc
View File

@ -75,7 +75,11 @@ Fmcomms2SignalSource::Fmcomms2SignalSource(const ConfigurationInterface *configu
rf_dc_(configuration->property(role + ".rf_dc", true)), rf_dc_(configuration->property(role + ".rf_dc", true)),
bb_dc_(configuration->property(role + ".bb_dc", true)), bb_dc_(configuration->property(role + ".bb_dc", true)),
filter_auto_(configuration->property(role + ".filter_auto", false)), filter_auto_(configuration->property(role + ".filter_auto", false)),
#if USE_GLOG_AND_GFLAGS
rf_shutdown_(configuration->property(role + ".rf_shutdown", FLAGS_rf_shutdown)), rf_shutdown_(configuration->property(role + ".rf_shutdown", FLAGS_rf_shutdown)),
#else
rf_shutdown_(configuration->property(role + ".rf_shutdown", absl::GetFlag(FLAGS_rf_shutdown))),
#endif
dump_(configuration->property(role + ".dump", false)) dump_(configuration->property(role + ".dump", false))
{ {
if (filter_auto_) if (filter_auto_)

2
src/tests/common-files/test_flags.h
View File

@ -34,7 +34,7 @@ DEFINE_int32(plot_decimate, 1, "Decimate plots");
#else #else
#include <absl/flags/flag.h> #include <absl/flags/flag.h>
#if defined GNUPLOT_EXECUTABLE #if defined GNUPLOT_EXECUTABLE
ABSL_FLAG(std::string, std::string(GNUPLOT_EXECUTABLE), "Gnuplot binary path"); ABSL_FLAG(std::string, gnuplot_executable, std::string(GNUPLOT_EXECUTABLE), "Gnuplot binary path");
#elif !defined GNUPLOT_EXECUTABLE #elif !defined GNUPLOT_EXECUTABLE
ABSL_FLAG(std::string, gnuplot_executable, "", "Gnuplot binary path"); ABSL_FLAG(std::string, gnuplot_executable, "", "Gnuplot binary path");
#endif #endif