ua1zbe
/
rdz_ttgo_sonde
mirror of https://github.com/oh3bsg/rdz_ttgo_sonde
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

maybe a fix for DFM-06 (still not yet tested)

This commit is contained in:
Hansi, dl9rdz 2019-05-23 19:48:24 +02:00
parent 9cea3ed9ad
commit 7844d42c76
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/SondeLib/DFM.cpp
View File

@ -12,8 +12,9 @@
#define DFM_DBG(x)
#endif
int DFM::setup(int inverse)
int DFM::setup(int inv)
{
inverse = inv;
#if DFM_DEBUG
Serial.println("Setup sx1278 for DFM sonde");
#endif
@ -206,7 +207,7 @@ int DFM::decodeDAT(uint8_t *dat)
{
float lat, vh;
lat = ((uint32_t)dat[0]<<24) + ((uint32_t)dat[1]<<16) + ((uint32_t)dat[2]<<8) + ((uint32_t)dat[3]);
vh = (dat[4]<<8) + dat[5];
vh = ((uint16_t)dat[4]<<8) + dat[5];
Serial.print("GPS-lat: "); Serial.print(lat*0.0000001);
Serial.print(", hor-V: "); Serial.print(vh*0.01);
sonde.si()->lat = lat*0.0000001;
@ -230,7 +231,7 @@ int DFM::decodeDAT(uint8_t *dat)
{
float alt, vv;
alt = ((uint32_t)dat[0]<<24) + ((uint32_t)dat[1]<<16) + ((uint32_t)dat[2]<<8) + dat[3];
vv = (int16_t)( (dat[4]<<8) | dat[5] );
vv = (int16_t)( ((int16_t)dat[4]<<8) | dat[5] );
Serial.print("GPS-height: "); Serial.print(alt*0.01);
Serial.print(", vv: "); Serial.print(vv*0.01);
sonde.si()->alt = alt*0.01;
@ -274,6 +275,7 @@ int DFM::receiveFrame() {
int e = sx1278.receivePacketTimeout(1000, data);
if(e) { return RX_TIMEOUT; } //if timeout... return 1
if(inverse) { for(int i=0; i<33; i++) { data[i]^=0xFF; } }
deinterleave(data, 7, hamming_conf);
deinterleave(data+7, 13, hamming_dat1);
deinterleave(data+20, 13, hamming_dat2);

2
libraries/SondeLib/DFM.h
View File

@ -23,6 +23,8 @@
class DFM
{
private:
int inverse=0;
void deinterleave(uint8_t *str, int L, uint8_t *block);
uint32_t bits2val(const uint8_t *bits, int len);
int check(uint8_t code[8]);