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

Distinguish "unknown format" from "didn't even try to decode" 

when decoding Comm-B messages
This commit is contained in:
Oliver Jowett 2021-07-29 19:04:51 +08:00
parent 9f146fcb71
commit c148fdca84
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
comm_b.c
View File

@ -47,12 +47,11 @@ static CommBDecoderFn comm_b_decoders[] = {
void decodeCommB(struct modesMessage *mm) void decodeCommB(struct modesMessage *mm)
{ {
mm->commb_format = COMMB_UNKNOWN;
// If DR or UM are set, this message is _probably_ noise // If DR or UM are set, this message is _probably_ noise
// as nothing really seems to use the multisite broadcast stuff? // as nothing really seems to use the multisite broadcast stuff?
// Also skip anything that had errors corrected // Also skip anything that had errors corrected
if (mm->DR != 0 || mm->UM != 0 || mm->correctedbits > 0) { if (mm->DR != 0 || mm->UM != 0 || mm->correctedbits > 0) {
mm->commb_format = COMMB_NOT_DECODED;
return; return;
} }
@ -79,6 +78,8 @@ void decodeCommB(struct modesMessage *mm)
// decode it // decode it
bestDecoder(mm, true); bestDecoder(mm, true);
} }
} else {
mm->commb_format = COMMB_UNKNOWN;
} }
} }

1
dump1090.h
View File

@ -202,6 +202,7 @@ typedef enum {
typedef enum { typedef enum {
COMMB_UNKNOWN, COMMB_UNKNOWN,
COMMB_AMBIGUOUS, COMMB_AMBIGUOUS,
COMMB_NOT_DECODED,
COMMB_EMPTY_RESPONSE, COMMB_EMPTY_RESPONSE,
COMMB_DATALINK_CAPS, COMMB_DATALINK_CAPS,
COMMB_GICB_CAPS, COMMB_GICB_CAPS,

2
mode_s.c
View File

@ -1681,6 +1681,8 @@ static const char *commb_format_to_string(commb_format_t format) {
return "empty response"; return "empty response";
case COMMB_AMBIGUOUS: case COMMB_AMBIGUOUS:
return "ambiguous format"; return "ambiguous format";
case COMMB_NOT_DECODED:
return "not decoded";
case COMMB_DATALINK_CAPS: case COMMB_DATALINK_CAPS:
return "BDS1,0 Datalink capabilities"; return "BDS1,0 Datalink capabilities";
case COMMB_GICB_CAPS: case COMMB_GICB_CAPS: