mirror
/
stratux
kopia lustrzana https://github.com/cyoung/stratux
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

only differentiate between ICAO/non-ICAO ID Types to correctly merge traffic from SDRs and NMEA

pull/827/merge^2
Adrian Batzill 2021-02-26 15:50:58 +01:00
rodzic 606e737736
commit 73d6a77c6a
1 zmienionych plików z 7 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

12
main/flarm-nmea.go
Wyświetl plik

@ -721,6 +721,11 @@ func parseFlarmPFLAA(message []string) {
ognID, tail, address := getIdTail(message[6]) ognID, tail, address := getIdTail(message[6])
idType, _ := strconv.ParseInt(message[5], 10, 8) idType, _ := strconv.ParseInt(message[5], 10, 8)
if idType == 1 {
idType = 0; // ICAO ID
} else {
idType = 1; // non-ICAO ID
}
track := atof32(message[7]) track := atof32(message[7])
turn := atof32(message[8]) turn := atof32(message[8])
@ -747,11 +752,8 @@ func parseFlarmPFLAA(message []string) {
ti.Icao_addr = address ti.Icao_addr = address
// idType 1=ICAO, 2=Flarm ID, 3=anonymous ID. 0 is valid but not documented. // idType 1=ICAO, 2=Flarm ID, 3=anonymous ID. 0 is valid but not documented.
// For us: 0=ICAO, 1=Non ICAO // For us: 0=ICAO, 1=Non ICAO
if idType == 1 { ti.Addr_type = uint8(idType)
ti.Addr_type = 0
} else {
ti.Addr_type = 1
}
if len(ti.Tail) <= 3 { if len(ti.Tail) <= 3 {
if len(tail) != 0 { if len(tail) != 0 {
// Tail provided via NMEA (IDIDID!TAIL syntax) // Tail provided via NMEA (IDIDID!TAIL syntax)