thooge/esp32-nmea2000-obp60
1
0
Fork 0
mirror of https://github.com/thooge/esp32-nmea2000-obp60.git synced 2025-12-15 23:13:07 +01:00
Code Releases Activity

Merge branch 'norbert-walter:master' into PSRAM

Browse Source
This commit is contained in:
Scorgan01
2025-08-27 23:17:18 +02:00
committed by GitHub
parent 1abcb158ec be946440d3
commit 6b91400cfc
10 changed files with 300 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/obp60task/obp60task.cpp
View File

@@ -121,8 +121,8 @@ void OBP60Init(GwApi *api){
typedef struct {
int page0=0;
QueueHandle_t queue;
GwLog* logger = NULL;
// GwApi* api = NULL;
GwLog* logger = nullptr;
// GwApi* api = nullptr;
uint sensitivity = 100;
bool use_syspage = true;
} MyData;
@@ -258,6 +258,8 @@ void registerAllPages(PageList &list){
list.add(&registerPageXTETrack);
extern PageDescription registerPageFluid;
list.add(&registerPageFluid);
extern PageDescription registerPageSkyView;
list.add(&registerPageSkyView);
}
// Undervoltage detection for shutdown display
@@ -301,7 +303,6 @@ void underVoltageError(CommonData &common) {
getdisplay().nextPage(); // Partial update
getdisplay().powerOff(); // Display power off
#endif
// Stop system
while (true) {
esp_deep_sleep_start(); // Deep Sleep without wakeup. Wakeup only after power cycle (restart).
}
@@ -316,7 +317,6 @@ inline bool underVoltageDetection(float voffset, float vslope) {
float actVoltage = (float(analogRead(OBP_ANALOG0)) * 3.3 / 4096 + 0.17) * 20; // Vin = 1/20 for OBP60
float minVoltage = MIN_VOLTAGE;
#endif
// TODO Why double here?
float calVoltage = actVoltage * vslope + voffset; // Calibration
return (calVoltage < minVoltage);
}
@@ -456,6 +456,7 @@ void OBP60Task(GwApi *api){
pages[i].page=description->creator(commonData);
pages[i].parameters.pageName=pageType;
pages[i].parameters.pageNumber = i + 1;
pages[i].parameters.api = api;
LOG_DEBUG(GwLog::DEBUG,"found page %s for number %d",pageType.c_str(),i);
//fill in all the user defined parameters
for (int uid=0;uid<description->userParam;uid++){
@@ -576,6 +577,7 @@ void OBP60Task(GwApi *api){
// Undervoltage detection
if (uvoltage == true) {
if (underVoltageDetection(voffset, vslope)) {
LOG_DEBUG(GwLog::ERROR, "Undervoltage detected, shutting down!");
underVoltageError(commonData);
}
}
@@ -821,6 +823,7 @@ void OBP60Task(GwApi *api){
if (systemPage) {
displayFooter(commonData);
PageData sysparams; // empty
sysparams.api = api;
if (systemPageNew) {
syspage->displayNew(sysparams);
systemPageNew = false;