jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-27 04:36:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor GPS driver

Browse Source
This commit is contained in:
Theo Arends 2024-06-23 17:38:54 +02:00
parent 17ea732753
commit ddf762b7cc
1 changed files with 161 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

210
tasmota/tasmota_xsns_sensor/xsns_60_GPS.ino
View File

@ -156,7 +156,7 @@ const char UBLOX_INIT[] PROGMEM = {
0xB5,0x62,0x06,0x01,0x08,0x00,0x01,0x21,0x00,0x00,0x00,0x00,0x00,0x00,0x31,0x92, //NAV-TIMEUTC off 0xB5,0x62,0x06,0x01,0x08,0x00,0x01,0x21,0x00,0x00,0x00,0x00,0x00,0x00,0x31,0x92, //NAV-TIMEUTC off
#ifdef USE_GPS_VELOCITY #ifdef USE_GPS_VELOCITY
0xB5,0x62,0x06,0x01,0x08,0x00,0x01,0x12,0x00,0x00,0x00,0x00,0x00,0x00,0x22,0x29, //NAV-VELNED off 0xB5,0x62,0x06,0x01,0x08,0x00,0x01,0x12,0x00,0x00,0x00,0x00,0x00,0x00,0x22,0x29, //NAV-VELNED off
#endif #endif // USE_GPS_VELOCITY
// Enable UBX // Enable UBX
// 0xB5,0x62,0x06,0x01,0x08,0x00,0x01,0x07,0x00,0x01,0x00,0x00,0x00,0x00,0x18,0xE1, //NAV-PVT on // 0xB5,0x62,0x06,0x01,0x08,0x00,0x01,0x07,0x00,0x01,0x00,0x00,0x00,0x00,0x18,0xE1, //NAV-PVT on
@ -165,7 +165,7 @@ const char UBLOX_INIT[] PROGMEM = {
0xB5,0x62,0x06,0x01,0x08,0x00,0x01,0x21,0x00,0x01,0x00,0x00,0x00,0x00,0x32,0x97, //NAV-TIMEUTC on 0xB5,0x62,0x06,0x01,0x08,0x00,0x01,0x21,0x00,0x01,0x00,0x00,0x00,0x00,0x32,0x97, //NAV-TIMEUTC on
#ifdef USE_GPS_VELOCITY #ifdef USE_GPS_VELOCITY
0xB5,0x62,0x06,0x01,0x08,0x00,0x01,0x12,0x00,0x01,0x00,0x00,0x00,0x00,0x23,0x2E, //NAV-VELNED on 0xB5,0x62,0x06,0x01,0x08,0x00,0x01,0x12,0x00,0x01,0x00,0x00,0x00,0x00,0x23,0x2E, //NAV-VELNED on
#endif #endif // USE_GPS_VELOCITY
// Rate - we will not reset it for the moment after restart // Rate - we will not reset it for the moment after restart
// 0xB5,0x62,0x06,0x08,0x06,0x00,0x64,0x00,0x01,0x00,0x01,0x00,0x7A,0x12, //(10Hz) // 0xB5,0x62,0x06,0x08,0x06,0x00,0x64,0x00,0x01,0x00,0x01,0x00,0x7A,0x12, //(10Hz)
// 0xB5,0x62,0x06,0x08,0x06,0x00,0xC8,0x00,0x01,0x00,0x01,0x00,0xDE,0x6A, //(5Hz) // 0xB5,0x62,0x06,0x08,0x06,0x00,0xC8,0x00,0x01,0x00,0x01,0x00,0xDE,0x6A, //(5Hz)
@ -182,7 +182,10 @@ struct UBX_t {
const char NAV_TIME_HEADER[2] = { 0x01, 0x21 }; const char NAV_TIME_HEADER[2] = { 0x01, 0x21 };
#ifdef USE_GPS_VELOCITY #ifdef USE_GPS_VELOCITY
const char NAV_VEL_HEADER[2] = { 0x01, 0x12 }; const char NAV_VEL_HEADER[2] = { 0x01, 0x12 };
#endif #endif // USE_GPS_VELOCITY
int32_t lat;
int32_t lon;
struct entry_t { struct entry_t {
int32_t lat; // raw sensor value int32_t lat; // raw sensor value
@ -202,44 +205,44 @@ struct UBX_t {
}; };
struct NAV_POSLLH { struct NAV_POSLLH {
uint8_t cls; uint8_t cls; // 0x01
uint8_t id; uint8_t id; // 0x02
uint16_t len; uint16_t len; // 28 bytes
uint32_t iTOW; uint32_t iTOW; // ms
int32_t lon; int32_t lon; // 1e-7, degree
int32_t lat; int32_t lat; // 1e-7, degree
int32_t alt; int32_t alt; // mm
int32_t hMSL; int32_t hMSL; // mm
uint32_t hAcc; uint32_t hAcc; // mm
uint32_t vAcc; uint32_t vAcc; // mm
}; };
struct NAV_STATUS { struct NAV_STATUS {
uint8_t cls; uint8_t cls; // 0x01
uint8_t id; uint8_t id; // 0x03
uint16_t len; uint16_t len; // 16 bytes
uint32_t iTOW; uint32_t iTOW; // ms
uint8_t gpsFix; uint8_t gpsFix; //
uint8_t flags; // bit 0 - gpsfix valid uint8_t flags; // bit 0 - gpsfix valid
uint8_t fixStat; uint8_t fixStat; //
uint8_t flags2; uint8_t flags2; //
uint32_t ttff; uint32_t ttff; // ms
uint32_t msss; uint32_t msss; // ms
}; };
struct NAV_TIME_UTC { struct NAV_TIME_UTC {
uint8_t cls; uint8_t cls; // 0x01
uint8_t id; uint8_t id; // 0x21
uint16_t len; uint16_t len; // 20 bytes
uint32_t iTOW; uint32_t iTOW; // ms
uint32_t tAcc; uint32_t tAcc; // ns
int32_t nano; // Nanoseconds of second, range -1e9 .. 1e9 (UTC) int32_t nano; // Nanoseconds of second, range -1e9 .. 1e9 (UTC)
uint16_t year; uint16_t year; // y
uint8_t month; uint8_t month; // month
uint8_t day; uint8_t day; // d
uint8_t hour; uint8_t hour; // h
uint8_t min; uint8_t min; // min
uint8_t sec; uint8_t sec; // s
struct { struct {
uint8_t UTC:1; uint8_t UTC:1;
uint8_t WKN:1; // week number uint8_t WKN:1; // week number
@ -247,22 +250,24 @@ struct UBX_t {
uint8_t padding:5; uint8_t padding:5;
} valid; } valid;
}; };
#ifdef USE_GPS_VELOCITY #ifdef USE_GPS_VELOCITY
struct NAV_VEL { struct NAV_VEL {
uint8_t cls; uint8_t cls; // 0x01
uint8_t id; uint8_t id; // 0x12
uint16_t len; uint16_t len; // 36 bytes
uint32_t iTOW; uint32_t iTOW; // ms
int32_t velN; int32_t velN; // cm/s
int32_t velE; //bit 0 - gpsfix valid int32_t velE; // cm/s
int32_t velD; int32_t velD; // cm/s
uint32_t speed; uint32_t speed; // cm/s
uint32_t gSpeed; uint32_t gSpeed; // cm/s
int32_t heading; int32_t heading; // 1e-5, degree
uint32_t sAcc; uint32_t sAcc; // cm/s
uint32_t cAcc; uint32_t cAcc; // 1e-5, degree
}; };
#endif #endif // USE_GPS_VELOCITY
struct CFG_RATE { struct CFG_RATE {
uint8_t cls; // 0x06 uint8_t cls; // 0x06
uint8_t id; // 0x08 uint8_t id; // 0x08
@ -302,7 +307,7 @@ struct UBX_t {
NAV_TIME_UTC navTime; NAV_TIME_UTC navTime;
#ifdef USE_GPS_VELOCITY #ifdef USE_GPS_VELOCITY
NAV_VEL navVel; NAV_VEL navVel;
#endif #endif // USE_GPS_VELOCITY
POLL_MSG pollMsg; POLL_MSG pollMsg;
CFG_RATE cfgRate; CFG_RATE cfgRate;
} Message; } Message;
@ -320,7 +325,7 @@ enum UBXMsgType {
MT_NAV_TIME, MT_NAV_TIME,
#ifdef USE_GPS_VELOCITY #ifdef USE_GPS_VELOCITY
MT_NAV_VEL, MT_NAV_VEL,
#endif #endif // USE_GPS_VELOCITY
MT_POLL MT_POLL
}; };
@ -465,7 +470,7 @@ uint32_t UBXprocessGPS()
payloadSize = sizeof(UBX_t::NAV_VEL); payloadSize = sizeof(UBX_t::NAV_VEL);
DEBUG_SENSOR_LOG(PSTR("UBX: got NAV_VEL")); DEBUG_SENSOR_LOG(PSTR("UBX: got NAV_VEL"));
} }
#endif #endif // USE_GPS_VELOCITY
else { else {
// unknown message type, bail // unknown message type, bail
fpos = 0; fpos = 0;
@ -634,11 +639,10 @@ void UBXSelectMode(uint16_t mode)
UBXsendCFGLine(11); //NAV-POSLLH on UBXsendCFGLine(11); //NAV-POSLLH on
UBXsendCFGLine(12); //NAV-STATUS on UBXsendCFGLine(12); //NAV-STATUS on
UBXsendCFGLine(14); //NAV-VELNED on UBXsendCFGLine(14); //NAV-VELNED on
#endif #else
#ifndef USE_GPS_VELOCITY
UBXsendCFGLine(10); //NAV-POSLLH on UBXsendCFGLine(10); //NAV-POSLLH on
UBXsendCFGLine(11); //NAV-STATUS on UBXsendCFGLine(11); //NAV-STATUS on
#endif #endif // USE_GPS_VELOCITY
break; break;
case 11: case 11:
UBX.mode.forceUTCupdate = true; UBX.mode.forceUTCupdate = true;
@ -695,7 +699,7 @@ bool UBXHandlePOSLLH()
UBXsendCFGLine(8); // NAV-STATUS off UBXsendCFGLine(8); // NAV-STATUS off
#ifdef USE_GPS_VELOCITY #ifdef USE_GPS_VELOCITY
UBXsendCFGLine(10); // NAV-VELNED off UBXsendCFGLine(10); // NAV-VELNED off
#endif #endif // USE_GPS_VELOCITY
} }
//UBX_LAT_LON_THRESHOLD = 20 * UBX.Message.navPosllh.hAcc; //UBX_LAT_LON_THRESHOLD = 20 * UBX.Message.navPosllh.hAcc;
return true; // new position return true; // new position
@ -717,7 +721,7 @@ void UBXHandleVEL()
} }
} }
#endif #endif // USE_GPS_VELOCITY
void UBXHandleSTATUS() void UBXHandleSTATUS()
{ {
@ -813,7 +817,7 @@ void UBXLoop(void)
case MT_NAV_VEL: case MT_NAV_VEL:
UBXHandleVEL(); UBXHandleVEL();
break; break;
#endif #endif // USE_GPS_VELOCITY
default: default:
UBXHandleOther(); UBXHandleOther();
break; break;
@ -840,60 +844,59 @@ void UBXLoop(void)
#ifdef USE_FLOG #ifdef USE_FLOG
#ifdef DEBUG_TASMOTA_SENSOR #ifdef DEBUG_TASMOTA_SENSOR
const char HTTP_SNS_FLOGVER[] PROGMEM = "{s}<hr>{m}<hr>{e}{s} FLOG with %u sectors: {m}%u bytes{e}" const char HTTP_SNS_FLOGVER[] PROGMEM = "{s}FLOG with %u sectors:{m}%u bytes{e}"
"{s}FLOG next sector for REC:{m} %u {e}" "{s}FLOG next sector for REC:{m} %u {e}"
"{s}%u sector(s) with data at sector:{m}%u{e}"; "{s}%u sector(s) with data at sector:{m}%u{e}";
const char HTTP_SNS_FLOGREC[] PROGMEM = "{s}RECORDING (bytes in buffer){m}%u{e}"; const char HTTP_SNS_FLOGREC[] PROGMEM = "{s}RECORDING (bytes in buffer){m}%u{e}";
#endif // DEBUG_TASMOTA_SENSOR #endif // DEBUG_TASMOTA_SENSOR
const char HTTP_SNS_FLOG[] PROGMEM = "{s}<hr>{m}<hr>{e}{s} Flash-Log {m} %s{e}"; const char HTTP_SNS_FLOG[] PROGMEM = "{s}GPS Logging{m}%s{e}";
const char kFLOG_STATE0[] PROGMEM = "ready"; const char kFLOGstate[] PROGMEM = "Ready|Recording";
const char kFLOG_STATE1[] PROGMEM = "recording";
const char * kFLOG_STATE[] ={kFLOG_STATE0, kFLOG_STATE1};
const char HTTP_BTN_FLOG_DL[] PROGMEM = "<button><a href='/UBX'>Download GPX-File</a></button>"; const char HTTP_BTN_FLOG_DL[] PROGMEM = "<button><a href='/UBX'>Download GPX-File</a></button>";
#endif // USE_FLOG #endif // USE_FLOG
const char HTTP_SNS_NTPSERVER[] PROGMEM = "{s} NTP server {m}active{e}";
const char HTTP_SNS_GPS[] PROGMEM = "{s}GPS " D_LATITUDE "{m}%s{e}" const char HTTP_SNS_NTPSERVER[] PROGMEM = "{s}GPS NTP server{m}Active{e}";
const char HTTP_SNS_GPS[] PROGMEM = "{s}GPS " D_SAT_FIX "{m}%s{e}"
"{s}GPS " D_LATITUDE "{m}%s{e}"
"{s}GPS " D_LONGITUDE "{m}%s{e}" "{s}GPS " D_LONGITUDE "{m}%s{e}"
"{s}GPS " D_ALTITUDE "{m}%3_f " D_UNIT_METER "{e}"
"{s}GPS " D_HORIZONTAL_ACCURACY "{m}%3_f " D_UNIT_METER "{e}" "{s}GPS " D_HORIZONTAL_ACCURACY "{m}%3_f " D_UNIT_METER "{e}"
"{s}GPS " D_VERTICAL_ACCURACY "{m}%3_f " D_UNIT_METER "{e}" "{s}GPS " D_ALTITUDE "{m}%3_f " D_UNIT_METER "{e}"
"{s}GPS " D_SAT_FIX "{m}%s{e}"; "{s}GPS " D_VERTICAL_ACCURACY "{m}%3_f " D_UNIT_METER "{e}";
#ifdef USE_GPS_VELOCITY #ifdef USE_GPS_VELOCITY
const char HTTP_SNS_GPS2[] PROGMEM = "{s}GPS " D_SPEED "{m}%1_f{e}" const char HTTP_SNS_GPS2[] PROGMEM = "{s}GPS " D_SPEED "{m}%2_f " D_UNIT_KILOMETER_PER_HOUR "{e}"
"{s}GPS " D_SPEED_ACCURACY "{m}%2_f " D_UNIT_KILOMETER_PER_HOUR "{e}"
"{s}GPS " D_HEADING "{m}%1_f{e}" "{s}GPS " D_HEADING "{m}%1_f{e}"
"{s}GPS " D_HEADING_ACCURACY "{m}%2_f{e}" "{s}GPS " D_HEADING_ACCURACY "{m}%1_f{e}";
"{s}GPS " D_SPEED_ACCURACY "{m}%2_f{e}"; #endif // USE_GPS_VELOCITY
#endif
const char kGPSFix[] PROGMEM = D_SAT_FIX_NO_FIX "|" D_SAT_FIX_DEAD_RECK "|" D_SAT_FIX_2D "|" D_SAT_FIX_3D "|" D_SAT_FIX_GPS_DEAD "|" D_SAT_FIX_TIME; const char kGPSFix[] PROGMEM = D_SAT_FIX_NO_FIX "|" D_SAT_FIX_DEAD_RECK "|" D_SAT_FIX_2D "|" D_SAT_FIX_3D "|" D_SAT_FIX_GPS_DEAD "|" D_SAT_FIX_TIME;
// const char UBX_GOOGLE_MAPS[] ="<iframe width='100%%' src='https://maps.google.com/maps?width=&amp;height=&amp;hl=en&amp;q=%s %s+(Tasmota)&amp;ie=UTF8&amp;t=&amp;z=10&amp;iwloc=B&amp;output=embed' frameborder='0' scrolling='no' marginheight='0' marginwidth='0'></iframe>"; #ifdef USE_GPS_MAPS
const char UBX_GOOGLE_MAPS[] ="<iframe width='100%%' src='https://maps.google.com/maps?width=&amp;height=&amp;hl=en&amp;q=%s %s+(Tasmota)&amp;ie=UTF8&amp;t=&amp;z=10&amp;iwloc=B&amp;output=embed' frameborder='0' scrolling='no' marginheight='0' marginwidth='0'></iframe>";
#endif // USE_GPS_MAPS
#endif // USE_WEBSERVER #endif // USE_WEBSERVER
/********************************************************************************************/ /********************************************************************************************/
void UBXShow(bool json) void UBXShow(bool json) {
{
char lat[12];
dtostrfd((double)UBX.rec_buffer.values.lat/10000000.0f,7,lat);
char lon[12];
dtostrfd((double)UBX.rec_buffer.values.lon/10000000.0f,7,lon);
float alt = (float)UBX.state.last_alt / 1000.0f;
float hAcc = (float)UBX.state.last_vAcc / 1000.0f;
float vAcc = (float)UBX.state.last_hAcc / 1000.0f;
char fix[32]; char fix[32];
GetTextIndexed(fix, sizeof(fix), UBX.state.gpsFix, kGPSFix); GetTextIndexed(fix, sizeof(fix), UBX.state.gpsFix, kGPSFix);
char lat[12];
dtostrfd((double)UBX.rec_buffer.values.lat / 10000000.0f, 7, lat); // degrees
char lon[12];
dtostrfd((double)UBX.rec_buffer.values.lon / 10000000.0f, 7, lon); // degrees
float hAcc = (float)UBX.state.last_vAcc / 1000.0f; // mm -> meters
float alt = (float)UBX.state.last_alt / 1000.0f; // mm -> meters
float vAcc = (float)UBX.state.last_hAcc / 1000.0f; // mm -> meters
#ifdef USE_GPS_VELOCITY #ifdef USE_GPS_VELOCITY
float spd = (float)UBX.Message.navVel.gSpeed / 27.778f; float spd = (float)UBX.Message.navVel.gSpeed / 27.778f; // cm/s -> km/h
float hdng = (float)UBX.Message.navVel.heading / 100000.0f; float sAcc = (float)UBX.Message.navVel.sAcc / 27.778f; // cm/s -> km/h
float cAcc = (float)UBX.Message.navVel.cAcc / 100000.0f; float hdng = (float)UBX.Message.navVel.heading / 100000.0f; // degrees
float sAcc = (float)UBX.Message.navVel.sAcc / 100000.0f; float cAcc = (float)UBX.Message.navVel.cAcc / 100000.0f; // degrees
#endif if (cAcc > 360) { cAcc = 0; }
#endif // USE_GPS_VELOCITY
if (json) { if (json) {
ResponseAppend_P(PSTR(",\"GPS\":{")); ResponseAppend_P(PSTR(",\"GPS\":{"));
@ -904,9 +907,9 @@ void UBXShow(bool json)
ResponseAppend_P(PSTR("\"Lat\":%s,\"Lon\":%s,\"Alt\":%3_f,\"hAcc\":%3_f,\"vAcc\":%3_f,\"Fix\":\"%s\""), ResponseAppend_P(PSTR("\"Lat\":%s,\"Lon\":%s,\"Alt\":%3_f,\"hAcc\":%3_f,\"vAcc\":%3_f,\"Fix\":\"%s\""),
lat, lon, &alt, &hAcc, &vAcc, fix); lat, lon, &alt, &hAcc, &vAcc, fix);
#ifdef USE_GPS_VELOCITY #ifdef USE_GPS_VELOCITY
ResponseAppend_P(PSTR(",\"Spd\":%1_f,\"Hdng\":%1_f,\"cAcc\":%2_f,\"sAcc\":%2_f"), ResponseAppend_P(PSTR(",\"Spd\":%2_f,\"Hdng\":%1_f,\"sAcc\":%2_f,\"cAcc\":%1_f"),
&spd, &hdng, &cAcc, &sAcc); &spd, &hdng, &sAcc, &cAcc);
#endif #endif // USE_GPS_VELOCITY
ResponseAppend_P(PSTR("}")); ResponseAppend_P(PSTR("}"));
} }
#ifdef USE_FLOG #ifdef USE_FLOG
@ -915,30 +918,43 @@ void UBXShow(bool json)
UBX.mode.send_UI_only = false; UBX.mode.send_UI_only = false;
#ifdef USE_WEBSERVER #ifdef USE_WEBSERVER
} else { } else {
WSContentSend_PD(HTTP_SNS_GPS, lat, lon, &alt, &hAcc, &vAcc, fix); WSContentSend_PD(HTTP_SNS_GPS, fix, lat, lon, &hAcc, &alt, &vAcc);
#ifdef USE_GPS_VELOCITY #ifdef USE_GPS_VELOCITY
WSContentSend_PD(HTTP_SNS_GPS2, &spd, &hdng, &cAcc, &sAcc); WSContentSend_PD(HTTP_SNS_GPS2, &spd, &sAcc, &hdng, &cAcc);
#endif #endif // USE_GPS_VELOCITY
//WSContentSend_P(UBX_GOOGLE_MAPS, lat, lon);
#ifdef DEBUG_TASMOTA_SENSOR #ifdef USE_GPS_MAPS
int32_t lat_diff = UBX.rec_buffer.values.lat - UBX.lat;
int32_t lon_diff = UBX.rec_buffer.values.lon - UBX.lon;
if ((lat_diff > 1000) || (lon_diff > 1000)) {
UBX.lat = UBX.rec_buffer.values.lat;
UBX.lon = UBX.rec_buffer.values.lon;
WSContentSend_P(UBX_GOOGLE_MAPS, lat, lon);
}
#endif // USE_GPS_MAPS
#ifdef USE_FLOG #ifdef USE_FLOG
WSContentSeparator(0);
#ifdef DEBUG_TASMOTA_SENSOR
WSContentSend_PD(HTTP_SNS_FLOGVER, Flog->num_sectors, Flog->size, Flog->current_sector, Flog->sectors_left, Flog->sector.header.physical_start_sector); WSContentSend_PD(HTTP_SNS_FLOGVER, Flog->num_sectors, Flog->size, Flog->current_sector, Flog->sectors_left, Flog->sector.header.physical_start_sector);
if (Flog->recording) { if (Flog->recording) {
WSContentSend_PD(HTTP_SNS_FLOGREC, Flog->sector.header.buf_pointer - 8); WSContentSend_PD(HTTP_SNS_FLOGREC, Flog->sector.header.buf_pointer - 8);
} }
#endif //USE_FLOG
#endif // DEBUG_TASMOTA_SENSOR #endif // DEBUG_TASMOTA_SENSOR
#ifdef USE_FLOG
if (Flog->ready) { if (Flog->ready) {
WSContentSend_P(HTTP_SNS_FLOG,kFLOG_STATE[Flog->recording]); char flog_state[32];
WSContentSend_P(HTTP_SNS_FLOG, GetTextIndexed(flog_state, sizeof(flog_state), Flog->recording, kFLOGstate));
} }
if (!Flog->recording && Flog->found_saved_data) { if (!Flog->recording && Flog->found_saved_data) {
WSContentSend_P(HTTP_BTN_FLOG_DL); WSContentSend_P(HTTP_BTN_FLOG_DL);
} }
#endif // USE_FLOG #endif // USE_FLOG
if (UBX.mode.runningNTP) { if (UBX.mode.runningNTP) {
WSContentSeparator(0);
WSContentSend_P(HTTP_SNS_NTPSERVER); WSContentSend_P(HTTP_SNS_NTPSERVER);
} }
#endif // USE_WEBSERVER #endif // USE_WEBSERVER
} }
} }