diff --git a/src/core/receiver/gnss_block_factory.cc b/src/core/receiver/gnss_block_factory.cc index 63f75ea89..91b74d617 100644 --- a/src/core/receiver/gnss_block_factory.cc +++ b/src/core/receiver/gnss_block_factory.cc @@ -227,7 +227,7 @@ std::unique_ptr GNSSBlockFactory::GetObservables(std::shared { Galileo_channels = configuration->property("Channels_1B.count", 0); } - Galileo_channels += configuration->property("Channels_5I.count", 0); + Galileo_channels += configuration->property("Channels_5X.count", 0); unsigned int GPS_channels = configuration->property("Channels_GPS.count", 0); // DEPRECATED if(GPS_channels == 0) { @@ -250,7 +250,7 @@ std::unique_ptr GNSSBlockFactory::GetPVT(std::shared_ptrproperty("Channels_1B.count", 0); } - Galileo_channels += configuration->property("Channels_5I.count", 0); + Galileo_channels += configuration->property("Channels_5X.count", 0); unsigned int GPS_channels = configuration->property("Channels_GPS.count", 0); // DEPRECATED if(GPS_channels == 0) { @@ -397,7 +397,7 @@ std::unique_ptr GNSSBlockFactory::GetChannel_1B( } //********* GALILEO E5a CHANNEL ***************** -std::unique_ptr GNSSBlockFactory::GetChannel_5I( +std::unique_ptr GNSSBlockFactory::GetChannel_5X( std::shared_ptr configuration, std::string acq, std::string trk, std::string tlm, int channel, boost::shared_ptr queue) @@ -409,15 +409,15 @@ std::unique_ptr GNSSBlockFactory::GetChannel_5I( << acq << ", Tracking Implementation: " << trk << ", Telemetry Decoder implementation: " << tlm; std::unique_ptr pass_through_ = GetBlock(configuration, "Channel", "Pass_Through", 1, 1, queue); - std::unique_ptr acq_ = GetAcqBlock(configuration, "Acquisition_5I", acq, 1, 1, queue); - std::unique_ptr trk_ = GetTrkBlock(configuration, "Tracking_5I", trk, 1, 1, queue); - std::unique_ptr tlm_ = GetTlmBlock(configuration, "TelemetryDecoder_5I", tlm, 1, 1, queue); + std::unique_ptr acq_ = GetAcqBlock(configuration, "Acquisition_5X", acq, 1, 1, queue); + std::unique_ptr trk_ = GetTrkBlock(configuration, "Tracking_5X", trk, 1, 1, queue); + std::unique_ptr tlm_ = GetTlmBlock(configuration, "TelemetryDecoder_5X", tlm, 1, 1, queue); std::unique_ptr channel_(new Channel(configuration.get(), channel, pass_through_.release(), acq_.release(), trk_.release(), tlm_.release(), - "Channel", "5I", queue)); + "Channel", "5X", queue)); return channel_; } @@ -659,20 +659,20 @@ std::unique_ptr>> GNSSBlockFacto //**************** GALILEO E5a I (F/NAV OS) CHANNELS ********************** - channel_count = configuration->property("Channels_5I.count", 0); + channel_count = configuration->property("Channels_5X.count", 0); LOG(INFO) << "Getting " << channel_count << " GALILEO E5a I (F/NAV OS) channels"; - tracking_implementation = configuration->property("Tracking_5I.implementation", default_implementation); - telemetry_decoder_implementation = configuration->property("TelemetryDecoder_5I.implementation", default_implementation); - acquisition_implementation = configuration->property("Acquisition_5I.implementation", default_implementation); + tracking_implementation = configuration->property("Tracking_5X.implementation", default_implementation); + telemetry_decoder_implementation = configuration->property("TelemetryDecoder_5X.implementation", default_implementation); + acquisition_implementation = configuration->property("Acquisition_5X.implementation", default_implementation); for (unsigned int i = 0; i < channel_count; i++) { // Search for specific implementation of that particular channel in config file - //(i.e. Acquisition_5I0.implementation=xxxx) + //(i.e. Acquisition_5X0.implementation=xxxx) std::string acquisition_implementation_specific = configuration->property( - "Acquisition_5I" + boost::lexical_cast(i) + ".implementation", + "Acquisition_5X" + boost::lexical_cast(i) + ".implementation", default_implementation); if(acquisition_implementation_specific.compare(default_implementation) != 0) @@ -680,9 +680,9 @@ std::unique_ptr>> GNSSBlockFacto acquisition_implementation = acquisition_implementation_specific; } - //(i.e. Tracking_5I0.implementation=xxxx) + //(i.e. Tracking_5X0.implementation=xxxx) std::string tracking_implementation_specific = configuration->property( - "Tracking_5I" + boost::lexical_cast(i) + ".implementation", + "Tracking_5X" + boost::lexical_cast(i) + ".implementation", default_implementation); if(tracking_implementation_specific.compare(default_implementation) != 0) @@ -691,9 +691,9 @@ std::unique_ptr>> GNSSBlockFacto } - //(i.e. TelemetryDecoder_5I0.implementation=xxxx) + //(i.e. TelemetryDecoder_5X0.implementation=xxxx) std::string telemetry_decoder_implementation_specific = configuration->property( - "TelemetryDecoder_5I" + boost::lexical_cast(i) + ".implementation", + "TelemetryDecoder_5X" + boost::lexical_cast(i) + ".implementation", default_implementation); if(telemetry_decoder_implementation_specific.compare(default_implementation) != 0) diff --git a/src/core/receiver/gnss_block_factory.h b/src/core/receiver/gnss_block_factory.h index 0ceec4905..5ca34ce09 100644 --- a/src/core/receiver/gnss_block_factory.h +++ b/src/core/receiver/gnss_block_factory.h @@ -93,7 +93,7 @@ public: std::string acq, std::string trk, std::string tlm, int channel, boost::shared_ptr queue); - std::unique_ptr GetChannel_5I(std::shared_ptr configuration, + std::unique_ptr GetChannel_5X(std::shared_ptr configuration, std::string acq, std::string trk, std::string tlm, int channel, boost::shared_ptr queue); diff --git a/src/core/receiver/gnss_flowgraph.cc b/src/core/receiver/gnss_flowgraph.cc index 298648821..2487876de 100644 --- a/src/core/receiver/gnss_flowgraph.cc +++ b/src/core/receiver/gnss_flowgraph.cc @@ -645,7 +645,7 @@ void GNSSFlowgraph::set_signals_list() } } -if ((configuration_->property("Channels_5I.count", 0) > 0) ) +if ((configuration_->property("Channels_5X.count", 0) > 0) ) { /* * Loop to create the list of Galileo E1 B signals @@ -657,7 +657,7 @@ if ((configuration_->property("Channels_5I.count", 0) > 0) ) // available_GNSS_signals_.push_back(Gnss_Signal(Gnss_Satellite(std::string("Galileo"), // *available_gnss_prn_iter), std::string("1B"))); available_GNSS_signals_.push_back(Gnss_Signal(Gnss_Satellite(std::string("Galileo"), - *available_gnss_prn_iter), std::string("5I"))); + *available_gnss_prn_iter), std::string("5X"))); } } @@ -691,7 +691,7 @@ if ((configuration_->property("Channels_5I.count", 0) > 0) ) else { if((gnss_signal.compare("1C") == 0) or (gnss_signal.compare("2S") == 0) ) gnss_system = "GPS"; - if((gnss_signal.compare("1B") == 0) or (gnss_signal.compare("5I") == 0) ) gnss_system = "Galileo"; + if((gnss_signal.compare("1B") == 0) or (gnss_signal.compare("5X") == 0) ) gnss_system = "Galileo"; Gnss_Signal signal_value = Gnss_Signal(Gnss_Satellite(gnss_system, sat), gnss_signal); DLOG(INFO) << "Channel " << i << " " << signal_value; available_GNSS_signals_.remove(signal_value);