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

removing all compiler warnings

This commit is contained in:
Hansi, dl9rdz 2019-05-31 01:22:27 +02:00
parent 15902b0230
commit 315586653f
10 changed files with 49 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/SX1278FSK/SX1278FSK.cpp
View File

@ -701,8 +701,6 @@ uint8_t SX1278FSK::receivePacketTimeout(uint32_t wait, byte *data)
state = receive(); state = receive();
if(state != 0) { return state; } if(state != 0) { return state; }
boolean p_received = false;
#if (SX1278FSK_debug_mode > 0) #if (SX1278FSK_debug_mode > 0)
Serial.println(F("RX mode sucessfully activated")); Serial.println(F("RX mode sucessfully activated"));
#endif #endif

11
libraries/SondeLib/DFM.cpp
View File

@ -162,7 +162,7 @@ void DFM::printRaw(const char *label, int len, int ret, const uint8_t *data)
Serial.print(" "); Serial.print(" ");
} }
int DFM::decodeCFG(uint8_t *cfg) void DFM::decodeCFG(uint8_t *cfg)
{ {
static int lowid, highid, idgood=0, type=0; static int lowid, highid, idgood=0, type=0;
if((cfg[0]>>4)==0x06 && type==0) { // DFM-6 ID if((cfg[0]>>4)==0x06 && type==0) { // DFM-6 ID
@ -189,7 +189,7 @@ int DFM::decodeCFG(uint8_t *cfg)
} }
} }
int DFM::decodeDAT(uint8_t *dat) void DFM::decodeDAT(uint8_t *dat)
{ {
Serial.print(" DAT["); Serial.print(dat[6]); Serial.print("]: "); Serial.print(" DAT["); Serial.print(dat[6]); Serial.print("]: ");
switch(dat[6]) { switch(dat[6]) {
@ -256,7 +256,7 @@ int DFM::decodeDAT(uint8_t *dat)
} }
} }
int DFM::bitsToBytes(uint8_t *bits, uint8_t *bytes, int len) void DFM::bitsToBytes(uint8_t *bits, uint8_t *bytes, int len)
{ {
int i; int i;
for(i=0; i<len*4; i++) { for(i=0; i<len*4; i++) {
@ -300,9 +300,10 @@ int DFM::receive() {
return RX_OK; return RX_OK;
} }
// maybe move to a single function in Sonde()? maybe not, we can do custom additional // moved to a single function in Sonde(). This function can be used for additional
// processing here, that takes too long for doing in the RX task loop // processing here, that takes too long for doing in the RX task loop
int DFM::waitRXcomplete() { int DFM::waitRXcomplete() {
#if 0
int res=0; int res=0;
uint32_t t0 = millis(); uint32_t t0 = millis();
while( rxtask.receiveResult < 0 && millis()-t0 < 2000) { delay(50); } while( rxtask.receiveResult < 0 && millis()-t0 < 2000) { delay(50); }
@ -317,6 +318,8 @@ int DFM::waitRXcomplete() {
rxtask.receiveResult = -1; rxtask.receiveResult = -1;
Serial.printf("waitRXcomplete returning %d\n", res); Serial.printf("waitRXcomplete returning %d\n", res);
return res; return res;
#endif
return 0;
} }
DFM dfm = DFM(); DFM dfm = DFM();

6
libraries/SondeLib/DFM.h
View File

@ -30,9 +30,9 @@ private:
int check(uint8_t code[8]); int check(uint8_t code[8]);
int hamming(uint8_t *ham, int L, uint8_t *sym); int hamming(uint8_t *ham, int L, uint8_t *sym);
void printRaw(const char *prefix, int len, int ret, const uint8_t* data); void printRaw(const char *prefix, int len, int ret, const uint8_t* data);
int decodeCFG(uint8_t *cfg); void decodeCFG(uint8_t *cfg);
int decodeDAT(uint8_t *dat); void decodeDAT(uint8_t *dat);
int bitsToBytes(uint8_t *bits, uint8_t *bytes, int len); void bitsToBytes(uint8_t *bits, uint8_t *bytes, int len);
#define B 8 #define B 8
#define S 4 #define S 4

7
libraries/SondeLib/RS41.cpp
View File

@ -447,7 +447,7 @@ void RS41::printRaw(uint8_t *data, int len)
Serial.println(); Serial.println();
} }
int RS41::bitsToBytes(uint8_t *bits, uint8_t *bytes, int len) void RS41::bitsToBytes(uint8_t *bits, uint8_t *bytes, int len)
{ {
int i; int i;
for(i=0; i<len*4; i++) { for(i=0; i<len*4; i++) {
@ -485,6 +485,9 @@ int RS41::receive() {
} }
int RS41::waitRXcomplete() { int RS41::waitRXcomplete() {
// Currently not used. can be used for additinoal post-processing
// (required for RS92 to avoid FIFO overrun in rx task)
#if 0
int res; int res;
uint32_t t0 = millis(); uint32_t t0 = millis();
while(rxtask.receiveResult<0 && millis()-t0 < 3000) { delay(50); } while(rxtask.receiveResult<0 && millis()-t0 < 3000) { delay(50); }
@ -499,6 +502,8 @@ int RS41::waitRXcomplete() {
rxtask.receiveResult = -1; rxtask.receiveResult = -1;
Serial.printf("waitRXcomplete returning %d\n", res); Serial.printf("waitRXcomplete returning %d\n", res);
return res; return res;
#endif
return 0;
} }
RS41 rs41 = RS41(); RS41 rs41 = RS41();

2
libraries/SondeLib/RS41.h
View File

@ -22,7 +22,7 @@ class RS41
private: private:
uint32_t bits2val(const uint8_t *bits, int len); uint32_t bits2val(const uint8_t *bits, int len);
void printRaw(uint8_t *data, int len); void printRaw(uint8_t *data, int len);
int bitsToBytes(uint8_t *bits, uint8_t *bytes, int len); void bitsToBytes(uint8_t *bits, uint8_t *bytes, int len);
int decode41(byte *data, int maxlen); int decode41(byte *data, int maxlen);
#define B 8 #define B 8

88
libraries/SondeLib/RS92.cpp
View File

@ -39,6 +39,7 @@ static uint32_t X2C_LSH(uint32_t a, int32_t length, int32_t n)
return (a >> -n) & m; return (a >> -n) & m;
} }
#if 0
static double atang2(double x, double y) static double atang2(double x, double y)
{ {
double w; double w;
@ -57,7 +58,7 @@ static double atang2(double x, double y)
else w = 0.0; else w = 0.0;
return w; return w;
} /* end atang2() */ } /* end atang2() */
#endif
static void Gencrctab(void) static void Gencrctab(void)
{ {
@ -183,7 +184,7 @@ RS92::RS92() {
*/ */
#if 0
static char crcrs(const byte frame[], uint32_t frame_len, static char crcrs(const byte frame[], uint32_t frame_len,
int32_t from, int32_t to) int32_t from, int32_t to)
{ {
@ -269,68 +270,7 @@ static void wgs84r(double x, double y, double z,
/* lat:=atan(z/(rh*(1.0 - E2))); */ /* lat:=atan(z/(rh*(1.0 - E2))); */
/* heig:=sqrt(h + z*z) - EARTHA; */ /* heig:=sqrt(h + z*z) - EARTHA; */
} /* end wgs84r() */ } /* end wgs84r() */
static void posrs41(const byte b[], uint32_t b_len, uint32_t p) #endif
{
double dir;
double vu;
double ve;
double vn;
double vz;
double vy;
double vx;
double heig;
double long0;
double lat;
double z;
double y;
double x;
x = (double)getint32(b, b_len, p)*0.01;
y = (double)getint32(b, b_len, p+4UL)*0.01;
z = (double)getint32(b, b_len, p+8UL)*0.01;
wgs84r(x, y, z, &lat, &long0, &heig);
Serial.print(" ");
sonde.si()->lat = (float)(X2C_DIVL(lat,1.7453292519943E-2));
Serial.print(sonde.si()->lat);
Serial.print(" ");
sonde.si()->lon = (float)(X2C_DIVL(long0,1.7453292519943E-2));
Serial.print(sonde.si()->lon);
if (heig<1.E+5 && heig>(-1.E+5)) {
Serial.print(" ");
Serial.print((uint32_t)heig);
Serial.print("m");
}
/*speed */
vx = (double)getint16(b, b_len, p+12UL)*0.01;
vy = (double)getint16(b, b_len, p+14UL)*0.01;
vz = (double)getint16(b, b_len, p+16UL)*0.01;
vn = (-(vx*(double)sin((float)lat)*(double)
cos((float)long0))-vy*(double)
sin((float)lat)*(double)sin((float)
long0))+vz*(double)cos((float)lat);
ve = -(vx*(double)sin((float)long0))+vy*(double)
cos((float)long0);
vu = vx*(double)cos((float)lat)*(double)
cos((float)long0)+vy*(double)
cos((float)lat)*(double)sin((float)
long0)+vz*(double)sin((float)lat);
dir = X2C_DIVL(atang2(vn, ve),1.7453292519943E-2);
if (dir<0.0) dir = 360.0+dir;
sonde.si()->dir = dir;
Serial.print(" ");
sonde.si()->hs = sqrt((float)(vn*vn+ve*ve))*3.6f;
Serial.print(sonde.si()->hs);
Serial.print("km/h ");
Serial.print(dir);
Serial.print("deg ");
Serial.print((float)vu);
sonde.si()->vs = vu;
Serial.print("m/s ");
Serial.print(getcard16(b, b_len, p+18UL)&255UL);
Serial.print("Sats");
sonde.si()->alt = heig;
sonde.si()->validPos = true;
} /* end posrs41() */
static int32_t reedsolomon92(uint8_t *buf, uint32_t buf_len) static int32_t reedsolomon92(uint8_t *buf, uint32_t buf_len)
@ -371,18 +311,16 @@ void printRaw(uint8_t *data, int len)
Serial.println(); Serial.println();
} }
static struct CONTEXTR9 contextr9;
void RS92::decodeframe92(uint8_t *data) void RS92::decodeframe92(uint8_t *data)
{ {
uint32_t gpstime; //uint32_t gpstime;
uint32_t flen; //uint32_t flen;
uint32_t j; //uint32_t j;
int32_t corr; int32_t corr;
corr = reedsolomon92(data, 301ul); corr = reedsolomon92(data, 301ul);
int calok; //int calok;
int mesok; //int mesok;
uint32_t calibok; //uint32_t calibok;
Serial.printf("rs corr is %d\n", corr); Serial.printf("rs corr is %d\n", corr);
print_frame(data, 240); print_frame(data, 240);
#if 0 #if 0
@ -468,6 +406,8 @@ void RS92::printRaw(uint8_t *data, int len)
Serial.println(); Serial.println();
} }
#if 0
// I guess this is old copy&paste stuff from RS41??
int RS92::bitsToBytes(uint8_t *bits, uint8_t *bytes, int len) int RS92::bitsToBytes(uint8_t *bits, uint8_t *bytes, int len)
{ {
int i; int i;
@ -492,6 +432,7 @@ static uint8_t scramble[64] = {150U,131U,62U,81U,177U,73U,8U,152U,50U,5U,89U,
153U,162U,44U,147U,124U,48U,99U,245U,16U,46U,97U,208U,188U, 153U,162U,44U,147U,124U,48U,99U,245U,16U,46U,97U,208U,188U,
180U,182U,6U,170U,244U,35U,120U,110U,59U,174U,191U,123U,76U, 180U,182U,6U,170U,244U,35U,120U,110U,59U,174U,191U,123U,76U,
193U}; 193U};
#endif
static byte data[5000]; static byte data[5000];
@ -582,6 +523,7 @@ int RS92::receive() {
#define RS92MAXLEN (240) #define RS92MAXLEN (240)
int RS92::waitRXcomplete() { int RS92::waitRXcomplete() {
#if 0
int res=0; int res=0;
uint32_t t0 = millis(); uint32_t t0 = millis();
while( rxtask.receiveResult == 0xFFFF && millis()-t0 < 2000) { delay(20); } while( rxtask.receiveResult == 0xFFFF && millis()-t0 < 2000) { delay(20); }
@ -596,6 +538,8 @@ int RS92::waitRXcomplete() {
rxtask.receiveResult = 0xFFFF; rxtask.receiveResult = 0xFFFF;
Serial.printf("RS92::waitRXcomplete returning %d (%s)\n", res, RXstr[res]); Serial.printf("RS92::waitRXcomplete returning %d (%s)\n", res, RXstr[res]);
return res; return res;
#endif
return 0;
} }

4
libraries/SondeLib/Sonde.cpp
View File

@ -259,7 +259,7 @@ void Sonde::setup() {
} }
void Sonde::receive() { void Sonde::receive() {
uint16_t res; uint16_t res = 0;
SondeInfo *si = &sondeList[rxtask.currentSonde]; SondeInfo *si = &sondeList[rxtask.currentSonde];
switch(si->type) { switch(si->type) {
case STYPE_RS41: case STYPE_RS41:
@ -342,7 +342,7 @@ uint16_t Sonde::waitRXcomplete() {
uint8_t Sonde::timeoutEvent() { uint8_t Sonde::timeoutEvent() {
uint32_t now = millis(); uint32_t now = millis();
#if 1 #if 1
Serial.printf("Timeout check: %ld - %ld vs %ld; %ld - %ld vs %ld; %ld - %ld vs %ld\n", Serial.printf("Timeout check: %d - %d vs %d; %d - %d vs %d; %d - %d vs %d\n",
now, sonde.si()->viewStart, disp.layout->timeouts[0], now, sonde.si()->viewStart, disp.layout->timeouts[0],
now, sonde.si()->rxStart, disp.layout->timeouts[1], now, sonde.si()->rxStart, disp.layout->timeouts[1],
now, sonde.si()->norxStart, disp.layout->timeouts[2]); now, sonde.si()->norxStart, disp.layout->timeouts[2]);

2
libraries/SondeLib/Sonde.h
View File

@ -60,7 +60,7 @@ typedef struct st_RXTask {
// via waitRXcomplete function // via waitRXcomplete function
uint16_t receiveResult; uint16_t receiveResult;
// status variabe set by decoder to indicate something is broken // status variabe set by decoder to indicate something is broken
int fifoOverflo; // int fifoOverflo;
} RXTask; } RXTask;
extern RXTask rxtask; extern RXTask rxtask;

17
libraries/SondeLib/nav_gps_vel.inc
View File

@ -307,17 +307,16 @@ static EPHEM_t *te;
//EPHEM_t *read_RNXpephs(FILE *fp) { //EPHEM_t *read_RNXpephs(FILE *fp) {
EPHEM_t *read_RNXpephs(char *file) { EPHEM_t *read_RNXpephs(const char *file) {
int l, i, n; int l, i;
char buffer[86]; //char buffer[86];
char buf[64], str[20]; char buf[64], str[20];
int pbuf;
unsigned ui; unsigned ui;
double dbl; double dbl;
int c; int c;
EPHEM_t ephem = {}; EPHEM_t ephem = {};
int count = 0; // int count = 0;
long fpos; //long fpos;
File fp = SPIFFS.open(file, "r"); File fp = SPIFFS.open(file, "r");
if(!fp) { Serial.printf("Error opening %s\n", file); } if(!fp) { Serial.printf("Error opening %s\n", file); }
@ -329,7 +328,6 @@ EPHEM_t *read_RNXpephs(char *file) {
//buffer[82] = '\0'; //buffer[82] = '\0';
Serial.printf("Skipping header: %s\n", line.c_str()); Serial.printf("Skipping header: %s\n", line.c_str());
} while ( fp.available() && !strstr((const char *)line.c_str(), "END OF HEADER") ); } while ( fp.available() && !strstr((const char *)line.c_str(), "END OF HEADER") );
Serial.printf("pbuf is %d\n", pbuf);
if (!fp.available()) return NULL; if (!fp.available()) return NULL;
/* /*
fpos = ftell(fp); fpos = ftell(fp);
@ -352,7 +350,8 @@ EPHEM_t *read_RNXpephs(char *file) {
te = (EPHEM_t *)calloc( 34, sizeof(ephem) ); // calloc( 1, sizeof(ephem) ); te = (EPHEM_t *)calloc( 34, sizeof(ephem) ); // calloc( 1, sizeof(ephem) );
if (te == NULL) return NULL; if (te == NULL) return NULL;
n = 0; //int n = 0;
while (true) { // brdc/hour-rinex sollte nur Daten von einem Tag enthalten while (true) { // brdc/hour-rinex sollte nur Daten von einem Tag enthalten
@ -437,7 +436,7 @@ EPHEM_t *read_RNXpephs(char *file) {
ephem.week = 1; // ephem.gpsweek ephem.week = 1; // ephem.gpsweek
Serial.printf("Reading ephem for prn %d\n", ui); Serial.printf("Reading ephem for prn %d\n", ui);
if(ui>=0 && ui<33) { if(ui<33) {
te[ui] = ephem; te[ui] = ephem;
} else { } else {
Serial.printf("bad prn: %d\n", ui); Serial.printf("bad prn: %d\n", ui);

10
libraries/SondeLib/rs92gps.inc
View File

@ -762,7 +762,7 @@ int calc_satpos_alm(EPHEM_t alm[], double t, SAT_t *satp) {
int calc_satpos_rnx(EPHEM_t eph[][24], double t, SAT_t *satp) { int calc_satpos_rnx(EPHEM_t eph[][24], double t, SAT_t *satp) {
double X, Y, Z, vX, vY, vZ; double X, Y, Z, vX, vY, vZ;
int j, i, ti; int j, i, ti;
int week; int week = 0;
double cl_corr, cl_drift; double cl_corr, cl_drift;
double tdiff, td; double tdiff, td;
@ -818,7 +818,7 @@ int calc_satpos_rnx(EPHEM_t eph[][24], double t, SAT_t *satp) {
int calc_satpos_rnx2(EPHEM_t *eph, double t, SAT_t *satp) { int calc_satpos_rnx2(EPHEM_t *eph, double t, SAT_t *satp) {
double X, Y, Z, vX, vY, vZ; double X, Y, Z, vX, vY, vZ;
int j; int j;
int week; int week = 0;
double cl_corr, cl_drift; double cl_corr, cl_drift;
double tdiff, td; double tdiff, td;
int count, count0, satfound; int count, count0, satfound;
@ -985,7 +985,7 @@ int get_pseudorange() {
*/ */
Serial.printf("j=%d: prns=%d status=%d dist=%f\n", j, prns[j], sat_status[j], dist(sat[prns[j]].X, sat[prns[j]].Y, sat[prns[j]].Z, 0, 0, 0)); Serial.printf("j=%d: prns=%d status=%d dist=%f\n", j, prns[j], sat_status[j], dist(sat[prns[j]].X, sat[prns[j]].Y, sat[prns[j]].Z, 0, 0, 0));
int o=prns[j]; int o=prns[j];
Serial.printf("x=%d y=%d z=%d\n", sat[o].X, sat[o].Y, sat[o].Z); Serial.printf("x=%f y=%f z=%f\n", sat[o].X, sat[o].Y, sat[o].Z);
if ( (prns[j] > 0) && ((sat_status[j] & 0x0F) == 0xF) if ( (prns[j] > 0) && ((sat_status[j] & 0x0F) == 0xF)
&& (dist(sat[prns[j]].X, sat[prns[j]].Y, sat[prns[j]].Z, 0, 0, 0) > 6700000) ) && (dist(sat[prns[j]].X, sat[prns[j]].Y, sat[prns[j]].Z, 0, 0, 0) > 6700000) )
{ {
@ -1063,7 +1063,7 @@ int get_GPSkoord(int N) {
SAT_t Sat_B[12]; // N <= 12 SAT_t Sat_B[12]; // N <= 12
SAT_t Sat_B1s[12]; SAT_t Sat_B1s[12];
SAT_t Sat_C[12]; // 11 SAT_t Sat_C[12]; // 11
double diter; double diter = 0;
int exN = -1; int exN = -1;
if (option_vergps == 8) { if (option_vergps == 8) {
@ -1387,7 +1387,7 @@ void print_frame(uint8_t *data, int len) {
else print_position(); else print_position();
} }
void get_eph(char *file) { void get_eph(const char *file) {
ephs = read_RNXpephs(file); ephs = read_RNXpephs(file);
if (ephs) { if (ephs) {
ephem = 1; ephem = 1;