MS0NTR-Radio-Club
/
dump1090-fa
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix stratux output timestamps to really be UTC as they claim

This commit is contained in:
Oliver Jowett 2020-09-08 23:35:17 +08:00
parent 7356676c5b
commit 303dcc9915
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
net_io.c
View File

@ -794,8 +794,6 @@ static void send_sbs_heartbeat(struct net_service *service)
#define STRATUX_MAX_PACKET_SIZE 1000 #define STRATUX_MAX_PACKET_SIZE 1000
static void modesSendStratuxOutput(struct modesMessage *mm, struct aircraft *a) { static void modesSendStratuxOutput(struct modesMessage *mm, struct aircraft *a) {
char *p; char *p;
struct timespec now;
struct tm stTime_receive, stTime_now;
// We require a tracked aircraft for Stratux output // We require a tracked aircraft for Stratux output
if (!a) if (!a)
@ -841,14 +839,6 @@ static void modesSendStratuxOutput(struct modesMessage *mm, struct aircraft *a)
mm->mesub, mm->mesub,
mm->signalLevel); // what precision and range is needed for RSSI? mm->signalLevel); // what precision and range is needed for RSSI?
// Find current system time
clock_gettime(CLOCK_REALTIME, &now);
gmtime_r(&now.tv_sec, &stTime_now); // we expect UTC
// Find message reception time
time_t received = (time_t) (mm->sysTimestampMsg / 1000);
localtime_r(&received, &stTime_receive);
//// callsign //// callsign
if (mm->callsign_valid) if (mm->callsign_valid)
p = safe_snprintf(p, end, "\"Tail\":\"%s\",", jsonEscapeString(mm->callsign)); p = safe_snprintf(p, end, "\"Tail\":\"%s\",", jsonEscapeString(mm->callsign));
@ -962,6 +952,9 @@ static void modesSendStratuxOutput(struct modesMessage *mm, struct aircraft *a)
p = safe_snprintf(p, end, "\"Emitter_category\":null,"); p = safe_snprintf(p, end, "\"Emitter_category\":null,");
// Time message received (based on system clock). Format is 2016-02-20T06:35:43.155Z // Time message received (based on system clock). Format is 2016-02-20T06:35:43.155Z
struct tm stTime_receive;
time_t received = (time_t) (mm->sysTimestampMsg / 1000);
gmtime_r(&received, &stTime_receive);
p = safe_snprintf(p, end, "\"Timestamp\":\"%04d-%02d-%02dT%02d:%02d:%02d.%03dZ\"", p = safe_snprintf(p, end, "\"Timestamp\":\"%04d-%02d-%02dT%02d:%02d:%02d.%03dZ\"",
(stTime_receive.tm_year+1900),(stTime_receive.tm_mon+1), (stTime_receive.tm_year+1900),(stTime_receive.tm_mon+1),
stTime_receive.tm_mday, stTime_receive.tm_hour, stTime_receive.tm_mday, stTime_receive.tm_hour,