AFG/dump1090
3
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Include mlatFlags in aircraft.json.

Browse source 
This requires expanding the line-buffer margin too as we can produce lines >256 chars now.
This commit is contained in:
Oliver Jowett 2015-06-29 10:46:37 +01:00
parent b793f83a29
commit 51b5f4af24
1 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
net_io.c
View file

@ -915,6 +915,28 @@ char *generateAircraftJson(const char *url_path, int *len) {
p += snprintf(p, end-p, ",\"speed\":%d", a->speed); p += snprintf(p, end-p, ",\"speed\":%d", a->speed);
if (a->bFlags & MODES_ACFLAGS_CATEGORY_VALID) if (a->bFlags & MODES_ACFLAGS_CATEGORY_VALID)
p += snprintf(p, end-p, ",\"category\":\"%02X\"", a->category); p += snprintf(p, end-p, ",\"category\":\"%02X\"", a->category);
if (a->mlatFlags) {
p += snprintf(p, end-p, ",\"mlat\":[");
if (a->mlatFlags & MODES_ACFLAGS_SQUAWK_VALID)
p += snprintf(p, end-p, "\"squawk\",");
if (a->mlatFlags & MODES_ACFLAGS_CALLSIGN_VALID)
p += snprintf(p, end-p, "\"callsign\",");
if (a->mlatFlags & MODES_ACFLAGS_LATLON_VALID)
p += snprintf(p, end-p, "\"lat\",\"lon\",");
if (a->mlatFlags & MODES_ACFLAGS_ALTITUDE_VALID)
p += snprintf(p, end-p, "\"altitude\",");
if (a->mlatFlags & MODES_ACFLAGS_HEADING_VALID)
p += snprintf(p, end-p, "\"track\",");
if (a->mlatFlags & MODES_ACFLAGS_SPEED_VALID)
p += snprintf(p, end-p, "\"speed\",");
if (a->mlatFlags & MODES_ACFLAGS_VERTRATE_VALID)
p += snprintf(p, end-p, "\"vert_rate\",");
if (a->mlatFlags & MODES_ACFLAGS_CATEGORY_VALID)
p += snprintf(p, end-p, "\"category\",");
if (p[-1] != '[')
--p;
p += snprintf(p, end-p, "]");
}
p += snprintf(p, end-p, ",\"messages\":%ld,\"seen\":%.1f,\"rssi\":%.1f}", p += snprintf(p, end-p, ",\"messages\":%ld,\"seen\":%.1f,\"rssi\":%.1f}",
a->messages, (now - a->seen)/1000.0, a->messages, (now - a->seen)/1000.0,
@ -922,7 +944,7 @@ char *generateAircraftJson(const char *url_path, int *len) {
a->signalLevel[4] + a->signalLevel[5] + a->signalLevel[6] + a->signalLevel[7] + 1e-5) / 8)); a->signalLevel[4] + a->signalLevel[5] + a->signalLevel[6] + a->signalLevel[7] + 1e-5) / 8));
// If we're getting near the end of the buffer, expand it. // If we're getting near the end of the buffer, expand it.
if ((end - p) < 256) { if ((end - p) < 512) {
int used = p - buf; int used = p - buf;
buflen *= 2; buflen *= 2;
buf = (char *) realloc(buf, buflen); buf = (char *) realloc(buf, buflen);