diff --git a/README.md b/README.md
index ba2a1579d..fe5d82ccd 100644
--- a/README.md
+++ b/README.md
@@ -2,13 +2,13 @@
[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
-link to website: https://gnsssdrbeidoub1igsoc2018.wordpress.com/
**Welcome to GNSS-SDR!**
This program is a software-defined receiver which is able to process (that is, to perform detection, synchronization, demodulation and decoding of the navigation message, computation of observables and, finally, computation of position fixes) the following Global Navigation Satellite System's signals:
In the L1 band:
+ - 🛰 BeiDou B1I (centered at 1561.098 MHz) :white_check_mark:
- 🛰 GPS L1 C/A (centered at 1575.42 MHz) :white_check_mark:
- 🛰 Galileo E1b/c (centered at 1575.42 MHz) :white_check_mark:
- 🛰 GLONASS L1 C/A (centered at 1601.72 MHz) :white_check_mark:
diff --git a/conf/gnss-sdr_GLONASS_L1_ibyte.conf b/conf/gnss-sdr_GLONASS_L1_ibyte.conf
index 0b16fa3d8..9c5183c98 100644
--- a/conf/gnss-sdr_GLONASS_L1_ibyte.conf
+++ b/conf/gnss-sdr_GLONASS_L1_ibyte.conf
@@ -5,8 +5,8 @@
[GNSS-SDR]
;######### GLOBAL OPTIONS ##################
-;internal_fs_hz: Internal signal sampling frequency after the signal conditioning stage [Hz].
-GNSS-SDR.internal_fs_hz=6625000
+;internal_fs_sps: Internal signal sampling frequency after the signal conditioning stage [Hz].
+GNSS-SDR.internal_fs_sps=6625000
;######### CONTROL_THREAD CONFIG ############
ControlThread.wait_for_flowgraph=false
@@ -54,7 +54,6 @@ Channel.signal=1R
Acquisition_1R.dump=false
Acquisition_1R.dump_filename=./acq_dump.dat
Acquisition_1R.item_type=cshort
-Acquisition_1R.if=0
Acquisition_1R.sampled_ms=1
Acquisition_1R.implementation=GLONASS_L1_CA_PCPS_Acquisition
Acquisition_1R.threshold=0.008
@@ -68,7 +67,6 @@ Acquisition_1R.tong_max_dwells=20
;######### TRACKING GLOBAL CONFIG ############
Tracking_1R.implementation=GLONASS_L1_CA_DLL_PLL_C_Aid_Tracking
Tracking_1R.item_type=cshort
-Tracking_1R.if=0
Tracking_1R.dump=false
Tracking_1R.dump_filename=../data/epl_tracking_ch_
Tracking_1R.pll_bw_hz=40.0;
@@ -78,7 +76,6 @@ Tracking_1R.order=3;
;######### TELEMETRY DECODER GPS CONFIG ############
TelemetryDecoder_1R.implementation=GLONASS_L1_CA_Telemetry_Decoder
TelemetryDecoder_1R.dump=false
-TelemetryDecoder_1R.decimation_factor=1;
;######### OBSERVABLES CONFIG ############
Observables.implementation=Hybrid_Observables
diff --git a/conf/gnss-sdr_GPS_L1_CA_byte.conf b/conf/gnss-sdr_GPS_L1_CA_byte.conf
deleted file mode 100644
index 258130315..000000000
--- a/conf/gnss-sdr_GPS_L1_CA_byte.conf
+++ /dev/null
@@ -1,110 +0,0 @@
-; This is a GNSS-SDR configuration file
-; The configuration API is described at https://gnss-sdr.org/docs/sp-blocks/
-
-; 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=99375000
-
-;######### CONTROL_THREAD CONFIG ############
-ControlThread.wait_for_flowgraph=false
-
-;######### SIGNAL_SOURCE CONFIG ############
-SignalSource.implementation=File_Signal_Source
-SignalSource.filename=/media/dmiralles/Seagate Backup Plus Drive/GNSS Data/Beidou_B1_IF_signal.bin
-SignalSource.item_type=byte
-SignalSource.sampling_frequency=99375000
-SignalSource.samples=0
-SignalSource.repeat=false
-SignalSource.dump=false
-SignalSource.enable_throttle_control=false
-
-;######### SIGNAL_CONDITIONER CONFIG ############
-SignalConditioner.implementation=Signal_Conditioner
-DataTypeAdapter.implementation=Byte_To_Short
-InputFilter.implementation=Freq_Xlating_Fir_Filter
-InputFilter.input_item_type=short
-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.70
-InputFilter.band2_begin=0.80
-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=99375000
-InputFilter.IF=14580000
-Resampler.implementation=Direct_Resampler
-Resampler.sample_freq_in=99375000
-Resampler.sample_freq_out=99375000
-Resampler.item_type=gr_complex
-
-
-;######### CHANNELS GLOBAL CONFIG ############
-Channels_1C.count=8
-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.threshold=3.5
-;Acquisition_1C.pfa=0.000001;
-Acquisition_1C.doppler_max=14000
-Acquisition_1C.doppler_step=100
-Acquisition_1C.dump=true
-Acquisition_1C.dump_filename=./gps_acq
-Acquisition_1C.blocking=false;
-Acquisition_1C.use_CFAR_algorithm=false
-
-
-;######### TRACKING GLOBAL CONFIG ############
-Tracking_1C.implementation=GPS_L1_CA_DLL_PLL_Tracking
-Tracking_1C.item_type=gr_complex
-Tracking_1C.pll_bw_hz=30.0;
-Tracking_1C.dll_bw_hz=3.0;
-Tracking_1C.dump=true;
-Tracking_1C.dump_filename=./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=true
-Observables.dump_filename=./observables.dat
-
-
-;######### PVT CONFIG ############
-PVT.implementation=RTKLIB_PVT
-PVT.positioning_mode=Single ; 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=100
-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.flag_rtcm_server=false
-PVT.flag_rtcm_tty_port=false
-PVT.rtcm_dump_devname=/dev/pts/1
-PVT.dump=false
diff --git a/conf/gnss-sdr_GPS_L1_ishort.conf b/conf/gnss-sdr_GPS_L1_ishort.conf
index d160f728a..373049a25 100644
--- a/conf/gnss-sdr_GPS_L1_ishort.conf
+++ b/conf/gnss-sdr_GPS_L1_ishort.conf
@@ -16,7 +16,7 @@ ControlThread.wait_for_flowgraph=false
;######### SIGNAL_SOURCE CONFIG ############
SignalSource.implementation=File_Signal_Source
-SignalSource.filename=/home/sergi/gnss/gnss-sdr/data/2013_04_04_GNSS_SIGNAL_at_CTTC_SPAIN.dat ; <- PUT YOUR FILE HERE
+SignalSource.filename=/archive/2013_04_04_GNSS_SIGNAL_at_CTTC_SPAIN.dat ; <- PUT YOUR FILE HERE
SignalSource.item_type=ishort
SignalSource.sampling_frequency=4000000
SignalSource.samples=0
@@ -29,14 +29,13 @@ SignalSource.enable_throttle_control=false
;######### SIGNAL_CONDITIONER CONFIG ############
SignalConditioner.implementation=Signal_Conditioner
-DataTypeAdapter.implementation=Ishort_To_Complex
+DataTypeAdapter.implementation=Ishort_To_Cshort
InputFilter.implementation=Pass_Through
-InputFilter.item_type=gr_complex
+InputFilter.item_type=cshort
Resampler.implementation=Direct_Resampler
Resampler.sample_freq_in=4000000
Resampler.sample_freq_out=2000000
-Resampler.item_type=gr_complex
-
+Resampler.item_type=cshort
;######### CHANNELS GLOBAL CONFIG ############
Channels_1C.count=8
@@ -46,19 +45,19 @@ Channel.signal=1C
;######### ACQUISITION GLOBAL CONFIG ############
Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition
-Acquisition_1C.item_type=gr_complex
+Acquisition_1C.item_type=cshort
Acquisition_1C.coherent_integration_time_ms=1
Acquisition_1C.threshold=0.008
;Acquisition_1C.pfa=0.000001
Acquisition_1C.doppler_max=10000
Acquisition_1C.doppler_step=250
-Acquisition_1C.dump=true
+Acquisition_1C.dump=false
Acquisition_1C.dump_filename=./acq_dump.dat
Acquisition_1C.blocking=false;
;######### TRACKING GLOBAL CONFIG ############
-Tracking_1C.implementation=GPS_L1_CA_DLL_PLL_Tracking
-Tracking_1C.item_type=gr_complex
+Tracking_1C.implementation=GPS_L1_CA_DLL_PLL_C_Aid_Tracking
+Tracking_1C.item_type=cshort
Tracking_1C.pll_bw_hz=40.0;
Tracking_1C.dll_bw_hz=4.0;
Tracking_1C.order=3;
diff --git a/conf/prova.conf b/conf/prova.conf
deleted file mode 100644
index a481302cf..000000000
--- a/conf/prova.conf
+++ /dev/null
@@ -1,56 +0,0 @@
-[GNSS-SDR]
-
-
-;######### GLOBAL OPTIONS ##################
-GNSS-SDR.internal_fs_hz=2000000
-
-;######### SIGNAL_SOURCE CONFIG ############
-SignalSource.implementation=File_Signal_Source
-SignalSource.filename=/home/sergi/gnss/gnss-sdr/data/2013_04_04_GNSS_SIGNAL_at_CTTC_SPAIN.dat
-SignalSource.item_type=ishort
-SignalSource.sampling_frequency=4000000
-SignalSource.freq=1575420000
-SignalSource.samples=0
-
-;######### SIGNAL_CONDITIONER CONFIG ############
-SignalConditioner.implementation=Signal_Conditioner
-DataTypeAdapter.implementation=Ishort_To_Complex
-InputFilter.implementation=Pass_Through
-InputFilter.item_type=gr_complex
-Resampler.implementation=Direct_Resampler
-Resampler.sample_freq_in=4000000
-Resampler.sample_freq_out=2000000
-Resampler.item_type=gr_complex
-
-;######### CHANNELS GLOBAL CONFIG ############
-Channels_1C.count=8
-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.threshold=0.008
-Acquisition_1C.doppler_max=10000
-Acquisition_1C.doppler_step=250
-
-;######### TRACKING GLOBAL CONFIG ############
-Tracking_1C.implementation=GPS_L1_CA_DLL_PLL_Tracking
-Tracking_1C.item_type=gr_complex
-Tracking_1C.pll_bw_hz=40.0;
-Tracking_1C.dll_bw_hz=4.0;
-
-;######### TELEMETRY DECODER GPS CONFIG ############
-TelemetryDecoder_1C.implementation=GPS_L1_CA_Telemetry_Decoder
-
-;######### OBSERVABLES CONFIG ############
-Observables.implementation=GPS_L1_CA_Observables
-
-;######### PVT CONFIG ############
-PVT.implementation=GPS_L1_CA_PVT
-PVT.averaging_depth=100
-PVT.flag_averaging=true
-PVT.output_rate_ms=10
-PVT.display_rate_ms=500
-
-
diff --git a/src/algorithms/PVT/adapters/rtklib_pvt3.cc b/src/algorithms/PVT/adapters/rtklib_pvt3.cc
deleted file mode 100644
index 24f4c9150..000000000
--- a/src/algorithms/PVT/adapters/rtklib_pvt3.cc
+++ /dev/null
@@ -1,561 +0,0 @@
-/*!
- * \file rtklib_pvt.cc
- * \brief Interface of a Position Velocity and Time computation block
- * \author Javier Arribas, 2017. jarribas(at)cttc.es
- *
- * -------------------------------------------------------------------------
- *
- * Copyright (C) 2010-2018 (see AUTHORS file for a list of contributors)
- *
- * GNSS-SDR is a software defined Global Navigation
- * Satellite Systems receiver
- *
- * This file is part of GNSS-SDR.
- *
- * GNSS-SDR is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * GNSS-SDR is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNSS-SDR. If not, see .
- *
- * -------------------------------------------------------------------------
- */
-
-
-#include "rtklib_pvt.h"
-#include "configuration_interface.h"
-#include "gnss_sdr_flags.h"
-#include
-#include
-#include
-#include
-#include
-
-
-using google::LogMessage;
-
-RtklibPvt::RtklibPvt(ConfigurationInterface* configuration,
- std::string role,
- unsigned int in_streams,
- unsigned int out_streams) : role_(role),
- in_streams_(in_streams),
- out_streams_(out_streams)
-{
- // dump parameters
- std::string default_dump_filename = "./pvt.dat";
- std::string default_nmea_dump_filename = "./nmea_pvt.nmea";
- std::string default_nmea_dump_devname = "/dev/tty1";
- std::string default_rtcm_dump_devname = "/dev/pts/1";
- DLOG(INFO) << "role " << role;
- dump_ = configuration->property(role + ".dump", false);
- dump_filename_ = configuration->property(role + ".dump_filename", default_dump_filename);
-
- // output rate
- int output_rate_ms = configuration->property(role + ".output_rate_ms", 500);
-
- // display rate
- int display_rate_ms = configuration->property(role + ".display_rate_ms", 500);
-
- // NMEA Printer settings
- bool flag_nmea_tty_port = configuration->property(role + ".flag_nmea_tty_port", false);
- std::string nmea_dump_filename = configuration->property(role + ".nmea_dump_filename", default_nmea_dump_filename);
- std::string nmea_dump_devname = configuration->property(role + ".nmea_dump_devname", default_nmea_dump_devname);
-
- // RINEX version
- int rinex_version = configuration->property(role + ".rinex_version", 3);
- if (FLAGS_RINEX_version.compare("3.01") == 0)
- {
- rinex_version = 3;
- }
- else if (FLAGS_RINEX_version.compare("3.02") == 0)
- {
- rinex_version = 3;
- }
- else if (FLAGS_RINEX_version.compare("3") == 0)
- {
- rinex_version = 3;
- }
- else if (FLAGS_RINEX_version.compare("2.11") == 0)
- {
- rinex_version = 2;
- }
- else if (FLAGS_RINEX_version.compare("2.10") == 0)
- {
- rinex_version = 2;
- }
- else if (FLAGS_RINEX_version.compare("2") == 0)
- {
- rinex_version = 2;
- }
- int rinexobs_rate_ms = boost::math::lcm(configuration->property(role + ".rinexobs_rate_ms", 1000), output_rate_ms);
- int rinexnav_rate_ms = boost::math::lcm(configuration->property(role + ".rinexnav_rate_ms", 6000), output_rate_ms);
-
- // RTCM Printer settings
- bool flag_rtcm_tty_port = configuration->property(role + ".flag_rtcm_tty_port", false);
- std::string rtcm_dump_devname = configuration->property(role + ".rtcm_dump_devname", default_rtcm_dump_devname);
- bool flag_rtcm_server = configuration->property(role + ".flag_rtcm_server", false);
- unsigned short rtcm_tcp_port = configuration->property(role + ".rtcm_tcp_port", 2101);
- unsigned short rtcm_station_id = configuration->property(role + ".rtcm_station_id", 1234);
- // RTCM message rates: least common multiple with output_rate_ms
- int rtcm_MT1019_rate_ms = boost::math::lcm(configuration->property(role + ".rtcm_MT1019_rate_ms", 5000), output_rate_ms);
- int rtcm_MT1020_rate_ms = boost::math::lcm(configuration->property(role + ".rtcm_MT1020_rate_ms", 5000), output_rate_ms);
- int rtcm_MT1045_rate_ms = boost::math::lcm(configuration->property(role + ".rtcm_MT1045_rate_ms", 5000), output_rate_ms);
- int rtcm_MSM_rate_ms = boost::math::lcm(configuration->property(role + ".rtcm_MSM_rate_ms", 1000), output_rate_ms);
- int rtcm_MT1077_rate_ms = boost::math::lcm(configuration->property(role + ".rtcm_MT1077_rate_ms", rtcm_MSM_rate_ms), output_rate_ms);
- int rtcm_MT1087_rate_ms = boost::math::lcm(configuration->property(role + ".rtcm_MT1087_rate_ms", rtcm_MSM_rate_ms), output_rate_ms);
- int rtcm_MT1097_rate_ms = boost::math::lcm(configuration->property(role + ".rtcm_MT1097_rate_ms", rtcm_MSM_rate_ms), output_rate_ms);
- std::map rtcm_msg_rate_ms;
- rtcm_msg_rate_ms[1019] = rtcm_MT1019_rate_ms;
- rtcm_msg_rate_ms[1020] = rtcm_MT1020_rate_ms;
- rtcm_msg_rate_ms[1045] = rtcm_MT1045_rate_ms;
- for (int k = 1071; k < 1078; k++) // All GPS MSM
- {
- rtcm_msg_rate_ms[k] = rtcm_MT1077_rate_ms;
- }
- for (int k = 1081; k < 1088; k++) // All GLONASS MSM
- {
- rtcm_msg_rate_ms[k] = rtcm_MT1087_rate_ms;
- }
- for (int k = 1091; k < 1098; k++) // All Galileo MSM
- {
- rtcm_msg_rate_ms[k] = rtcm_MT1097_rate_ms;
- }
- // getting names from the config file, if available
- // default filename for assistance data
- const std::string eph_default_xml_filename = "./gps_ephemeris.xml";
- const std::string utc_default_xml_filename = "./gps_utc_model.xml";
- const std::string iono_default_xml_filename = "./gps_iono.xml";
- const std::string ref_time_default_xml_filename = "./gps_ref_time.xml";
- const std::string ref_location_default_xml_filename = "./gps_ref_location.xml";
- eph_xml_filename_ = configuration->property("GNSS-SDR.SUPL_gps_ephemeris_xml", eph_default_xml_filename);
- //std::string utc_xml_filename = configuration_->property("GNSS-SDR.SUPL_gps_utc_model.xml", utc_default_xml_filename);
- //std::string iono_xml_filename = configuration_->property("GNSS-SDR.SUPL_gps_iono_xml", iono_default_xml_filename);
- //std::string ref_time_xml_filename = configuration_->property("GNSS-SDR.SUPL_gps_ref_time_xml", ref_time_default_xml_filename);
- //std::string ref_location_xml_filename = configuration_->property("GNSS-SDR.SUPL_gps_ref_location_xml", ref_location_default_xml_filename);
-
- // Infer the type of receiver
- /*
- * TYPE | RECEIVER
- * 0 | Unknown
- * 1 | GPS L1 C/A
- * 2 | GPS L2C
- * 3 | GPS L5
- * 4 | Galileo E1B
- * 5 | Galileo E5a
- * 6 | Galileo E5b
- * 7 | GPS L1 C/A + GPS L2C
- * 8 | GPS L1 C/A + GPS L5
- * 9 | GPS L1 C/A + Galileo E1B
- * 10 | GPS L1 C/A + Galileo E5a
- * 11 | GPS L1 C/A + Galileo E5b
- * 12 | Galileo E1B + GPS L2C
- * 13 | Galileo E1B + GPS L5
- * 14 | Galileo E1B + Galileo E5a
- * 15 | Galileo E1B + Galileo E5b
- * 16 | GPS L2C + GPS L5
- * 17 | GPS L2C + Galileo E5a
- * 18 | GPS L2C + Galileo E5b
- * 19 | GPS L5 + Galileo E5a
- * 20 | GPS L5 + Galileo E5b
- * 21 | GPS L1 C/A + Galileo E1B + GPS L2C
- * 22 | GPS L1 C/A + Galileo E1B + GPS L5
- * 23 | GLONASS L1 C/A
- * 24 | GLONASS L2 C/A
- * 25 | GLONASS L1 C/A + GLONASS L2 C/A
- * 26 | GPS L1 C/A + GLONASS L1 C/A
- * 27 | Galileo E1B + GLONASS L1 C/A
- * 28 | GPS L2C + GLONASS L1 C/A
- */
- int gps_1C_count = configuration->property("Channels_1C.count", 0);
- int gps_2S_count = configuration->property("Channels_2S.count", 0);
- int gps_L5_count = configuration->property("Channels_L5.count", 0);
- int gal_1B_count = configuration->property("Channels_1B.count", 0);
- int gal_E5a_count = configuration->property("Channels_5X.count", 0);
- int gal_E5b_count = configuration->property("Channels_7X.count", 0);
- int glo_1G_count = configuration->property("Channels_1G.count", 0);
- int glo_2G_count = configuration->property("Channels_2G.count", 0);
-
- unsigned int type_of_receiver = 0;
-
- // *******************WARNING!!!!!!!***********
- // GPS L5 only configurable for single frequency, single system at the moment!!!!!!
- if ((gps_1C_count != 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0)) type_of_receiver = 1;
- if ((gps_1C_count == 0) && (gps_2S_count != 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0)) type_of_receiver = 2;
- if ((gps_1C_count == 0) && (gps_2S_count == 0) && (gps_L5_count != 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0)) type_of_receiver = 3;
- if ((gps_1C_count == 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count != 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0)) type_of_receiver = 4;
- if ((gps_1C_count == 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count != 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0)) type_of_receiver = 5;
- if ((gps_1C_count == 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count != 0) && (glo_1G_count == 0) && (glo_2G_count == 0)) type_of_receiver = 6;
-
- if ((gps_1C_count != 0) && (gps_2S_count != 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0)) type_of_receiver = 7;
- //if( (gps_1C_count != 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0)) type_of_receiver = 8;
- if ((gps_1C_count != 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count != 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0)) type_of_receiver = 9;
- if ((gps_1C_count != 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count != 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0)) type_of_receiver = 10;
- if ((gps_1C_count != 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count != 0) && (glo_1G_count == 0) && (glo_2G_count == 0)) type_of_receiver = 11;
- if ((gps_1C_count == 0) && (gps_2S_count != 0) && (gps_L5_count == 0) && (gal_1B_count != 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0)) type_of_receiver = 12;
- //if( (gps_1C_count == 0) && (gps_2S_count == 0) && (gal_1B_count != 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0)) type_of_receiver = 13;
- if ((gps_1C_count == 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count != 0) && (gal_E5a_count != 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0)) type_of_receiver = 14;
- if ((gps_1C_count == 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count != 0) && (gal_E5a_count == 0) && (gal_E5b_count != 0) && (glo_1G_count == 0) && (glo_2G_count == 0)) type_of_receiver = 15;
- //if( (gps_1C_count == 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0)) type_of_receiver = 16;
- if ((gps_1C_count == 0) && (gps_2S_count != 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count != 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0)) type_of_receiver = 17;
- if ((gps_1C_count == 0) && (gps_2S_count != 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count != 0) && (glo_1G_count == 0) && (glo_2G_count == 0)) type_of_receiver = 18;
- //if( (gps_1C_count == 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0)) type_of_receiver = 19;
- //if( (gps_1C_count == 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0)) type_of_receiver = 20;
- if ((gps_1C_count != 0) && (gps_2S_count != 0) && (gps_L5_count == 0) && (gal_1B_count != 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0)) type_of_receiver = 21;
- //if( (gps_1C_count == 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count = 0)) type_of_receiver = 22;
- if ((gps_1C_count == 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count != 0)) type_of_receiver = 23;
- if ((gps_1C_count == 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count != 0)) type_of_receiver = 24;
- if ((gps_1C_count == 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count != 0) && (glo_2G_count != 0)) type_of_receiver = 25;
- if ((gps_1C_count != 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count != 0) && (glo_2G_count == 0)) type_of_receiver = 26;
- if ((gps_1C_count == 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count != 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count != 0) && (glo_2G_count == 0)) type_of_receiver = 27;
- if ((gps_1C_count == 0) && (gps_2S_count != 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count != 0) && (glo_2G_count == 0)) type_of_receiver = 28;
- if ((gps_1C_count != 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count != 0)) type_of_receiver = 29;
- if ((gps_1C_count == 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count != 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count != 0)) type_of_receiver = 30;
- if ((gps_1C_count == 0) && (gps_2S_count != 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count != 0)) type_of_receiver = 31;
- //RTKLIB PVT solver options
- // Settings 1
- int positioning_mode = -1;
- std::string default_pos_mode("Single");
- std::string positioning_mode_str = configuration->property(role + ".positioning_mode", default_pos_mode); /* (PMODE_XXX) see src/algorithms/libs/rtklib/rtklib.h */
- if (positioning_mode_str.compare("Single") == 0) positioning_mode = PMODE_SINGLE;
- if (positioning_mode_str.compare("Static") == 0) positioning_mode = PMODE_STATIC;
- if (positioning_mode_str.compare("Kinematic") == 0) positioning_mode = PMODE_KINEMA;
- if (positioning_mode_str.compare("PPP_Static") == 0) positioning_mode = PMODE_PPP_STATIC;
- if (positioning_mode_str.compare("PPP_Kinematic") == 0) positioning_mode = PMODE_PPP_KINEMA;
-
- if (positioning_mode == -1)
- {
- //warn user and set the default
- std::cout << "WARNING: Bad specification of positioning mode." << std::endl;
- std::cout << "positioning_mode possible values: Single / Static / Kinematic / PPP_Static / PPP_Kinematic" << std::endl;
- std::cout << "positioning_mode specified value: " << positioning_mode_str << std::endl;
- std::cout << "Setting positioning_mode to Single" << std::endl;
- positioning_mode = PMODE_SINGLE;
- }
-
- int num_bands = 0;
-
- if ((gps_1C_count > 0) || (gal_1B_count > 0) || (glo_1G_count > 0)) num_bands = 1;
- if (((gps_1C_count > 0) || (gal_1B_count > 0) || (glo_1G_count > 0)) && ((gps_2S_count > 0) || (glo_2G_count > 0))) num_bands = 2;
- if (((gps_1C_count > 0) || (gal_1B_count > 0) || (glo_1G_count > 0)) && ((gal_E5a_count > 0) || (gal_E5b_count > 0) || (gps_L5_count > 0))) num_bands = 2;
- if (((gps_1C_count > 0) || (gal_1B_count > 0) || (glo_1G_count > 0)) && ((gps_2S_count > 0) || (glo_2G_count > 0)) && ((gal_E5a_count > 0) || (gal_E5b_count > 0) || (gps_L5_count > 0))) num_bands = 3;
-
- int number_of_frequencies = configuration->property(role + ".num_bands", num_bands); /* (1:L1, 2:L1+L2, 3:L1+L2+L5) */
- if ((number_of_frequencies < 1) || (number_of_frequencies > 3))
- {
- //warn user and set the default
- number_of_frequencies = num_bands;
- }
-
- double elevation_mask = configuration->property(role + ".elevation_mask", 15.0);
- if ((elevation_mask < 0.0) || (elevation_mask > 90.0))
- {
- //warn user and set the default
- LOG(WARNING) << "Erroneous Elevation Mask. Setting to default value of 15.0 degrees";
- elevation_mask = 15.0;
- }
-
- int dynamics_model = configuration->property(role + ".dynamics_model", 0); /* dynamics model (0:none, 1:velocity, 2:accel) */
- if ((dynamics_model < 0) || (dynamics_model > 2))
- {
- //warn user and set the default
- LOG(WARNING) << "Erroneous Dynamics Model configuration. Setting to default value of (0:none)";
- dynamics_model = 0;
- }
-
- std::string default_iono_model("OFF");
- std::string iono_model_str = configuration->property(role + ".iono_model", default_iono_model); /* (IONOOPT_XXX) see src/algorithms/libs/rtklib/rtklib.h */
- int iono_model = -1;
- if (iono_model_str.compare("OFF") == 0) iono_model = IONOOPT_OFF;
- if (iono_model_str.compare("Broadcast") == 0) iono_model = IONOOPT_BRDC;
- if (iono_model_str.compare("SBAS") == 0) iono_model = IONOOPT_SBAS;
- if (iono_model_str.compare("Iono-Free-LC") == 0) iono_model = IONOOPT_IFLC;
- if (iono_model_str.compare("Estimate_STEC") == 0) iono_model = IONOOPT_EST;
- if (iono_model_str.compare("IONEX") == 0) iono_model = IONOOPT_TEC;
- if (iono_model == -1)
- {
- //warn user and set the default
- std::cout << "WARNING: Bad specification of ionospheric model." << std::endl;
- std::cout << "iono_model possible values: OFF / Broadcast / SBAS / Iono-Free-LC / Estimate_STEC / IONEX" << std::endl;
- std::cout << "iono_model specified value: " << iono_model_str << std::endl;
- std::cout << "Setting iono_model to OFF" << std::endl;
- iono_model = IONOOPT_OFF; /* 0: ionosphere option: correction off */
- }
-
- std::string default_trop_model("OFF");
- int trop_model = -1;
- std::string trop_model_str = configuration->property(role + ".trop_model", default_trop_model); /* (TROPOPT_XXX) see src/algorithms/libs/rtklib/rtklib.h */
- if (trop_model_str.compare("OFF") == 0) trop_model = TROPOPT_OFF;
- if (trop_model_str.compare("Saastamoinen") == 0) trop_model = TROPOPT_SAAS;
- if (trop_model_str.compare("SBAS") == 0) trop_model = TROPOPT_SBAS;
- if (trop_model_str.compare("Estimate_ZTD") == 0) trop_model = TROPOPT_EST;
- if (trop_model_str.compare("Estimate_ZTD_Grad") == 0) trop_model = TROPOPT_ESTG;
- if (trop_model == -1)
- {
- //warn user and set the default
- std::cout << "WARNING: Bad specification of tropospheric model." << std::endl;
- std::cout << "trop_model possible values: OFF / Saastamoinen / SBAS / Estimate_ZTD / Estimate_ZTD_Grad" << std::endl;
- std::cout << "trop_model specified value: " << trop_model_str << std::endl;
- std::cout << "Setting trop_model to OFF" << std::endl;
- trop_model = TROPOPT_OFF;
- }
-
- /* RTKLIB positioning options */
- int sat_PCV = 0; /* Set whether the satellite antenna PCV (phase center variation) model is used or not. This feature requires a Satellite Antenna PCV File. */
- int rec_PCV = 0; /* Set whether the receiver antenna PCV (phase center variation) model is used or not. This feature requires a Receiver Antenna PCV File. */
-
- /* Set whether the phase windup correction for PPP modes is applied or not. Only applicable to PPP‐* modes.*/
- int phwindup = configuration->property(role + ".phwindup", 0);
-
- /* Set whether the GPS Block IIA satellites in eclipse are excluded or not.
- The eclipsing Block IIA satellites often degrade the PPP solutions due to unpredicted behavior of yaw‐attitude. Only applicable to PPP‐* modes.*/
- int reject_GPS_IIA = configuration->property(role + ".reject_GPS_IIA", 0);
-
- /* Set whether RAIM (receiver autonomous integrity monitoring) FDE (fault detection and exclusion) feature is enabled or not.
- In case of RAIM FDE enabled, a satellite is excluded if SSE (sum of squared errors) of residuals is over a threshold.
- The excluded satellite is selected to indicate the minimum SSE. */
- int raim_fde = configuration->property(role + ".raim_fde", 0);
-
- int earth_tide = configuration->property(role + ".earth_tide", 0);
-
- int nsys = 0;
- if ((gps_1C_count > 0) || (gps_2S_count > 0) || (gps_L5_count > 0)) nsys += SYS_GPS;
- if ((gal_1B_count > 0) || (gal_E5a_count > 0) || (gal_E5b_count > 0)) nsys += SYS_GAL;
- if ((glo_1G_count > 0) || (glo_2G_count > 0)) nsys += SYS_GLO;
- int navigation_system = configuration->property(role + ".navigation_system", nsys); /* (SYS_XXX) see src/algorithms/libs/rtklib/rtklib.h */
- if ((navigation_system < 1) || (navigation_system > 255)) /* GPS: 1 SBAS: 2 GPS+SBAS: 3 Galileo: 8 Galileo+GPS: 9 GPS+SBAS+Galileo: 11 All: 255 */
- {
- //warn user and set the default
- LOG(WARNING) << "Erroneous Navigation System. Setting to default value of (0:none)";
- navigation_system = nsys;
- }
-
- // Settings 2
- std::string default_gps_ar("Continuous");
- std::string integer_ambiguity_resolution_gps_str = configuration->property(role + ".AR_GPS", default_gps_ar); /* Integer Ambiguity Resolution mode for GPS (0:off,1:continuous,2:instantaneous,3:fix and hold,4:ppp-ar) */
- int integer_ambiguity_resolution_gps = -1;
- if (integer_ambiguity_resolution_gps_str.compare("OFF") == 0) integer_ambiguity_resolution_gps = ARMODE_OFF;
- if (integer_ambiguity_resolution_gps_str.compare("Continuous") == 0) integer_ambiguity_resolution_gps = ARMODE_CONT;
- if (integer_ambiguity_resolution_gps_str.compare("Instantaneous") == 0) integer_ambiguity_resolution_gps = ARMODE_INST;
- if (integer_ambiguity_resolution_gps_str.compare("Fix-and-Hold") == 0) integer_ambiguity_resolution_gps = ARMODE_FIXHOLD;
- if (integer_ambiguity_resolution_gps_str.compare("PPP-AR") == 0) integer_ambiguity_resolution_gps = ARMODE_PPPAR;
- if (integer_ambiguity_resolution_gps == -1)
- {
- //warn user and set the default
- std::cout << "WARNING: Bad specification of GPS ambiguity resolution method." << std::endl;
- std::cout << "AR_GPS possible values: OFF / Continuous / Instantaneous / Fix-and-Hold / PPP-AR" << std::endl;
- std::cout << "AR_GPS specified value: " << integer_ambiguity_resolution_gps_str << std::endl;
- std::cout << "Setting AR_GPS to OFF" << std::endl;
- integer_ambiguity_resolution_gps = ARMODE_OFF;
- }
-
- int integer_ambiguity_resolution_glo = configuration->property(role + ".AR_GLO", 1); /* Integer Ambiguity Resolution mode for GLONASS (0:off,1:on,2:auto cal,3:ext cal) */
- if ((integer_ambiguity_resolution_glo < 0) || (integer_ambiguity_resolution_glo > 3))
- {
- //warn user and set the default
- LOG(WARNING) << "Erroneous Integer Ambiguity Resolution for GLONASS . Setting to default value of (1:on)";
- integer_ambiguity_resolution_glo = 1;
- }
-
- int integer_ambiguity_resolution_bds = configuration->property(role + ".AR_DBS", 1); /* Integer Ambiguity Resolution mode for BEIDOU (0:off,1:on) */
- if ((integer_ambiguity_resolution_bds < 0) || (integer_ambiguity_resolution_bds > 1))
- {
- //warn user and set the default
- LOG(WARNING) << "Erroneous Integer Ambiguity Resolution for BEIDOU . Setting to default value of (1:on)";
- integer_ambiguity_resolution_bds = 1;
- }
-
- double min_ratio_to_fix_ambiguity = configuration->property(role + ".min_ratio_to_fix_ambiguity", 3.0); /* Set the integer ambiguity validation threshold for ratio‐test,
- which uses the ratio of squared residuals of the best integer vector to the second‐best vector. */
-
- int min_lock_to_fix_ambiguity = configuration->property(role + ".min_lock_to_fix_ambiguity", 0); /* Set the minimum lock count to fix integer ambiguity.
- If the lock count is less than the value, the ambiguity is excluded from the fixed integer vector. */
-
- double min_elevation_to_fix_ambiguity = configuration->property(role + ".min_elevation_to_fix_ambiguity", 0.0); /* Set the minimum elevation (deg) to fix integer ambiguity.
- If the elevation of the satellite is less than the value, the ambiguity is excluded from the fixed integer vector. */
-
- int outage_reset_ambiguity = configuration->property(role + ".outage_reset_ambiguity", 5); /* Set the outage count to reset ambiguity. If the data outage count is over the value, the estimated ambiguity is reset to the initial value. */
-
- double slip_threshold = configuration->property(role + ".slip_threshold", 0.05); /* set the cycle‐slip threshold (m) of geometry‐free LC carrier‐phase difference between epochs */
-
- double threshold_reject_gdop = configuration->property(role + ".threshold_reject_gdop", 30.0); /* reject threshold of GDOP. If the GDOP is over the value, the observable is excluded for the estimation process as an outlier. */
-
- double threshold_reject_innovation = configuration->property(role + ".threshold_reject_innovation", 30.0); /* reject threshold of innovation (m). If the innovation is over the value, the observable is excluded for the estimation process as an outlier. */
-
- int number_filter_iter = configuration->property(role + ".number_filter_iter", 1); /* Set the number of iteration in the measurement update of the estimation filter.
- If the baseline length is very short like 1 m, the iteration may be effective to handle
- the nonlinearity of measurement equation. */
-
- /// Statistics
- double bias_0 = configuration->property(role + ".bias_0", 30.0);
-
- double iono_0 = configuration->property(role + ".iono_0", 0.03);
-
- double trop_0 = configuration->property(role + ".trop_0", 0.3);
-
- double sigma_bias = configuration->property(role + ".sigma_bias", 1e-4); /* Set the process noise standard deviation of carrier‐phase
- bias (ambiguity) (cycle/sqrt(s)) */
-
- double sigma_iono = configuration->property(role + ".sigma_iono", 1e-3); /* Set the process noise standard deviation of vertical ionospheric delay per 10 km baseline (m/sqrt(s)). */
-
- double sigma_trop = configuration->property(role + ".sigma_trop", 1e-4); /* Set the process noise standard deviation of zenith tropospheric delay (m/sqrt(s)). */
-
- double sigma_acch = configuration->property(role + ".sigma_acch", 1e-1); /* Set the process noise standard deviation of the receiver acceleration as
- the horizontal component. (m/s2/sqrt(s)). If Receiver Dynamics is set to OFF, they are not used. */
-
- double sigma_accv = configuration->property(role + ".sigma_accv", 1e-2); /* Set the process noise standard deviation of the receiver acceleration as
- the vertical component. (m/s2/sqrt(s)). If Receiver Dynamics is set to OFF, they are not used. */
-
- double sigma_pos = configuration->property(role + ".sigma_pos", 0.0);
-
- double code_phase_error_ratio_l1 = configuration->property(role + ".code_phase_error_ratio_l1", 100.0);
- double code_phase_error_ratio_l2 = configuration->property(role + ".code_phase_error_ratio_l2", 100.0);
- double code_phase_error_ratio_l5 = configuration->property(role + ".code_phase_error_ratio_l5", 100.0);
- double carrier_phase_error_factor_a = configuration->property(role + ".carrier_phase_error_factor_a", 0.003);
- double carrier_phase_error_factor_b = configuration->property(role + ".carrier_phase_error_factor_b", 0.003);
-
- snrmask_t snrmask = {{}, {{}, {}}};
-
- prcopt_t rtklib_configuration_options = {
- positioning_mode, /* positioning mode (PMODE_XXX) see src/algorithms/libs/rtklib/rtklib.h */
- 0, /* solution type (0:forward,1:backward,2:combined) */
- number_of_frequencies, /* number of frequencies (1:L1, 2:L1+L2, 3:L1+L2+L5)*/
- navigation_system, /* navigation system */
- elevation_mask * D2R, /* elevation mask angle (degrees) */
- snrmask, /* snrmask_t snrmask SNR mask */
- 0, /* satellite ephemeris/clock (EPHOPT_XXX) */
- integer_ambiguity_resolution_gps, /* AR mode (0:off,1:continuous,2:instantaneous,3:fix and hold,4:ppp-ar) */
- integer_ambiguity_resolution_glo, /* GLONASS AR mode (0:off,1:on,2:auto cal,3:ext cal) */
- integer_ambiguity_resolution_bds, /* BeiDou AR mode (0:off,1:on) */
- outage_reset_ambiguity, /* obs outage count to reset bias */
- min_lock_to_fix_ambiguity, /* min lock count to fix ambiguity */
- 10, /* min fix count to hold ambiguity */
- 1, /* max iteration to resolve ambiguity */
- iono_model, /* ionosphere option (IONOOPT_XXX) */
- trop_model, /* troposphere option (TROPOPT_XXX) */
- dynamics_model, /* dynamics model (0:none, 1:velocity, 2:accel) */
- earth_tide, /* earth tide correction (0:off,1:solid,2:solid+otl+pole) */
- number_filter_iter, /* number of filter iteration */
- 0, /* code smoothing window size (0:none) */
- 0, /* interpolate reference obs (for post mission) */
- 0, /* sbssat_t sbssat SBAS correction options */
- 0, /* sbsion_t sbsion[MAXBAND+1] SBAS satellite selection (0:all) */
- 0, /* rover position for fixed mode */
- 0, /* base position for relative mode */
- /* 0:pos in prcopt, 1:average of single pos, */
- /* 2:read from file, 3:rinex header, 4:rtcm pos */
- {code_phase_error_ratio_l1, code_phase_error_ratio_l2, code_phase_error_ratio_l5}, /* eratio[NFREQ] code/phase error ratio */
- {100.0, carrier_phase_error_factor_a, carrier_phase_error_factor_b, 0.0, 1.0}, /* err[5]: measurement error factor [0]:reserved, [1-3]:error factor a/b/c of phase (m) , [4]:doppler frequency (hz) */
- {bias_0, iono_0, trop_0}, /* std[3]: initial-state std [0]bias,[1]iono [2]trop*/
- {sigma_bias, sigma_iono, sigma_trop, sigma_acch, sigma_accv, sigma_pos}, /* prn[6] process-noise std */
- 5e-12, /* sclkstab: satellite clock stability (sec/sec) */
- {min_ratio_to_fix_ambiguity, 0.9999, 0.25, 0.1, 0.05, 0.0, 0.0, 0.0}, /* thresar[8]: AR validation threshold */
- min_elevation_to_fix_ambiguity, /* elevation mask of AR for rising satellite (deg) */
- 0.0, /* elevation mask to hold ambiguity (deg) */
- slip_threshold, /* slip threshold of geometry-free phase (m) */
- 30.0, /* max difference of time (sec) */
- threshold_reject_innovation, /* reject threshold of innovation (m) */
- threshold_reject_gdop, /* reject threshold of gdop */
- {}, /* double baseline[2] baseline length constraint {const,sigma} (m) */
- {}, /* double ru[3] rover position for fixed mode {x,y,z} (ecef) (m) */
- {}, /* double rb[3] base position for relative mode {x,y,z} (ecef) (m) */
- {"", ""}, /* char anttype[2][MAXANT] antenna types {rover,base} */
- {{}, {}}, /* double antdel[2][3] antenna delta {{rov_e,rov_n,rov_u},{ref_e,ref_n,ref_u}} */
- {}, /* pcv_t pcvr[2] receiver antenna parameters {rov,base} */
- {}, /* unsigned char exsats[MAXSAT] excluded satellites (1:excluded, 2:included) */
- 0, /* max averaging epoches */
- 0, /* initialize by restart */
- 1, /* output single by dgps/float/fix/ppp outage */
- {"", ""}, /* char rnxopt[2][256] rinex options {rover,base} */
- {sat_PCV, rec_PCV, phwindup, reject_GPS_IIA, raim_fde}, /* posopt[6] positioning options [0]: satellite and receiver antenna PCV model; [1]: interpolate antenna parameters; [2]: apply phase wind-up correction for PPP modes; [3]: exclude measurements of GPS Block IIA satellites satellite [4]: RAIM FDE (fault detection and exclusion) [5]: handle day-boundary clock jump */
- 0, /* solution sync mode (0:off,1:on) */
- {{}, {}}, /* odisp[2][6*11] ocean tide loading parameters {rov,base} */
- {{}, {{}, {}}, {{}, {}}, {}, {}}, /* exterr_t exterr extended receiver error model */
- 0, /* disable L2-AR */
- {} /* char pppopt[256] ppp option "-GAP_RESION=" default gap to reset iono parameters (ep) */
- };
-
- rtkinit(&rtk, &rtklib_configuration_options);
-
- // make PVT object
- pvt_ = rtklib_make_pvt_cc(in_streams_, dump_, dump_filename_, output_rate_ms, display_rate_ms, flag_nmea_tty_port, nmea_dump_filename, nmea_dump_devname, rinex_version, rinexobs_rate_ms, rinexnav_rate_ms, flag_rtcm_server, flag_rtcm_tty_port, rtcm_tcp_port, rtcm_station_id, rtcm_msg_rate_ms, rtcm_dump_devname, type_of_receiver, rtk);
- DLOG(INFO) << "pvt(" << pvt_->unique_id() << ")";
- if (out_streams_ > 0)
- {
- LOG(ERROR) << "The PVT block does not have an output stream";
- }
-}
-
-
-bool RtklibPvt::save_assistance_to_XML()
-{
- LOG(INFO) << "SUPL: Try to save GPS ephemeris to XML file " << eph_xml_filename_;
- std::map eph_map = pvt_->get_GPS_L1_ephemeris_map();
-
- if (eph_map.size() > 0)
- {
- try
- {
- std::ofstream ofs(eph_xml_filename_.c_str(), std::ofstream::trunc | std::ofstream::out);
- boost::archive::xml_oarchive xml(ofs);
- xml << boost::serialization::make_nvp("GNSS-SDR_ephemeris_map", eph_map);
- ofs.close();
- LOG(INFO) << "Saved GPS L1 Ephemeris map data";
- }
- catch (const std::exception& e)
- {
- LOG(WARNING) << e.what();
- return false;
- }
- return true; // return variable (true == succeeded)
- }
- else
- {
- LOG(WARNING) << "Failed to save Ephemeris, map is empty";
- return false;
- }
-}
-
-
-RtklibPvt::~RtklibPvt()
-{
- rtkfree(&rtk);
- save_assistance_to_XML();
-}
-
-
-void RtklibPvt::connect(gr::top_block_sptr top_block)
-{
- if (top_block)
- { /* top_block is not null */
- };
- // Nothing to connect internally
- DLOG(INFO) << "nothing to connect internally";
-}
-
-
-void RtklibPvt::disconnect(gr::top_block_sptr top_block)
-{
- if (top_block)
- { /* top_block is not null */
- };
- // Nothing to disconnect
-}
-
-
-gr::basic_block_sptr RtklibPvt::get_left_block()
-{
- return pvt_;
-}
-
-
-gr::basic_block_sptr RtklibPvt::get_right_block()
-{
- return pvt_; // this is a sink, nothing downstream
-}
diff --git a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc
index a59e5a8a7..23f3d8c1e 100644
--- a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc
+++ b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc
@@ -321,8 +321,8 @@ void rtklib_pvt_cc::clear_ephemeris()
rtklib_pvt_cc::rtklib_pvt_cc(uint32_t nchannels,
const Pvt_Conf& conf_,
const rtk_t& rtk) : gr::sync_block("rtklib_pvt_cc",
- gr::io_signature::make(nchannels, nchannels, sizeof(Gnss_Synchro)),
- gr::io_signature::make(0, 0, 0))
+ gr::io_signature::make(nchannels, nchannels, sizeof(Gnss_Synchro)),
+ gr::io_signature::make(0, 0, 0))
{
d_output_rate_ms = conf_.output_rate_ms;
d_display_rate_ms = conf_.display_rate_ms;
@@ -1018,8 +1018,8 @@ bool rtklib_pvt_cc::save_gnss_synchro_map_xml(const std::string& file_name)
return true;
}
- LOG(WARNING) << "Failed to save gnss_synchro, map is empty";
- return false;
+ LOG(WARNING) << "Failed to save gnss_synchro, map is empty";
+ return false;
}
@@ -1064,7 +1064,7 @@ bool rtklib_pvt_cc::get_latest_PVT(double* longitude_deg,
return true;
}
- return false;
+ return false;
}
@@ -1564,7 +1564,7 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
rp->rinex_nav_header(rp->navMixFile, d_pvt_solver->gps_iono, d_pvt_solver->gps_utc_model, d_pvt_solver->galileo_iono, d_pvt_solver->galileo_utc_model);
b_rinex_header_written = true; // do not write header anymore
}
- break;
+ break;
case 50: // BDS B1I only
if (beidou_dnav_ephemeris_iter != d_pvt_solver->beidou_dnav_ephemeris_map.cend())
{
@@ -2149,10 +2149,10 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
{
// This is a channel with valid GPS signal
gps_cnav_eph_iter = d_pvt_solver->gps_cnav_ephemeris_map.find(gnss_observables_iter->second.PRN);
- if (gps_cnav_eph_iter != d_pvt_solver->gps_cnav_ephemeris_map.cend())
- {
+ if (gps_cnav_eph_iter != d_pvt_solver->gps_cnav_ephemeris_map.cend())
+ {
gps_channel = 1;
- }
+ }
}
}
if (gal_channel == 0)
@@ -2160,8 +2160,8 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
if (system == "E")
{
gal_eph_iter = d_pvt_solver->galileo_ephemeris_map.find(gnss_observables_iter->second.PRN);
- if (gal_eph_iter != d_pvt_solver->galileo_ephemeris_map.cend())
- {
+ if (gal_eph_iter != d_pvt_solver->galileo_ephemeris_map.cend())
+ {
gal_channel = 1;
}
}
diff --git a/src/algorithms/PVT/libs/rinex_printer.cc b/src/algorithms/PVT/libs/rinex_printer.cc
index e7b2b9e6b..e630b8dd8 100644
--- a/src/algorithms/PVT/libs/rinex_printer.cc
+++ b/src/algorithms/PVT/libs/rinex_printer.cc
@@ -247,9 +247,9 @@ Rinex_Printer::~Rinex_Printer()
if (remove(navGlofilename.c_str()) != 0) LOG(INFO) << "Error deleting temporary file";
}
if (posnc == 0)
- {
- if (remove(navBdsfilename.c_str()) != 0) LOG(INFO) << "Error deleting temporary file";
- }
+ {
+ if (remove(navBdsfilename.c_str()) != 0) LOG(INFO) << "Error deleting temporary file";
+ }
}
@@ -1367,8 +1367,8 @@ void Rinex_Printer::rinex_nav_header(std::fstream& out, const Gps_Iono& iono, co
line += std::string(3, ' ');
line += Rinex_Printer::rightJustify(Rinex_Printer::doub2for(utc_model.d_A0, 18, 2), 19);
line += Rinex_Printer::rightJustify(Rinex_Printer::doub2for(utc_model.d_A1, 18, 2), 19);
- line += Rinex_Printer::rightJustify(boost::lexical_cast(utc_model.d_t_OT), 9);
- line += Rinex_Printer::rightJustify(boost::lexical_cast(utc_model.i_WN_T + 1024), 9); // valid until 2019
+ line += Rinex_Printer::rightJustify(std::to_string(utc_model.d_t_OT), 9);
+ line += Rinex_Printer::rightJustify(std::to_string(utc_model.i_WN_T + 1024), 9); // valid until 2019
line += std::string(1, ' ');
line += Rinex_Printer::leftJustify("DELTA-UTC: A0,A1,T,W", 20);
}
@@ -1378,8 +1378,8 @@ void Rinex_Printer::rinex_nav_header(std::fstream& out, const Gps_Iono& iono, co
line += std::string("GPUT");
line += Rinex_Printer::rightJustify(Rinex_Printer::doub2for(utc_model.d_A0, 16, 2), 18);
line += Rinex_Printer::rightJustify(Rinex_Printer::doub2for(utc_model.d_A1, 15, 2), 16);
- line += Rinex_Printer::rightJustify(boost::lexical_cast(utc_model.d_t_OT), 7);
- line += Rinex_Printer::rightJustify(boost::lexical_cast(utc_model.i_WN_T + 1024), 5); // valid until 2019
+ line += Rinex_Printer::rightJustify(std::to_string(utc_model.d_t_OT), 7);
+ line += Rinex_Printer::rightJustify(std::to_string(utc_model.i_WN_T + 1024), 5); // valid until 2019
/* if ( SBAS )
{
line += string(1, ' ');
@@ -1399,16 +1399,16 @@ void Rinex_Printer::rinex_nav_header(std::fstream& out, const Gps_Iono& iono, co
// -------- Line 6 leap seconds
// For leap second information, see http://www.endruntechnologies.com/leap.htm
line.clear();
- line += Rinex_Printer::rightJustify(boost::lexical_cast(utc_model.d_DeltaT_LS), 6);
+ line += Rinex_Printer::rightJustify(std::to_string(utc_model.d_DeltaT_LS), 6);
if (version == 2)
{
line += std::string(54, ' ');
}
if (version == 3)
{
- line += Rinex_Printer::rightJustify(boost::lexical_cast(utc_model.d_DeltaT_LSF), 6);
- line += Rinex_Printer::rightJustify(boost::lexical_cast(utc_model.i_WN_LSF), 6);
- line += Rinex_Printer::rightJustify(boost::lexical_cast(utc_model.i_DN), 6);
+ line += Rinex_Printer::rightJustify(std::to_string(utc_model.d_DeltaT_LSF), 6);
+ line += Rinex_Printer::rightJustify(std::to_string(utc_model.i_WN_LSF), 6);
+ line += Rinex_Printer::rightJustify(std::to_string(utc_model.i_DN), 6);
line += std::string(36, ' ');
}
line += Rinex_Printer::leftJustify("LEAP SECONDS", 20);
@@ -1612,38 +1612,38 @@ void Rinex_Printer::rinex_nav_header(std::fstream& out, const Beidou_Dnav_Iono&
// -------- Line ionospheric info 1, only version 3 supported
line.clear();
line += std::string("BDSA");
- line += std::string(1, ' ');
- line += Rinex_Printer::rightJustify(Rinex_Printer::doub2for(iono.d_alpha0, 10, 2), 12);
- line += Rinex_Printer::rightJustify(Rinex_Printer::doub2for(iono.d_alpha1, 10, 2), 12);
- line += Rinex_Printer::rightJustify(Rinex_Printer::doub2for(iono.d_alpha2, 10, 2), 12);
- line += Rinex_Printer::rightJustify(Rinex_Printer::doub2for(iono.d_alpha3, 10, 2), 12);
- line += std::string(7, ' ');
- line += Rinex_Printer::leftJustify("IONOSPHERIC CORR", 20);
+ line += std::string(1, ' ');
+ line += Rinex_Printer::rightJustify(Rinex_Printer::doub2for(iono.d_alpha0, 10, 2), 12);
+ line += Rinex_Printer::rightJustify(Rinex_Printer::doub2for(iono.d_alpha1, 10, 2), 12);
+ line += Rinex_Printer::rightJustify(Rinex_Printer::doub2for(iono.d_alpha2, 10, 2), 12);
+ line += Rinex_Printer::rightJustify(Rinex_Printer::doub2for(iono.d_alpha3, 10, 2), 12);
+ line += std::string(7, ' ');
+ line += Rinex_Printer::leftJustify("IONOSPHERIC CORR", 20);
Rinex_Printer::lengthCheck(line);
out << line << std::endl;
// -------- Line ionospheric info 2
line.clear();
- line += std::string("BDSB");
- line += std::string(1, ' ');
- line += Rinex_Printer::rightJustify(Rinex_Printer::doub2for(iono.d_beta0, 10, 2), 12);
- line += Rinex_Printer::rightJustify(Rinex_Printer::doub2for(iono.d_beta1, 10, 2), 12);
- line += Rinex_Printer::rightJustify(Rinex_Printer::doub2for(iono.d_beta2, 10, 2), 12);
- line += Rinex_Printer::rightJustify(Rinex_Printer::doub2for(iono.d_beta3, 10, 2), 12);
- line += std::string(7, ' ');
- line += Rinex_Printer::leftJustify("IONOSPHERIC CORR", 20);
+ line += std::string("BDSB");
+ line += std::string(1, ' ');
+ line += Rinex_Printer::rightJustify(Rinex_Printer::doub2for(iono.d_beta0, 10, 2), 12);
+ line += Rinex_Printer::rightJustify(Rinex_Printer::doub2for(iono.d_beta1, 10, 2), 12);
+ line += Rinex_Printer::rightJustify(Rinex_Printer::doub2for(iono.d_beta2, 10, 2), 12);
+ line += Rinex_Printer::rightJustify(Rinex_Printer::doub2for(iono.d_beta3, 10, 2), 12);
+ line += std::string(7, ' ');
+ line += Rinex_Printer::leftJustify("IONOSPHERIC CORR", 20);
Rinex_Printer::lengthCheck(line);
out << line << std::endl;
// -------- Line 5 system time correction
line.clear();
- line += std::string("BDUT");
- line += Rinex_Printer::rightJustify(Rinex_Printer::doub2for(utc_model.d_A0_UTC, 16, 2), 18);
- line += Rinex_Printer::rightJustify(Rinex_Printer::doub2for(utc_model.d_A1_UTC, 15, 2), 16);
- line += std::string(22, ' ');
- line += Rinex_Printer::leftJustify("TIME SYSTEM CORR", 20);
+ line += std::string("BDUT");
+ line += Rinex_Printer::rightJustify(Rinex_Printer::doub2for(utc_model.d_A0_UTC, 16, 2), 18);
+ line += Rinex_Printer::rightJustify(Rinex_Printer::doub2for(utc_model.d_A1_UTC, 15, 2), 16);
+ line += std::string(22, ' ');
+ line += Rinex_Printer::leftJustify("TIME SYSTEM CORR", 20);
Rinex_Printer::lengthCheck(line);
out << line << std::endl;
@@ -1652,9 +1652,9 @@ void Rinex_Printer::rinex_nav_header(std::fstream& out, const Beidou_Dnav_Iono&
// For leap second information, see http://www.endruntechnologies.com/leap.htm
line.clear();
line += Rinex_Printer::rightJustify(boost::lexical_cast(utc_model.d_DeltaT_LS), 6);
- line += Rinex_Printer::rightJustify(boost::lexical_cast(utc_model.d_DeltaT_LSF), 6);
- line += Rinex_Printer::rightJustify(boost::lexical_cast(utc_model.i_WN_LSF), 6);
- line += Rinex_Printer::rightJustify(boost::lexical_cast(utc_model.i_DN), 6);
+ line += Rinex_Printer::rightJustify(boost::lexical_cast(utc_model.d_DeltaT_LSF), 6);
+ line += Rinex_Printer::rightJustify(std::to_string(utc_model.i_WN_LSF), 6);
+ line += Rinex_Printer::rightJustify(std::to_string(utc_model.i_DN), 6);
line += std::string(36, ' ');
line += Rinex_Printer::leftJustify("LEAP SECONDS", 20);
Rinex_Printer::lengthCheck(line);
@@ -2790,59 +2790,58 @@ void Rinex_Printer::update_nav_header(std::fstream& out, const Beidou_Dnav_Utc_M
{
line_aux.clear();
- if (line_str.find("BDSA", 0) != std::string::npos)
- {
- line_aux += std::string("GPSA");
- line_aux += std::string(1, ' ');
- line_aux += Rinex_Printer::rightJustify(Rinex_Printer::doub2for(iono.d_alpha0, 10, 2), 12);
- line_aux += Rinex_Printer::rightJustify(Rinex_Printer::doub2for(iono.d_alpha1, 10, 2), 12);
- line_aux += Rinex_Printer::rightJustify(Rinex_Printer::doub2for(iono.d_alpha2, 10, 2), 12);
- line_aux += Rinex_Printer::rightJustify(Rinex_Printer::doub2for(iono.d_alpha3, 10, 2), 12);
- line_aux += std::string(7, ' ');
- line_aux += Rinex_Printer::leftJustify("IONOSPHERIC CORR", 20);
- data.push_back(line_aux);
- }
- else if (line_str.find("BDSB", 0) != std::string::npos)
- {
- line_aux += std::string("GPSB");
- line_aux += std::string(1, ' ');
- line_aux += Rinex_Printer::rightJustify(Rinex_Printer::doub2for(iono.d_beta0, 10, 2), 12);
- line_aux += Rinex_Printer::rightJustify(Rinex_Printer::doub2for(iono.d_beta1, 10, 2), 12);
- line_aux += Rinex_Printer::rightJustify(Rinex_Printer::doub2for(iono.d_beta2, 10, 2), 12);
- line_aux += Rinex_Printer::rightJustify(Rinex_Printer::doub2for(iono.d_beta3, 10, 2), 12);
- line_aux += std::string(7, ' ');
- line_aux += Rinex_Printer::leftJustify("IONOSPHERIC CORR", 20);
- data.push_back(line_aux);
- }
- else if (line_str.find("BDUT", 0) != std::string::npos)
- {
- line_aux += std::string("GPUT");
- line_aux += Rinex_Printer::rightJustify(Rinex_Printer::doub2for(utc_model.d_A0_UTC, 16, 2), 18);
- line_aux += Rinex_Printer::rightJustify(Rinex_Printer::doub2for(utc_model.d_A1_UTC, 15, 2), 16);
- line_aux += std::string(22, ' ');
- line_aux += Rinex_Printer::leftJustify("TIME SYSTEM CORR", 20);
- data.push_back(line_aux);
- }
- else if (line_str.find("LEAP SECONDS", 59) != std::string::npos)
- {
- line_aux += Rinex_Printer::rightJustify(boost::lexical_cast(utc_model.d_DeltaT_LS), 6);
- line_aux += Rinex_Printer::rightJustify(boost::lexical_cast(utc_model.d_DeltaT_LSF), 6);
- line_aux += Rinex_Printer::rightJustify(boost::lexical_cast(utc_model.i_WN_LSF), 6);
- line_aux += Rinex_Printer::rightJustify(boost::lexical_cast(utc_model.i_DN), 6);
- line_aux += std::string(36, ' ');
- line_aux += Rinex_Printer::leftJustify("LEAP SECONDS", 20);
- data.push_back(line_aux);
- }
- else if (line_str.find("END OF HEADER", 59) != std::string::npos)
- {
- data.push_back(line_str);
- no_more_finds = true;
- }
- else
- {
- data.push_back(line_str);
- }
-
+ if (line_str.find("BDSA", 0) != std::string::npos)
+ {
+ line_aux += std::string("GPSA");
+ line_aux += std::string(1, ' ');
+ line_aux += Rinex_Printer::rightJustify(Rinex_Printer::doub2for(iono.d_alpha0, 10, 2), 12);
+ line_aux += Rinex_Printer::rightJustify(Rinex_Printer::doub2for(iono.d_alpha1, 10, 2), 12);
+ line_aux += Rinex_Printer::rightJustify(Rinex_Printer::doub2for(iono.d_alpha2, 10, 2), 12);
+ line_aux += Rinex_Printer::rightJustify(Rinex_Printer::doub2for(iono.d_alpha3, 10, 2), 12);
+ line_aux += std::string(7, ' ');
+ line_aux += Rinex_Printer::leftJustify("IONOSPHERIC CORR", 20);
+ data.push_back(line_aux);
+ }
+ else if (line_str.find("BDSB", 0) != std::string::npos)
+ {
+ line_aux += std::string("GPSB");
+ line_aux += std::string(1, ' ');
+ line_aux += Rinex_Printer::rightJustify(Rinex_Printer::doub2for(iono.d_beta0, 10, 2), 12);
+ line_aux += Rinex_Printer::rightJustify(Rinex_Printer::doub2for(iono.d_beta1, 10, 2), 12);
+ line_aux += Rinex_Printer::rightJustify(Rinex_Printer::doub2for(iono.d_beta2, 10, 2), 12);
+ line_aux += Rinex_Printer::rightJustify(Rinex_Printer::doub2for(iono.d_beta3, 10, 2), 12);
+ line_aux += std::string(7, ' ');
+ line_aux += Rinex_Printer::leftJustify("IONOSPHERIC CORR", 20);
+ data.push_back(line_aux);
+ }
+ else if (line_str.find("BDUT", 0) != std::string::npos)
+ {
+ line_aux += std::string("GPUT");
+ line_aux += Rinex_Printer::rightJustify(Rinex_Printer::doub2for(utc_model.d_A0_UTC, 16, 2), 18);
+ line_aux += Rinex_Printer::rightJustify(Rinex_Printer::doub2for(utc_model.d_A1_UTC, 15, 2), 16);
+ line_aux += std::string(22, ' ');
+ line_aux += Rinex_Printer::leftJustify("TIME SYSTEM CORR", 20);
+ data.push_back(line_aux);
+ }
+ else if (line_str.find("LEAP SECONDS", 59) != std::string::npos)
+ {
+ line_aux += Rinex_Printer::rightJustify(boost::lexical_cast(utc_model.d_DeltaT_LS), 6);
+ line_aux += Rinex_Printer::rightJustify(boost::lexical_cast(utc_model.d_DeltaT_LSF), 6);
+ line_aux += Rinex_Printer::rightJustify(std::to_string(utc_model.i_WN_LSF), 6);
+ line_aux += Rinex_Printer::rightJustify(std::to_string(utc_model.i_DN), 6);
+ line_aux += std::string(36, ' ');
+ line_aux += Rinex_Printer::leftJustify("LEAP SECONDS", 20);
+ data.push_back(line_aux);
+ }
+ else if (line_str.find("END OF HEADER", 59) != std::string::npos)
+ {
+ data.push_back(line_str);
+ no_more_finds = true;
+ }
+ else
+ {
+ data.push_back(line_str);
+ }
}
else
{
@@ -3755,7 +3754,7 @@ void Rinex_Printer::log_rinex_nav(std::fstream& out, const std::map::const_iterator bds_ephemeris_iter;
for (bds_ephemeris_iter = eph_map.cbegin();
- bds_ephemeris_iter != eph_map.cend();
+ bds_ephemeris_iter != eph_map.cend();
bds_ephemeris_iter++)
{
// -------- SV / EPOCH / SV CLK
@@ -3767,28 +3766,28 @@ void Rinex_Printer::log_rinex_nav(std::fstream& out, const std::mapsecond.i_satellite_PRN < 10) line += std::string("0");
- line += boost::lexical_cast(bds_ephemeris_iter->second.i_satellite_PRN);
- std::string year(timestring, 0, 4);
- line += std::string(1, ' ');
- line += year;
- line += std::string(1, ' ');
- line += month;
- line += std::string(1, ' ');
- line += day;
- line += std::string(1, ' ');
- line += hour;
- line += std::string(1, ' ');
- line += minutes;
- line += std::string(1, ' ');
- line += seconds;
- line += std::string(1, ' ');
- line += Rinex_Printer::doub2for(bds_ephemeris_iter->second.d_A_f0, 18, 2);
- line += std::string(1, ' ');
- line += Rinex_Printer::doub2for(bds_ephemeris_iter->second.d_A_f1, 18, 2);
- line += std::string(1, ' ');
- line += Rinex_Printer::doub2for(bds_ephemeris_iter->second.d_A_f2, 18, 2);
+ line += satelliteSystem["Beidou"];
+ if (bds_ephemeris_iter->second.i_satellite_PRN < 10) line += std::string("0");
+ line += std::to_string(bds_ephemeris_iter->second.i_satellite_PRN);
+ std::string year(timestring, 0, 4);
+ line += std::string(1, ' ');
+ line += year;
+ line += std::string(1, ' ');
+ line += month;
+ line += std::string(1, ' ');
+ line += day;
+ line += std::string(1, ' ');
+ line += hour;
+ line += std::string(1, ' ');
+ line += minutes;
+ line += std::string(1, ' ');
+ line += seconds;
+ line += std::string(1, ' ');
+ line += Rinex_Printer::doub2for(bds_ephemeris_iter->second.d_A_f0, 18, 2);
+ line += std::string(1, ' ');
+ line += Rinex_Printer::doub2for(bds_ephemeris_iter->second.d_A_f1, 18, 2);
+ line += std::string(1, ' ');
+ line += Rinex_Printer::doub2for(bds_ephemeris_iter->second.d_A_f2, 18, 2);
Rinex_Printer::lengthCheck(line);
out << line << std::endl;
@@ -3851,7 +3850,7 @@ void Rinex_Printer::log_rinex_nav(std::fstream& out, const std::map(bds_ephemeris_iter->second.i_BEIDOU_week);
+ auto BDS_week_continuous_number = static_cast(bds_ephemeris_iter->second.i_BEIDOU_week);
line += Rinex_Printer::doub2for(BDS_week_continuous_number, 18, 2);
line += std::string(1, ' ');
line += std::string(18, ' '); // spare
@@ -7201,7 +7200,7 @@ void Rinex_Printer::rinex_obs_header(std::fstream& out, const Gps_Ephemeris& gps
}
-void Rinex_Printer::rinex_obs_header(std::fstream& out, const Beidou_Dnav_Ephemeris& eph, const double d_TOW_first_observation, const std::string bands)
+void Rinex_Printer::rinex_obs_header(std::fstream& out, const Beidou_Dnav_Ephemeris& eph, const double d_TOW_first_observation, const std::string& bands)
{
std::string line;
version = 3;
@@ -7658,27 +7657,26 @@ void Rinex_Printer::update_obs_header(std::fstream& out, const Beidou_Dnav_Utc_M
{
line_aux.clear();
- if (line_str.find("TIME OF FIRST OBS", 59) != std::string::npos)
- {
- data.push_back(line_str);
- line_aux += Rinex_Printer::rightJustify(boost::lexical_cast(utc_model.d_DeltaT_LS), 6);
- line_aux += Rinex_Printer::rightJustify(boost::lexical_cast(utc_model.d_DeltaT_LSF), 6);
- line_aux += Rinex_Printer::rightJustify(boost::lexical_cast(utc_model.i_WN_LSF), 6);
- line_aux += Rinex_Printer::rightJustify(boost::lexical_cast(utc_model.i_DN), 6);
- line_aux += std::string(36, ' ');
- line_aux += Rinex_Printer::leftJustify("LEAP SECONDS", 20);
- data.push_back(line_aux);
- }
- else if (line_str.find("END OF HEADER", 59) != std::string::npos)
- {
- data.push_back(line_str);
- no_more_finds = true;
- }
- else
- {
- data.push_back(line_str);
- }
-
+ if (line_str.find("TIME OF FIRST OBS", 59) != std::string::npos)
+ {
+ data.push_back(line_str);
+ line_aux += Rinex_Printer::rightJustify(boost::lexical_cast(utc_model.d_DeltaT_LS), 6);
+ line_aux += Rinex_Printer::rightJustify(boost::lexical_cast(utc_model.d_DeltaT_LSF), 6);
+ line_aux += Rinex_Printer::rightJustify(std::to_string(utc_model.i_WN_LSF), 6);
+ line_aux += Rinex_Printer::rightJustify(std::to_string(utc_model.i_DN), 6);
+ line_aux += std::string(36, ' ');
+ line_aux += Rinex_Printer::leftJustify("LEAP SECONDS", 20);
+ data.push_back(line_aux);
+ }
+ else if (line_str.find("END OF HEADER", 59) != std::string::npos)
+ {
+ data.push_back(line_str);
+ no_more_finds = true;
+ }
+ else
+ {
+ data.push_back(line_str);
+ }
}
else
{
@@ -10409,7 +10407,7 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_ep
}
-void Rinex_Printer::log_rinex_obs(std::fstream& out, const Beidou_Dnav_Ephemeris& eph, double obs_time, const std::map& observables, const std::string bds_bands)
+void Rinex_Printer::log_rinex_obs(std::fstream& out, const Beidou_Dnav_Ephemeris& eph, double obs_time, const std::map& observables, const std::string& bds_bands)
{
std::string line;
@@ -10520,7 +10518,7 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Beidou_Dnav_Ephemeris
}
int32_t numSatellitesObserved = available_prns.size();
- line += Rinex_Printer::rightJustify(boost::lexical_cast(numSatellitesObserved), 3);
+ line += Rinex_Printer::rightJustify(std::to_string(numSatellitesObserved), 3);
// Receiver clock offset (optional)
//line += rightJustify(asString(clockOffset, 12), 15);
line += std::string(80 - line.size(), ' ');
@@ -10536,9 +10534,9 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Beidou_Dnav_Ephemeris
lineObs.clear();
lineObs += satelliteSystem["Beidou"];
if (static_cast(*it) < 10) lineObs += std::string(1, '0');
- lineObs += boost::lexical_cast(static_cast(*it));
+ lineObs += std::to_string(static_cast(*it));
ret = total_map.equal_range(*it);
- for (std::multimap::iterator iter = ret.first; iter != ret.second; ++iter)
+ for (auto iter = ret.first; iter != ret.second; ++iter)
{
lineObs += Rinex_Printer::rightJustify(asString(iter->second.Pseudorange_m, 3), 14);
diff --git a/src/algorithms/PVT/libs/rinex_printer.h b/src/algorithms/PVT/libs/rinex_printer.h
index cfdcf86a8..b5ea3357d 100644
--- a/src/algorithms/PVT/libs/rinex_printer.h
+++ b/src/algorithms/PVT/libs/rinex_printer.h
@@ -51,21 +51,19 @@
#ifndef GNSS_SDR_RINEX_PRINTER_H_
#define GNSS_SDR_RINEX_PRINTER_H_
-#include "gps_navigation_message.h"
-#include "gps_cnav_navigation_message.h"
-#include "galileo_navigation_message.h"
-#include "glonass_gnav_navigation_message.h"
-#include "beidou_dnav_navigation_message.h"
+#include "Beidou_B1I.h"
+#include "GLONASS_L1_L2_CA.h"
#include "GPS_L1_CA.h"
#include "Galileo_E1.h"
-#include "GLONASS_L1_L2_CA.h"
-#include "Beidou_B1I.h"
+#include "beidou_dnav_navigation_message.h"
+#include "galileo_navigation_message.h"
+#include "glonass_gnav_navigation_message.h"
#include "gnss_synchro.h"
+#include "gps_cnav_navigation_message.h"
+#include "gps_navigation_message.h"
#include
#include
-#include
#include
-#include // for stringstream
#include // for setprecision
#include