1
0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-09-28 15:08:51 +00:00

Merge branch 'next' of https://github.com/gnss-sdr/gnss-sdr into next

This commit is contained in:
Carles Fernandez 2019-11-08 14:26:00 +01:00
commit f6fe26fb4b
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D

View File

@ -28,7 +28,6 @@
* ------------------------------------------------------------------------- * -------------------------------------------------------------------------
*/ */
#include "rtklib_pvt_gs.h"
#include "MATH_CONSTANTS.h" #include "MATH_CONSTANTS.h"
#include "beidou_dnav_almanac.h" #include "beidou_dnav_almanac.h"
#include "beidou_dnav_ephemeris.h" #include "beidou_dnav_ephemeris.h"
@ -61,6 +60,7 @@
#include "pvt_conf.h" #include "pvt_conf.h"
#include "rinex_printer.h" #include "rinex_printer.h"
#include "rtcm_printer.h" #include "rtcm_printer.h"
#include "rtklib_pvt_gs.h"
#include "rtklib_solver.h" #include "rtklib_solver.h"
#include <boost/any.hpp> // for any_cast, any #include <boost/any.hpp> // for any_cast, any
#include <boost/archive/xml_iarchive.hpp> // for xml_iarchive #include <boost/archive/xml_iarchive.hpp> // for xml_iarchive
@ -1813,37 +1813,37 @@ void rtklib_pvt_gs::apply_rx_clock_offset(std::map<int, Gnss_Synchro>& observabl
switch (mapStringValues_[observables_iter->second.Signal]) switch (mapStringValues_[observables_iter->second.Signal])
{ {
case evGPS_1C: case evGPS_1C:
observables_iter->second.Carrier_phase_rads -= rx_clock_offset_s * FREQ1; observables_iter->second.Carrier_phase_rads -= rx_clock_offset_s * FREQ1 * PI_2;
break; break;
case evGPS_L5: case evGPS_L5:
observables_iter->second.Carrier_phase_rads -= rx_clock_offset_s * FREQ5; observables_iter->second.Carrier_phase_rads -= rx_clock_offset_s * FREQ5 * PI_2;
break; break;
case evSBAS_1C: case evSBAS_1C:
observables_iter->second.Carrier_phase_rads -= rx_clock_offset_s * FREQ1; observables_iter->second.Carrier_phase_rads -= rx_clock_offset_s * FREQ1 * PI_2;
break; break;
case evGAL_1B: case evGAL_1B:
observables_iter->second.Carrier_phase_rads -= rx_clock_offset_s * FREQ1; observables_iter->second.Carrier_phase_rads -= rx_clock_offset_s * FREQ1 * PI_2;
break; break;
case evGAL_5X: case evGAL_5X:
observables_iter->second.Carrier_phase_rads -= rx_clock_offset_s * FREQ5; observables_iter->second.Carrier_phase_rads -= rx_clock_offset_s * FREQ5 * PI_2;
break; break;
case evGPS_2S: case evGPS_2S:
observables_iter->second.Carrier_phase_rads -= rx_clock_offset_s * FREQ2; observables_iter->second.Carrier_phase_rads -= rx_clock_offset_s * FREQ2 * PI_2;
break; break;
case evBDS_B3: case evBDS_B3:
observables_iter->second.Carrier_phase_rads -= rx_clock_offset_s * FREQ3_BDS; observables_iter->second.Carrier_phase_rads -= rx_clock_offset_s * FREQ3_BDS * PI_2;
break; break;
case evGLO_1G: case evGLO_1G:
observables_iter->second.Carrier_phase_rads -= rx_clock_offset_s * FREQ1_GLO; observables_iter->second.Carrier_phase_rads -= rx_clock_offset_s * FREQ1_GLO * PI_2;
break; break;
case evGLO_2G: case evGLO_2G:
observables_iter->second.Carrier_phase_rads -= rx_clock_offset_s * FREQ2_GLO; observables_iter->second.Carrier_phase_rads -= rx_clock_offset_s * FREQ2_GLO * PI_2;
break; break;
case evBDS_B1: case evBDS_B1:
observables_iter->second.Carrier_phase_rads -= rx_clock_offset_s * FREQ1_BDS; observables_iter->second.Carrier_phase_rads -= rx_clock_offset_s * FREQ1_BDS * PI_2;
break; break;
case evBDS_B2: case evBDS_B2:
observables_iter->second.Carrier_phase_rads -= rx_clock_offset_s * FREQ2_BDS; observables_iter->second.Carrier_phase_rads -= rx_clock_offset_s * FREQ2_BDS * PI_2;
break; break;
default: default:
break; break;