spacecruft
/
galmon
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add beidou specifics to sv.json output

pull/28/head
bert hubert 2019-10-20 20:34:06 +02:00
parent 8218ee6ae4
commit 9f03e4de5c
2 changed files with 49 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
beidou.hh
View File

@ -72,7 +72,7 @@ struct BeidouMessage
int wn{-1}, a0, a1, a2;
// 2^17 2^30
uint32_t getT0c()
uint32_t getT0c() const
{
return 8 * t0c;
}

61
navparse.cc
View File

@ -916,29 +916,64 @@ try
ret["a1"] = s.a1;
ret["a0g"] = s.a0g;
ret["a1g"] = s.a1g;
ret["sf1"] = s.sf1;
ret["sf2"] = s.sf2;
ret["sf3"] = s.sf3;
ret["sf4"] = s.sf4;
ret["sf5"] = s.sf5;
if(id.gnss == 2) {
ret["sf1"] = s.sf1;
ret["sf2"] = s.sf2;
ret["sf3"] = s.sf3;
ret["sf4"] = s.sf4;
ret["sf5"] = s.sf5;
ret["BGDE1E5a"] = s.BGDE1E5a;
ret["BGDE1E5b"] = s.BGDE1E5b;
ret["e5bdvs"]=s.e5bdvs;
ret["e1bdvs"]=s.e1bdvs;
ret["e5bhs"]=s.e5bhs;
ret["e1bhs"]=s.e1bhs;
}
ret["ai0"] = s.ai0;
ret["ai1"] = s.ai1;
ret["ai2"] = s.ai2;
ret["BGDE1E5a"] = s.BGDE1E5a;
ret["BGDE1E5b"] = s.BGDE1E5b;
ret["wn"] = s.wn;
ret["tow"] = s.tow;
ret["dtLS"] = s.dtLS;
ret["dtLSF"] = s.dtLSF;
ret["wnLSF"] = s.wnLSF;
ret["dn"] = s.dn;
ret["e5bdvs"]=s.e5bdvs;
ret["e1bdvs"]=s.e1bdvs;
ret["e5bhs"]=s.e5bhs;
ret["e1bhs"]=s.e1bhs;
if(svstats[id].completeIOD()) {
if(id.gnss == 3 && svstats[id].oldBeidouMessage.sow >= 0 && svstats[id].oldBeidouMessage.sqrtA != 0) {
const auto& iod = svstats[id].oldBeidouMessage;
ret["e"] = iod.getE();
ret["omega"] = iod.getOmega();
ret["sqrtA"]= iod.getSqrtA();
ret["M0"] = iod.getM0();
ret["i0"] = iod.getI0();
ret["delta-n"] = iod.getDeltan();
ret["omega-dot"] = iod.getOmegadot();
ret["omega0"] = iod.getOmega0();
ret["idot"] = iod.getIdot();
ret["t0e"] = iod.getT0e();
ret["t0c"] = iod.getT0c();
ret["cuc"] = iod.getCuc();
ret["cus"] = iod.getCus();
ret["crc"] = iod.getCrc();
ret["crs"] = iod.getCrs();
ret["cic"] = iod.getCic();
ret["cis"] = iod.getCis();
// ret["sisa"] = iod.sisa;
ret["af0"] = iod.a0;
ret["af1"] = iod.a1;
ret["af2"] = iod.a2;
Point p;
getCoordinates(s.tow, iod, &p);
ret["x"] = p.x;
ret["y"] = p.y;
ret["z"] = p.z;
auto longlat = getLongLat(p.x, p.y, p.z);
ret["longitude"] = 180.0*longlat.first/M_PI;
ret["latitude"] = 180.0*longlat.second/M_PI;
}
else if(svstats[id].completeIOD()) {
const auto& iod = svstats[id].liveIOD();
ret["iod"]= svstats[id].getIOD();
ret["e"] = iod.getE();