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

dodane dekodowanie M10 z GPS Globaltop

pull/1/head
SP9SKP 2019-01-31 10:38:37 +01:00
rodzic 288910b840
commit 5e4f7909b0
2 zmienionych plików z 71 dodań i 30 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
VER.txt
Wyświetl plik

@ -1 +1 @@
29012019 31012019

43
src/sondeudp.c
Wyświetl plik

@ -1785,6 +1785,7 @@ static void decodeframe10(uint32_t m)
char ids[201]; char ids[201];
//char s[201+6]; //char s[201+6];
char s[400]; char s[400];
float fq555;
struct M10 * anonym; struct M10 * anonym;
struct CHAN * anonym0; /* call if set */ struct CHAN * anonym0; /* call if set */
{ /* with */ { /* with */
@ -1792,6 +1793,7 @@ static void decodeframe10(uint32_t m)
cs = (uint32_t)crcm10(99L, anonym->rxbuf, 101ul); cs = (uint32_t)crcm10(99L, anonym->rxbuf, 101ul);
if (cs==m10card(anonym->rxbuf, 101ul, 99L, 2L)) { if (cs==m10card(anonym->rxbuf, 101ul, 99L, 2L)) {
/* crc ok */ /* crc ok */
if((unsigned char)anonym->rxbuf[1]==0x9f && (unsigned char)anonym->rxbuf[2]==0x20){
tow = m10card(anonym->rxbuf, 101ul, 10L, 4L); tow = m10card(anonym->rxbuf, 101ul, 10L, 4L);
week = m10card(anonym->rxbuf, 101ul, 32L, 2L); week = m10card(anonym->rxbuf, 101ul, 32L, 2L);
@ -1804,7 +1806,7 @@ static void decodeframe10(uint32_t m)
} }
temp1=M10get_Temp(m); temp1=M10get_Temp(m);
temp2=M10get_Tntc2(m); temp2=M10get_Tntc2(m);
float fq555 = get_TLC555freq(m); fq555 = get_TLC555freq(m);
vbat=(float)((256*(unsigned char)anonym->rxbuf[70]+(unsigned char)anonym->rxbuf[69])*0.00668); vbat=(float)((256*(unsigned char)anonym->rxbuf[70]+(unsigned char)anonym->rxbuf[69])*0.00668);
lat = (double)m10card(anonym->rxbuf, 101ul, 14L,4L)*8.3819036711397E-8; lat = (double)m10card(anonym->rxbuf, 101ul, 14L,4L)*8.3819036711397E-8;
lon = (double)m10card(anonym->rxbuf, 101ul, 18L,4L)*8.3819036711397E-8; lon = (double)m10card(anonym->rxbuf, 101ul, 18L,4L)*8.3819036711397E-8;
@ -1822,6 +1824,38 @@ static void decodeframe10(uint32_t m)
// hor speed // hor speed
dir = atang2(vn, ve)*5.7295779513082E+1; dir = atang2(vn, ve)*5.7295779513082E+1;
if (dir<0.0) dir = 360.0+dir; if (dir<0.0) dir = 360.0+dir;
}
else if((unsigned char)anonym->rxbuf[1]==0xAF && (unsigned char)anonym->rxbuf[2]==0x02){
int tim=m10card(anonym->rxbuf, 101ul, 0x15, 3L);
int dat=m10card(anonym->rxbuf, 101ul, 0x18, 3L);
time0 = 2678400*(dat%10000)/100 +86400*dat/10000 +3600*(tim/10000)+60*((tim%10000)/100)+ ((tim%100)/1); //tow/1000UL+week*604800UL+315964800UL;
if (verb2) {
osi_WrStr(" ", 2ul);
aprsstr_DateToStr(time0, s, 201ul);
osi_WrStr(s, 201ul);
osi_WrStr(" ", 2ul);
}
temp1=M10get_Temp(m);
temp2=M10get_Tntc2(m);
fq555 = get_TLC555freq(m);
vbat=(float)((256*(unsigned char)anonym->rxbuf[70]+(unsigned char)anonym->rxbuf[69])*0.00668);
lat = (double)m10card(anonym->rxbuf, 101ul, 0x04,4L)*1e-6;
lon = (double)m10card(anonym->rxbuf, 101ul, 0x08,4L)*1e-6;
alt = (double)m10card(anonym->rxbuf, 101ul, 0x0c, 3L)*0.01;
ci = (int32_t)m10card(anonym->rxbuf, 101ul, 0x0f, 2L);
if (ci>32767L) ci -= 65536L;
ve = (double)ci*0.005;
ci = (int32_t)m10card(anonym->rxbuf, 101ul, 0x11, 2L);
if (ci>32767L) ci -= 65536L;
vn = (double)ci*0.005;
ci = (int32_t)m10card(anonym->rxbuf, 101ul, 0x13, 2L);
if (ci>32767L) ci -= 65536L;
vv = (double)ci*0.005;
v = (double)osic_sqrt((float)(ve*ve+vn*vn));
// hor speed
dir = atang2(vn, ve)*5.7295779513082E+1;
if (dir<0.0) dir = 360.0+dir;
}
@ -1936,6 +1970,13 @@ static void demodbyte10(uint32_t m, char d)
anonym->rxbuf[1U] = '\237'; anonym->rxbuf[1U] = '\237';
anonym->rxbuf[2U] = ' '; anonym->rxbuf[2U] = ' ';
} }
if ((anonym->synword&16777215UL)==6598402UL) {
anonym->rxp = 3UL;
anonym->rxb = 0UL;
anonym->rxbuf[0U] = 0x64;
anonym->rxbuf[1U] = 0xAF;
anonym->rxbuf[2U] = 0x02;
}
} }
else { else {
/*WrStr(" -syn- "); */ /*WrStr(" -syn- "); */