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

bds b1i: quick fixes to b1i code, preparing for merge

Browse Source
This commit is contained in:
Damian Miralles
2018-11-28 14:18:35 -06:00
parent c20cd33038
commit 0507febd7f
5 changed files with 34 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/algorithms/libs/rtklib/rtklib_conversions.cc
View File

@@ -262,12 +262,12 @@ eph_t eph_to_rtklib(const Beidou_Dnav_Ephemeris& bei_eph)
rtklib_sat.tgd[2] = 0.0;
rtklib_sat.tgd[3] = 0.0;
rtklib_sat.toes = bei_eph.d_Toe;
rtklib_sat.toc = gpst2time(rtklib_sat.week, bei_eph.d_Toc);
rtklib_sat.ttr = gpst2time(rtklib_sat.week, bei_eph.d_TOW);
rtklib_sat.toc = bdt2time(rtklib_sat.week, bei_eph.d_Toc);
rtklib_sat.ttr = bdt2time(rtklib_sat.week, bei_eph.d_TOW);
/* adjustment for week handover */
double tow, toc;
tow = time2gpst(rtklib_sat.ttr, &rtklib_sat.week);
toc = time2gpst(rtklib_sat.toc, NULL);
tow = time2bdt(rtklib_sat.ttr, &rtklib_sat.week);
toc = time2bdt(rtklib_sat.toc, NULL);
if (rtklib_sat.toes < tow - 302400.0)
{
rtklib_sat.week++;
@@ -278,9 +278,9 @@ eph_t eph_to_rtklib(const Beidou_Dnav_Ephemeris& bei_eph)
rtklib_sat.week--;
tow += 604800.0;
}
rtklib_sat.toe = gpst2time(rtklib_sat.week, rtklib_sat.toes);
rtklib_sat.toc = gpst2time(rtklib_sat.week, toc);
rtklib_sat.ttr = gpst2time(rtklib_sat.week, tow);
rtklib_sat.toe = bdt2time(rtklib_sat.week, rtklib_sat.toes);
rtklib_sat.toc = bdt2time(rtklib_sat.week, toc);
rtklib_sat.ttr = bdt2time(rtklib_sat.week, tow);
return rtklib_sat;
}

12
src/algorithms/telemetry_decoder/libs/beidou_b1i_subframe_fsm.h
View File

@@ -33,12 +33,12 @@
#define GNSS_SDR_BEIDOU_B1I_SUBFRAME_FSM_H_
#include <boost/statechart/state_machine.hpp>
#include "../../../core/system_parameters/beidou_dnav_almanac.h"
#include "../../../core/system_parameters/beidou_dnav_ephemeris.h"
#include "../../../core/system_parameters/beidou_dnav_iono.h"
#include "../../../core/system_parameters/beidou_dnav_navigation_message.h"
#include "../../../core/system_parameters/beidou_dnav_utc_model.h"
#include "../../../core/system_parameters/Beidou_B1I.h"
#include "beidou_dnav_almanac.h"
#include "beidou_dnav_ephemeris.h"
#include "beidou_dnav_iono.h"
#include "beidou_dnav_navigation_message.h"
#include "beidou_dnav_utc_model.h"
#include "Beidou_B1I.h"
namespace sc = boost::statechart;
namespace mpl = boost::mpl;