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

VK1ET : Decode mode ASCII hex input message types

Browse source 
Modifications entirely base on code supplied by John VK1ET.

Supports additional AVR raw ASCII input message stream types
This commit is contained in:
Malcolm Robb 2013-04-24 20:46:59 +01:00
parent a04e399d7e
commit 3dbc0efffc
1 changed files with 50 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
dump1090.c
View file

@ -2962,24 +2962,50 @@ int decodeHexMessage(struct client *c) {
unsigned char msg[MODES_LONG_MSG_BYTES]; unsigned char msg[MODES_LONG_MSG_BYTES];
struct modesMessage mm; struct modesMessage mm;
/* Remove spaces on the left and on the right. */ // Always mark the timestamp as invalid for packets received over the internet
// Mixing of data from two or more different receivers and publishing
// as coming from one would lead to corrupt mlat data
// Non timemarked internet data has indeterminate delay
mm.timestampMsg = -1;
mm.signalLevel = -1;
// Remove spaces on the left and on the right
while(l && isspace(hex[l-1])) { while(l && isspace(hex[l-1])) {
hex[l-1] = '\0'; hex[l-1] = '\0'; l--;
l--;
} }
while(isspace(*hex)) { while(isspace(*hex)) {
hex++; hex++; l--;
l--;
} }
/* Turn the message into binary. */ // Turn the message into binary.
if (l < 2 || (hex[0] != '*' && hex[0] != '@') || hex[l-1] != ';') return 0; // Accept *-AVR raw @-AVR/BEAST timeS+raw %-AVR timeS+raw (CRC good) <-BEAST timeS+sigL+raw
if (hex[0] == '@') { // and some AVR recorer that we can understand
hex += 13; l -= 15; // Skip @, and timestamp, and ; if (hex[l-1] != ';') {return (0);} // not complete - abort
} else {
switch(hex[0]) {
case '<': {
mm.signalLevel = (hexDigitVal(hex[13])<<4) | hexDigitVal(hex[14]);
hex += 15; l -= 16; // Skip <, timestamp and siglevel, and ;
break;}
case '@':
case '%':
case '#':
case '$': {
hex += 13; l -= 14; // Skip @,%,#,$, and timestamp, and ;
break;}
case '*':
case ':': {
hex++; l-=2; // Skip * and ; hex++; l-=2; // Skip * and ;
break;}
default: {
return (0); // We don't know what this is, so abort
break;}
} }
if (l > MODES_LONG_MSG_BYTES*2) return 0; /* Too long message... broken. */
if ( (l < 4) || (l > MODES_LONG_MSG_BYTES*2) ) return (0); // Too short or long message... broken
for (j = 0; j < l; j += 2) { for (j = 0; j < l; j += 2) {
int high = hexDigitVal(hex[j]); int high = hexDigitVal(hex[j]);
int low = hexDigitVal(hex[j+1]); int low = hexDigitVal(hex[j+1]);
@ -2987,15 +3013,12 @@ int decodeHexMessage(struct client *c) {
if (high == -1 || low == -1) return 0; if (high == -1 || low == -1) return 0;
msg[j/2] = (high<<4) | low; msg[j/2] = (high<<4) | low;
} }
// Always mark the timestamp as invalid for packets received over the internet
// Mixing of data from two or more different receivers and publishing if (l < 5) {decodeModeAMessage((uint)((msg[0]<<8) + msg[1]), &mm);} // ModeA or ModeC
// as coming from one would lead to corrupt mlat data else {decodeModesMessage(&mm, msg);}
// Non timemarked internet data has indeterminate delay
mm.timestampMsg = -1;
mm.signalLevel = -1;
decodeModesMessage(&mm,msg);
useModesMessage(&mm); useModesMessage(&mm);
return 0; return (0);
} }
/* Return a description of planes in json. */ /* Return a description of planes in json. */