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

Merge pull request #116 from jeffpc/serial-log 

ubxtool: use the serial number from the stream itself if present
pull/117/head
bert hubert 2020-04-28 18:12:07 +02:00 committed by GitHub
parent 0a62524395 eed5c6d5ab
commit 39ebc1ab90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ubxtool.cc
View File

@ -402,6 +402,14 @@ int initFD(const char* fname, bool doRTSCTS)
}
static string format_serial(basic_string<uint8_t> payload)
{
return fmt::sprintf("%02x%02x%02x%02x%02x",
payload[4], payload[5],
payload[6], payload[7],
payload[8]);
}
// ubxtool device srcid
int main(int argc, char** argv)
{
@ -568,12 +576,7 @@ int main(int argc, char** argv)
if (doDEBUG) { cerr<<humanTimeNow()<<" Sending serial number query"<<endl; }
msg = buildUbxMessage(0x27, 0x03, {}); // UBX-SEC-UNIQID
um1=sendAndWaitForUBX(fd, 1, msg, 0x27, 0x03); // ask for serial
serialno = fmt::sprintf("%02x%02x%02x%02x%02x",
um1.getPayload()[4],
um1.getPayload()[5],
um1.getPayload()[6],
um1.getPayload()[7],
um1.getPayload()[8]);
serialno = format_serial(um1.getPayload());
cerr<<humanTimeNow()<<" Serial number "<< serialno <<endl;
@ -971,6 +974,12 @@ int main(int argc, char** argv)
ns.emitNMM( nmm);
}
}
if(msg.getClass() == 0x27 && msg.getType() == 0x03) { // serial
serialno = format_serial(payload);
cerr<<humanTimeNow()<<" Serial number from stream "<< serialno <<endl;
}
if(msg.getClass() == 0x02 && msg.getType() == 0x15) { // RAWX, the doppler stuff