kopia lustrzana https://github.com/sp9skp/spdxl
poprawki dla DFM
rodzic
026beede78
commit
4fdee04671
2
VER.txt
2
VER.txt
|
@ -1 +1 @@
|
|||
25092020a
|
||||
02112020a
|
|
@ -2682,9 +2682,9 @@ static void decodedfm6(const char rxb[], uint32_t rxb_len, uint32_t ip, uint32_t
|
|||
0UL, 0.0, sondeaprs_nofilter,typ,5,Vcc );
|
||||
|
||||
anonym->lastsent = osic_time();
|
||||
store_sonde_db(id+2,0,lat,lon,alt,vH,Dir,vV,typm,2,0,0.0,0,0.0,frq,Vcc,T,T1,0);
|
||||
store_sonde_rs(id+2,0,lat,lon,alt,vH,Dir,vV,typm,2,0,0.0,0,0.0,frq,Vcc,T,T1,0,usercall);
|
||||
if(saveLog) save_Slog(id+2,0,lat,lon,alt,vH,Dir,vV,typm,2,0,0.0,0,0.0,frq,Vcc,T,T1,0);
|
||||
store_sonde_db(id+2,frno,lat,lon,alt,vH,Dir,vV,typm,2,0,0.0,0,0.0,frq,Vcc,T,T1,0);
|
||||
store_sonde_rs(id+2,frno,lat,lon,alt,vH,Dir,vV,typm,2,0,0.0,0,0.0,frq,Vcc,T,T1,0,usercall);
|
||||
if(saveLog) save_Slog(id+2,frno,lat,lon,alt,vH,Dir,vV,typm,2,0,0.0,0,0.0,frq,Vcc,T,T1,0);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -3425,13 +3425,15 @@ int dat_out(uint8_t *dat_bits,uint32_t m) {
|
|||
ret=-2; // dane niepewne, więc oznaczamy jako bledne (z jednej ramki, nikomu korona nie spadnie a i tak czekamy na symbol sondy)
|
||||
}
|
||||
|
||||
if(chan[m].dfm6.newalt<1 || chan[m].dfm6.newalt >50000 || // gdy za duży błąd z usrednionych danych
|
||||
(fabs(chan[m].dfm6.prevlat-chan[m].dfm6.newlat)>0.1)||
|
||||
(fabs(chan[m].dfm6.prevlon-chan[m].dfm6.newlon)>0.1)||
|
||||
(abs(chan[m].dfm6.prevalt-chan[m].dfm6.newalt)>500))
|
||||
ret=-2; // dane bledne
|
||||
else
|
||||
ret = fr_id;
|
||||
if(chan[m].dfm6.newalt<1 || chan[m].dfm6.newalt >40000 || // gdy za duży błąd z usrednionych danych
|
||||
(fabs(chan[m].dfm6.prevlat-chan[m].dfm6.newlat)>0.05)||
|
||||
(fabs(chan[m].dfm6.prevlon-chan[m].dfm6.newlon)>0.05)||
|
||||
(abs(chan[m].dfm6.prevalt-chan[m].dfm6.newalt)>500)){
|
||||
ret=-2; // dane bledne
|
||||
chan[m].dfm6.sonde_typ = 0;
|
||||
}
|
||||
else
|
||||
ret = fr_id;
|
||||
|
||||
chan[m].dfm6.prevlat = (chan[m].dfm6.newlat + chan[m].dfm6.lat)/2; // usrednianie poprzednich i obecnych danych
|
||||
chan[m].dfm6.prevlon = (chan[m].dfm6.newlon + chan[m].dfm6.lon)/2;
|
||||
|
|
Ładowanie…
Reference in New Issue