add Galileo C/NAV type, and support for it to navdump
parent
85fc93bb03
commit
74db87012c
|
@ -546,6 +546,15 @@ try
|
|||
|
||||
cout<<endl;
|
||||
}
|
||||
else if(nmm.type() == NavMonMessage::GalileoCnavType) {
|
||||
basic_string<uint8_t> cnav((uint8_t*)nmm.gf().contents().c_str(), nmm.gf().contents().size());
|
||||
int sv = nmm.gc().gnsssv();
|
||||
if(!svfilter.check(2, sv, nmm.gc().sigid()))
|
||||
continue;
|
||||
etstamp();
|
||||
cout << "C/NAV for " << nmm.gf().gnssid()<<","<<nmm.gf().gnsssv()<<","<<nmm.gf().sigid() <<": "<< makeHexDump(cnav)<<endl;
|
||||
|
||||
}
|
||||
else if(nmm.type() == NavMonMessage::GalileoFnavType) {
|
||||
basic_string<uint8_t> fnav((uint8_t*)nmm.gf().contents().c_str(), nmm.gf().contents().size());
|
||||
int sv = nmm.gf().gnsssv();
|
||||
|
|
13
navmon.proto
13
navmon.proto
|
@ -18,7 +18,8 @@ message NavMonMessage {
|
|||
GPSCnavType = 14;
|
||||
RTCMMessageType = 15;
|
||||
TimeOffsetType = 16;
|
||||
GalileoFnavType = 17;
|
||||
GalileoFnavType = 17;
|
||||
GalileoCnavType = 18;
|
||||
}
|
||||
|
||||
required uint64 sourceID = 1;
|
||||
|
@ -46,6 +47,15 @@ message GalileoFnav {
|
|||
required bytes contents =5;
|
||||
required uint32 sigid = 6;
|
||||
}
|
||||
message GalileoCnav {
|
||||
required uint32 gnssWN =1;
|
||||
required uint32 gnssTOW =2; // INTEGERS!
|
||||
|
||||
required uint32 gnssID =3;
|
||||
required uint32 gnssSV =4;
|
||||
required bytes contents =5;
|
||||
required uint32 sigid = 6;
|
||||
}
|
||||
|
||||
message GPSInav {
|
||||
required uint32 gnssWN =1;
|
||||
|
@ -229,4 +239,5 @@ message GalileoFnav {
|
|||
optional RTCMMessage rm = 19;
|
||||
optional TimeOffsetMessage to = 20;
|
||||
optional GalileoFnav gf=21;
|
||||
optional GalileoCnav gc=22;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue