diff --git a/src/algorithms/channel/adapters/channel.cc b/src/algorithms/channel/adapters/channel.cc index 18590afca..cf3f5c0e4 100644 --- a/src/algorithms/channel/adapters/channel.cc +++ b/src/algorithms/channel/adapters/channel.cc @@ -38,13 +38,13 @@ Channel::Channel(const ConfigurationInterface* configuration, trk_(std::move(trk)), nav_(std::move(nav)), role_(role), - channel_(channel) + channel_(channel), flag_enable_fpga_(configuration->property("GNSS-SDR.enable_FPGA", false)), glonass_extend_correlation_ms_(configuration->property("Tracking_1G.extend_correlation_ms", 0) + configuration->property("Tracking_2G.extend_correlation_ms", 0)) { - glonass_extend_correlation_ms_ = configuration->property("Tracking_1G.extend_correlation_ms", 0) + configuration->property("Tracking_2G.extend_correlation_ms", 0); + channel_fsm_ = std::make_shared(); - flag_enable_fpga_ = configuration->property("GNSS-SDR.enable_FPGA", false); + acq_->set_channel(channel_); acq_->set_channel_fsm(channel_fsm_); @@ -273,7 +273,7 @@ void Channel::start_acquisition() DLOG(INFO) << "Channel start_acquisition()"; } -bool Channel::glonass_dll_pll_c_aid_tracking_check() +bool Channel::glonass_dll_pll_c_aid_tracking_check() const { if (glonass_extend_correlation_ms_) { diff --git a/src/algorithms/channel/adapters/channel.h b/src/algorithms/channel/adapters/channel.h index 519f6babd..a8e80123a 100644 --- a/src/algorithms/channel/adapters/channel.h +++ b/src/algorithms/channel/adapters/channel.h @@ -96,7 +96,7 @@ public: inline std::shared_ptr telemetry() const { return nav_; } private: - bool glonass_dll_pll_c_aid_tracking_check(); + bool glonass_dll_pll_c_aid_tracking_check() const; std::shared_ptr channel_fsm_; std::shared_ptr acq_; std::shared_ptr trk_; diff --git a/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc b/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc index 1b7fb828c..eb1c8affd 100644 --- a/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc +++ b/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc @@ -31,7 +31,8 @@ FreqXlatingFirFilter::FreqXlatingFirFilter(const ConfigurationInterface* configu unsigned int out_streams) : role_(std::move(role)), in_streams_(in_streams), - out_streams_(out_streams) + out_streams_(out_streams), + dump_(configuration->property(role + ".dump", false)) { const std::string default_input_item_type("gr_complex"); const std::string default_output_item_type("gr_complex"); @@ -59,7 +60,6 @@ FreqXlatingFirFilter::FreqXlatingFirFilter(const ConfigurationInterface* configu intermediate_freq_ = configuration->property(role_ + ".IF", default_intermediate_freq); sampling_freq_ = configuration->property(role_ + ".sampling_frequency", default_sampling_freq); decimation_factor_ = configuration->property(role_ + ".decimation_factor", default_decimation_factor); - dump_ = configuration->property(role_ + ".dump", false); if (filter_type != "lowpass") { diff --git a/src/algorithms/libs/pass_through.cc b/src/algorithms/libs/pass_through.cc index dbc96f32e..bc54ae61a 100644 --- a/src/algorithms/libs/pass_through.cc +++ b/src/algorithms/libs/pass_through.cc @@ -25,15 +25,17 @@ #include // for operator<< -Pass_Through::Pass_Through(const ConfigurationInterface* configuration, const std::string& role, +Pass_Through::Pass_Through(const ConfigurationInterface* configuration, + const std::string& role, unsigned int in_streams, - unsigned int out_streams) : role_(role), - in_streams_(in_streams), - out_streams_(out_streams) + unsigned int out_streams) + : role_(role), + in_streams_(in_streams), + out_streams_(out_streams), + inverted_spectrum(configuration->property(role + ".inverted_spectrum", false)) { const std::string default_item_type("gr_complex"); item_type_ = configuration->property(role + ".item_type", default_item_type); - inverted_spectrum = configuration->property(role + ".inverted_spectrum", false); if (item_type_ == "float") { diff --git a/src/algorithms/observables/adapters/hybrid_observables.cc b/src/algorithms/observables/adapters/hybrid_observables.cc index a07882481..6413d48a7 100644 --- a/src/algorithms/observables/adapters/hybrid_observables.cc +++ b/src/algorithms/observables/adapters/hybrid_observables.cc @@ -23,16 +23,18 @@ #include // for operator<< HybridObservables::HybridObservables(const ConfigurationInterface* configuration, - const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams) + const std::string& role, + unsigned int in_streams, + unsigned int out_streams) : role_(role), + in_streams_(in_streams), + out_streams_(out_streams), + dump_(configuration->property(role + ".dump", false)), + dump_mat_(configuration->property(role + ".dump_mat", true)) { const std::string default_dump_filename("./observables.dat"); - DLOG(INFO) << "role " << role; - dump_ = configuration->property(role + ".dump", false); - dump_mat_ = configuration->property(role + ".dump_mat", true); dump_filename_ = configuration->property(role + ".dump_filename", default_dump_filename); Obs_Conf conf{}; - conf.dump = dump_; conf.dump_mat = dump_mat_; conf.dump_filename = dump_filename_; @@ -46,7 +48,7 @@ HybridObservables::HybridObservables(const ConfigurationInterface* configuration { conf.smoothing_factor = configuration->property(role + ".smoothing_factor", conf.smoothing_factor); } - + DLOG(INFO) << "role " << role; if (conf.enable_carrier_smoothing == true) { LOG(INFO) << "Observables carrier smoothing enabled with smoothing factor " << conf.smoothing_factor; diff --git a/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.cc index 6444bfc61..82b639f70 100644 --- a/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.cc @@ -27,15 +27,14 @@ SbasL1TelemetryDecoder::SbasL1TelemetryDecoder( unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), - out_streams_(out_streams) + out_streams_(out_streams), + dump_(configuration->property(role + ".dump", false)) { const std::string default_dump_filename("./navigation.dat"); - DLOG(INFO) << "role " << role; - dump_ = configuration->property(role + ".dump", false); dump_filename_ = configuration->property(role + ".dump_filename", default_dump_filename); // make telemetry decoder object telemetry_decoder_ = sbas_l1_make_telemetry_decoder_gs(satellite_, dump_); // TODO fix me - + DLOG(INFO) << "role " << role; DLOG(INFO) << "telemetry_decoder(" << telemetry_decoder_->unique_id() << ")"; if (in_streams_ > 1) { diff --git a/src/algorithms/tracking/libs/lock_detectors.cc b/src/algorithms/tracking/libs/lock_detectors.cc index 0d9a716dd..7fa08690b 100644 --- a/src/algorithms/tracking/libs/lock_detectors.cc +++ b/src/algorithms/tracking/libs/lock_detectors.cc @@ -131,7 +131,7 @@ float cn0_m2m4_estimator(const gr_complex* Prompt_buffer, int length, float coh_ * \f$NBP=(\sum^{N-1}_{i=0}Im(Pc(i)))^2+(\sum^{N-1}_{i=0}Re(Pc(i)))^2\f$, and * \f$Pc(i)\f$ is the prompt correlator output for the sample index i. */ -float carrier_lock_detector(gr_complex* Prompt_buffer, int length) +float carrier_lock_detector(const gr_complex* Prompt_buffer, int length) { float tmp_sum_I = 0.0; float tmp_sum_Q = 0.0; diff --git a/src/algorithms/tracking/libs/lock_detectors.h b/src/algorithms/tracking/libs/lock_detectors.h index eb0eb93ef..c4f73a082 100644 --- a/src/algorithms/tracking/libs/lock_detectors.h +++ b/src/algorithms/tracking/libs/lock_detectors.h @@ -106,7 +106,7 @@ float cn0_m2m4_estimator(const gr_complex* Prompt_buffer, int length, float coh_ * Volume I, Chapter 8: GPS Receivers, AJ Systems, Los Altos, CA 94024. * Inc.: 329-407. */ -float carrier_lock_detector(gr_complex* Prompt_buffer, int length); +float carrier_lock_detector(const gr_complex* Prompt_buffer, int length); /** \} */ diff --git a/src/core/system_parameters/gps_navigation_message.cc b/src/core/system_parameters/gps_navigation_message.cc index 1ea1a6f22..b9a007a3f 100644 --- a/src/core/system_parameters/gps_navigation_message.cc +++ b/src/core/system_parameters/gps_navigation_message.cc @@ -46,7 +46,7 @@ void Gps_Navigation_Message::print_gps_word_bytes(uint32_t GPS_word) const } -bool Gps_Navigation_Message::read_navigation_bool(const std::bitset& bits, const std::vector>& parameter) const +bool Gps_Navigation_Message::read_navigation_bool(const std::bitset& bits, const std::vector /*unused*/>& parameter) const { bool value; @@ -62,7 +62,7 @@ bool Gps_Navigation_Message::read_navigation_bool(const std::bitset& bits, const std::vector>& parameter) const +uint64_t Gps_Navigation_Message::read_navigation_unsigned(const std::bitset& bits, const std::vector /*unused*/>& parameter) const { uint64_t value = 0ULL; const int32_t num_of_slices = parameter.size(); @@ -81,7 +81,7 @@ uint64_t Gps_Navigation_Message::read_navigation_unsigned(const std::bitset& bits, const std::vector>& parameter) const +int64_t Gps_Navigation_Message::read_navigation_signed(const std::bitset& bits, const std::vector /*unused*/>& parameter) const { int64_t value = 0LL; const int32_t num_of_slices = parameter.size(); @@ -112,7 +112,7 @@ int64_t Gps_Navigation_Message::read_navigation_signed(const std::bitsetmessage_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"),