thooge
/
esp32-nmea2000-obp60
mirror of https://github.com/thooge/esp32-nmea2000-obp60.git
1
0
Fork 0
Code Releases Activity

Some modifications to avoid AP connection problems

This commit is contained in:
Thomas Hooge 2025-08-06 11:36:05 +02:00
parent 0dd6b7c9cf
commit 15674543b6
9 changed files with 259 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/obp60task/OBP60Extensions.cpp
View File

@ -461,12 +461,6 @@ void displayHeader(CommonData &commonData, bool symbolmode, GwApi::BoatValue *da
if(commonData.config->getBool(commonData.config->statusLine) == true){ if(commonData.config->getBool(commonData.config->statusLine) == true){
if (symbolmode) {
commonData.logger->logDebug(GwLog::LOG,"Header: Symbolmode");
} else {
commonData.logger->logDebug(GwLog::LOG,"Header: Textmode");
}
// Show status info // Show status info
epd->setTextColor(commonData.fgcolor); epd->setTextColor(commonData.fgcolor);
epd->setFont(&Ubuntu_Bold8pt8b); epd->setFont(&Ubuntu_Bold8pt8b);

22
lib/obp60task/PageAIS.cpp
View File

@ -3,7 +3,6 @@
#include "Pagedata.h" #include "Pagedata.h"
#include "OBP60Extensions.h" #include "OBP60Extensions.h"
#include "ConfigMenu.h"
/* /*
AIS Overview AIS Overview
@ -12,6 +11,9 @@
- perhaps collision alarm - perhaps collision alarm
Data: LAT LON SOG HDT Data: LAT LON SOG HDT
Feature possibilities
- switch between North up / Heading up
*/ */
class PageAIS : public Page class PageAIS : public Page
@ -31,9 +33,6 @@ private:
int alarm_range = 3; int alarm_range = 3;
char mode = 'N'; // (N)ormal, (C)onfig char mode = 'N'; // (N)ormal, (C)onfig
int8_t editmode = -1; // marker for menu/edit/set function
ConfigMenu *menu;
void displayModeNormal(PageData &pageData) { void displayModeNormal(PageData &pageData) {
@ -98,21 +97,8 @@ public:
flashLED = config->getString(config->flashLED); flashLED = config->getString(config->flashLED);
backlightMode = config->getString(config->backlight); backlightMode = config->getString(config->backlight);
alarm_range = 30; alarm_range = 3;
// Initialize config menu
/* menu = new ConfigMenu("Options", 40, 80);
menu->setItemDimension(150, 20);
ConfigMenuItem *newitem;
newitem = menu->addItem("range", "Range", "int", 4, "nm");
if (! newitem) {
// Demo: in case of failure exit here, should never be happen
logger->logDebug(GwLog::ERROR,"Menu item creation failed");
return;
}
newitem->setRange(0, 20, {1, 5});
menu->setItemActive("range"); */
} }
void setupKeys(){ void setupKeys(){

14
lib/obp60task/PageAutopilot.cpp
View File

@ -3,7 +3,6 @@
#include "Pagedata.h" #include "Pagedata.h"
#include "OBP60Extensions.h" #include "OBP60Extensions.h"
#include "ConfigMenu.h"
/* /*
Autopilot Autopilot
@ -21,9 +20,6 @@ private:
String backlightMode; String backlightMode;
char mode = 'N'; // (N)ormal, (C)onfig char mode = 'N'; // (N)ormal, (C)onfig
int8_t editmode = -1; // marker for menu/edit/set function
ConfigMenu *menu;
void displayModeNormal(PageData &pageData) { void displayModeNormal(PageData &pageData) {
@ -142,11 +138,11 @@ static Page *createPage(CommonData &common){
* this will be number of BoatValue pointers in pageData.values * this will be number of BoatValue pointers in pageData.values
*/ */
PageDescription registerPageAutopilot( PageDescription registerPageAutopilot(
"Autopilot", // Page name "Autopilot", // Page name
createPage, // Action createPage, // Action
0, // Number of bus values depends on selection in Web configuration 0, // Number of bus values depends on selection in Web configuration
{}, // Names of bus values undepends on selection in Web configuration (refer GwBoatData.h) {}, // Names of bus values undepends on selection in Web configuration (refer GwBoatData.h)
true // Show display header on/off false // Show display header on/off
); );
#endif #endif

13
lib/obp60task/README
View File

@ -27,20 +27,23 @@ New pages
--------- ---------
To create a new page for OBP60 the following steps are necessary: To create a new page for OBP60 the following steps are necessary:
1. Create a page under /lib/obp60task/PageXXXX.cpp 1. Create a page under /lib/obp60task/PageXXXX.cpp. You can use a simple
page e.g. PageOneValue.cpp as template
2. Set page name in PageXXXX.cpp on file name 2. Set page name in PageXXXX.cpp on file name
3. Register new page in /lib/obp60task/obp60task.cpp in function 3. Register new page in /lib/obp60task/obp60task.cpp in function
'registerAllPages' 'registerAllPages'
4. Add new page in /lib/obp60task/config.json for each page type or add 4. Add new page in /lib/obp60task/config.json for each page type
new page to gen_set.py and run it to auto-generate the relevant or use gen_set.py to auto-generate the relevant section of
section of config.json config.json. For further information on that read the comments
in gen_set.py.
5. Copy the changes in config.json to config_obp40.json and rename 5. Copy the changes in config.json to config_obp40.json and rename
strings accordingly. E.g. obp60 to obp40. strings accordingly. E.g. obp60 to obp40.
Using Gitpod Using Gitpod
------------ ------------
Warning: You have to register with gitpod!
Open web page: Open web page:
https://gitpod.io/#https://github.com/norbert-walter/esp32-nmea2000-obp60/tree/master/lib/obp60task https://gitpod.io/#https://github.com/norbert-walter/esp32-nmea2000-obp60/tree/master/lib/obp60task

155
lib/obp60task/config.json
View File

@ -749,8 +749,19 @@
"obp60":"true" "obp60":"true"
}, },
"condition": [ "condition": [
{ "calInstance1": ["AWA", "AWS", "COG", "DBT", "HDM", "PRPOS", "RPOS", "SOG", "STW", "TWA", "TWS", "TWD", "WTemp" ] } { "calInstance1": "AWA" },
] { "calInstance1": "AWS" },
{ "calInstance1": "COG" },
{ "calInstance1": "DBT" },
{ "calInstance1": "HDM" },
{ "calInstance1": "PRPOS" },
{ "calInstance1": "RPOS" },
{ "calInstance1": "SOG" },
{ "calInstance1": "STW" },
{ "calInstance1": "TWA" },
{ "calInstance1": "TWS" },
{ "calInstance1": "TWD" },
{ "calInstance1": "WTemp" } ]
}, },
{ {
"name": "calSlope1", "name": "calSlope1",
@ -763,8 +774,19 @@
"obp60":"true" "obp60":"true"
}, },
"condition": [ "condition": [
{ "calInstance1": ["AWA", "AWS", "COG", "DBT", "HDM", "PRPOS", "RPOS", "SOG", "STW", "TWA", "TWS", "TWD", "WTemp" ] } { "calInstance1": "AWA" },
] { "calInstance1": "AWS" },
{ "calInstance1": "COG" },
{ "calInstance1": "DBT" },
{ "calInstance1": "HDM" },
{ "calInstance1": "PRPOS" },
{ "calInstance1": "RPOS" },
{ "calInstance1": "SOG" },
{ "calInstance1": "STW" },
{ "calInstance1": "TWA" },
{ "calInstance1": "TWS" },
{ "calInstance1": "TWD" },
{ "calInstance1": "WTemp" } ]
}, },
{ {
"name": "calSmooth1", "name": "calSmooth1",
@ -780,8 +802,19 @@
"obp60":"true" "obp60":"true"
}, },
"condition": [ "condition": [
{ "calInstance1": ["AWA", "AWS", "COG", "DBT", "HDM", "PRPOS", "RPOS", "SOG", "STW", "TWA", "TWS", "TWD", "WTemp" ] } { "calInstance1": "AWA" },
] { "calInstance1": "AWS" },
{ "calInstance1": "COG" },
{ "calInstance1": "DBT" },
{ "calInstance1": "HDM" },
{ "calInstance1": "PRPOS" },
{ "calInstance1": "RPOS" },
{ "calInstance1": "SOG" },
{ "calInstance1": "STW" },
{ "calInstance1": "TWA" },
{ "calInstance1": "TWS" },
{ "calInstance1": "TWD" },
{ "calInstance1": "WTemp" } ]
}, },
{ {
"name": "calInstance2", "name": "calInstance2",
@ -821,8 +854,19 @@
"obp60":"true" "obp60":"true"
}, },
"condition": [ "condition": [
{ "calInstance2": ["AWA", "AWS", "COG", "DBT", "HDM", "PRPOS", "RPOS", "SOG", "STW", "TWA", "TWS", "TWD", "WTemp" ] } { "calInstance2": "AWA" },
] { "calInstance2": "AWS" },
{ "calInstance2": "COG" },
{ "calInstance2": "DBT" },
{ "calInstance2": "HDM" },
{ "calInstance2": "PRPOS" },
{ "calInstance2": "RPOS" },
{ "calInstance2": "SOG" },
{ "calInstance2": "STW" },
{ "calInstance2": "TWA" },
{ "calInstance2": "TWS" },
{ "calInstance2": "TWD" },
{ "calInstance2": "WTemp" } ]
}, },
{ {
"name": "calSlope2", "name": "calSlope2",
@ -835,8 +879,19 @@
"obp60":"true" "obp60":"true"
}, },
"condition": [ "condition": [
{ "calInstance2": ["AWA", "AWS", "COG", "DBT", "HDM", "PRPOS", "RPOS", "SOG", "STW", "TWA", "TWS", "TWD", "WTemp" ] } { "calInstance2": "AWA" },
] { "calInstance2": "AWS" },
{ "calInstance2": "COG" },
{ "calInstance2": "DBT" },
{ "calInstance2": "HDM" },
{ "calInstance2": "PRPOS" },
{ "calInstance2": "RPOS" },
{ "calInstance2": "SOG" },
{ "calInstance2": "STW" },
{ "calInstance2": "TWA" },
{ "calInstance2": "TWS" },
{ "calInstance2": "TWD" },
{ "calInstance2": "WTemp" } ]
}, },
{ {
"name": "calSmooth2", "name": "calSmooth2",
@ -852,8 +907,19 @@
"obp60":"true" "obp60":"true"
}, },
"condition": [ "condition": [
{ "calInstance2": ["AWA", "AWS", "COG", "DBT", "HDM", "PRPOS", "RPOS", "SOG", "STW", "TWA", "TWS", "TWD", "WTemp" ] } { "calInstance2": "AWA" },
] { "calInstance2": "AWS" },
{ "calInstance2": "COG" },
{ "calInstance2": "DBT" },
{ "calInstance2": "HDM" },
{ "calInstance2": "PRPOS" },
{ "calInstance2": "RPOS" },
{ "calInstance2": "SOG" },
{ "calInstance2": "STW" },
{ "calInstance2": "TWA" },
{ "calInstance2": "TWS" },
{ "calInstance2": "TWD" },
{ "calInstance2": "WTemp" } ]
}, },
{ {
"name": "calInstance3", "name": "calInstance3",
@ -893,8 +959,19 @@
"obp60":"true" "obp60":"true"
}, },
"condition": [ "condition": [
{ "calInstance3": ["AWA", "AWS", "COG", "DBT", "HDM", "PRPOS", "RPOS", "SOG", "STW", "TWA", "TWS", "TWD", "WTemp" ] } { "calInstance3": "AWA" },
] { "calInstance3": "AWS" },
{ "calInstance3": "COG" },
{ "calInstance3": "DBT" },
{ "calInstance3": "HDM" },
{ "calInstance3": "PRPOS" },
{ "calInstance3": "RPOS" },
{ "calInstance3": "SOG" },
{ "calInstance3": "STW" },
{ "calInstance3": "TWA" },
{ "calInstance3": "TWS" },
{ "calInstance3": "TWD" },
{ "calInstance3": "WTemp" } ]
}, },
{ {
"name": "calSlope3", "name": "calSlope3",
@ -907,8 +984,19 @@
"obp60":"true" "obp60":"true"
}, },
"condition": [ "condition": [
{ "calInstance3": ["AWA", "AWS", "COG", "DBT", "HDM", "PRPOS", "RPOS", "SOG", "STW", "TWA", "TWS", "TWD", "WTemp" ] } { "calInstance3": "AWA" },
] { "calInstance3": "AWS" },
{ "calInstance3": "COG" },
{ "calInstance3": "DBT" },
{ "calInstance3": "HDM" },
{ "calInstance3": "PRPOS" },
{ "calInstance3": "RPOS" },
{ "calInstance3": "SOG" },
{ "calInstance3": "STW" },
{ "calInstance3": "TWA" },
{ "calInstance3": "TWS" },
{ "calInstance3": "TWD" },
{ "calInstance3": "WTemp" } ]
}, },
{ {
"name": "calSmooth3", "name": "calSmooth3",
@ -924,8 +1012,19 @@
"obp60":"true" "obp60":"true"
}, },
"condition": [ "condition": [
{ "calInstance3": ["AWA", "AWS", "COG", "DBT", "HDM", "PRPOS", "RPOS", "SOG", "STW", "TWA", "TWS", "TWD", "WTemp" ] } { "calInstance3": "AWA" },
] { "calInstance3": "AWS" },
{ "calInstance3": "COG" },
{ "calInstance3": "DBT" },
{ "calInstance3": "HDM" },
{ "calInstance3": "PRPOS" },
{ "calInstance3": "RPOS" },
{ "calInstance3": "SOG" },
{ "calInstance3": "STW" },
{ "calInstance3": "TWA" },
{ "calInstance3": "TWS" },
{ "calInstance3": "TWD" },
{ "calInstance3": "WTemp" } ]
}, },
{ {
"name": "display", "name": "display",
@ -1250,14 +1349,12 @@
"list": [ "list": [
"AIS", "AIS",
"Anchor", "Anchor",
"Autopilot",
"BME280", "BME280",
"Battery", "Battery",
"Battery2", "Battery2",
"Clock", "Clock",
"Compass", "Compass",
"DST810", "DST810",
"EPropulsion",
"Fluid", "Fluid",
"FourValues", "FourValues",
"FourValues2", "FourValues2",
@ -1536,14 +1633,12 @@
"list": [ "list": [
"AIS", "AIS",
"Anchor", "Anchor",
"Autopilot",
"BME280", "BME280",
"Battery", "Battery",
"Battery2", "Battery2",
"Clock", "Clock",
"Compass", "Compass",
"DST810", "DST810",
"EPropulsion",
"Fluid", "Fluid",
"FourValues", "FourValues",
"FourValues2", "FourValues2",
@ -1819,14 +1914,12 @@
"list": [ "list": [
"AIS", "AIS",
"Anchor", "Anchor",
"Autopilot",
"BME280", "BME280",
"Battery", "Battery",
"Battery2", "Battery2",
"Clock", "Clock",
"Compass", "Compass",
"DST810", "DST810",
"EPropulsion",
"Fluid", "Fluid",
"FourValues", "FourValues",
"FourValues2", "FourValues2",
@ -2099,14 +2192,12 @@
"list": [ "list": [
"AIS", "AIS",
"Anchor", "Anchor",
"Autopilot",
"BME280", "BME280",
"Battery", "Battery",
"Battery2", "Battery2",
"Clock", "Clock",
"Compass", "Compass",
"DST810", "DST810",
"EPropulsion",
"Fluid", "Fluid",
"FourValues", "FourValues",
"FourValues2", "FourValues2",
@ -2376,14 +2467,12 @@
"list": [ "list": [
"AIS", "AIS",
"Anchor", "Anchor",
"Autopilot",
"BME280", "BME280",
"Battery", "Battery",
"Battery2", "Battery2",
"Clock", "Clock",
"Compass", "Compass",
"DST810", "DST810",
"EPropulsion",
"Fluid", "Fluid",
"FourValues", "FourValues",
"FourValues2", "FourValues2",
@ -2650,14 +2739,12 @@
"list": [ "list": [
"AIS", "AIS",
"Anchor", "Anchor",
"Autopilot",
"BME280", "BME280",
"Battery", "Battery",
"Battery2", "Battery2",
"Clock", "Clock",
"Compass", "Compass",
"DST810", "DST810",
"EPropulsion",
"Fluid", "Fluid",
"FourValues", "FourValues",
"FourValues2", "FourValues2",
@ -2921,14 +3008,12 @@
"list": [ "list": [
"AIS", "AIS",
"Anchor", "Anchor",
"Autopilot",
"BME280", "BME280",
"Battery", "Battery",
"Battery2", "Battery2",
"Clock", "Clock",
"Compass", "Compass",
"DST810", "DST810",
"EPropulsion",
"Fluid", "Fluid",
"FourValues", "FourValues",
"FourValues2", "FourValues2",
@ -3189,14 +3274,12 @@
"list": [ "list": [
"AIS", "AIS",
"Anchor", "Anchor",
"Autopilot",
"BME280", "BME280",
"Battery", "Battery",
"Battery2", "Battery2",
"Clock", "Clock",
"Compass", "Compass",
"DST810", "DST810",
"EPropulsion",
"Fluid", "Fluid",
"FourValues", "FourValues",
"FourValues2", "FourValues2",
@ -3454,14 +3537,12 @@
"list": [ "list": [
"AIS", "AIS",
"Anchor", "Anchor",
"Autopilot",
"BME280", "BME280",
"Battery", "Battery",
"Battery2", "Battery2",
"Clock", "Clock",
"Compass", "Compass",
"DST810", "DST810",
"EPropulsion",
"Fluid", "Fluid",
"FourValues", "FourValues",
"FourValues2", "FourValues2",
@ -3716,14 +3797,12 @@
"list": [ "list": [
"AIS", "AIS",
"Anchor", "Anchor",
"Autopilot",
"BME280", "BME280",
"Battery", "Battery",
"Battery2", "Battery2",
"Clock", "Clock",
"Compass", "Compass",
"DST810", "DST810",
"EPropulsion",
"Fluid", "Fluid",
"FourValues", "FourValues",
"FourValues2", "FourValues2",

155
lib/obp60task/config_obp40.json
View File

@ -760,8 +760,19 @@
"obp40":"true" "obp40":"true"
}, },
"condition": [ "condition": [
{ "calInstance1": ["AWA", "AWS", "COG", "DBT", "HDM", "PRPOS", "RPOS", "SOG", "STW", "TWA", "TWS", "TWD", "WTemp" ] } { "calInstance1": "AWA" },
] { "calInstance1": "AWS" },
{ "calInstance1": "COG" },
{ "calInstance1": "DBT" },
{ "calInstance1": "HDM" },
{ "calInstance1": "PRPOS" },
{ "calInstance1": "RPOS" },
{ "calInstance1": "SOG" },
{ "calInstance1": "STW" },
{ "calInstance1": "TWA" },
{ "calInstance1": "TWS" },
{ "calInstance1": "TWD" },
{ "calInstance1": "WTemp" } ]
}, },
{ {
"name": "calSlope1", "name": "calSlope1",
@ -774,8 +785,19 @@
"obp40":"true" "obp40":"true"
}, },
"condition": [ "condition": [
{ "calInstance1": ["AWA", "AWS", "COG", "DBT", "HDM", "PRPOS", "RPOS", "SOG", "STW", "TWA", "TWS", "TWD", "WTemp" ] } { "calInstance1": "AWA" },
] { "calInstance1": "AWS" },
{ "calInstance1": "COG" },
{ "calInstance1": "DBT" },
{ "calInstance1": "HDM" },
{ "calInstance1": "PRPOS" },
{ "calInstance1": "RPOS" },
{ "calInstance1": "SOG" },
{ "calInstance1": "STW" },
{ "calInstance1": "TWA" },
{ "calInstance1": "TWS" },
{ "calInstance1": "TWD" },
{ "calInstance1": "WTemp" } ]
}, },
{ {
"name": "calSmooth1", "name": "calSmooth1",
@ -791,8 +813,19 @@
"obp40":"true" "obp40":"true"
}, },
"condition": [ "condition": [
{ "calInstance1": ["AWA", "AWS", "COG", "DBT", "HDM", "PRPOS", "RPOS", "SOG", "STW", "TWA", "TWS", "TWD", "WTemp" ] } { "calInstance1": "AWA" },
] { "calInstance1": "AWS" },
{ "calInstance1": "COG" },
{ "calInstance1": "DBT" },
{ "calInstance1": "HDM" },
{ "calInstance1": "PRPOS" },
{ "calInstance1": "RPOS" },
{ "calInstance1": "SOG" },
{ "calInstance1": "STW" },
{ "calInstance1": "TWA" },
{ "calInstance1": "TWS" },
{ "calInstance1": "TWD" },
{ "calInstance1": "WTemp" } ]
}, },
{ {
"name": "calInstance2", "name": "calInstance2",
@ -832,8 +865,19 @@
"obp40":"true" "obp40":"true"
}, },
"condition": [ "condition": [
{ "calInstance2": ["AWA", "AWS", "COG", "DBT", "HDM", "PRPOS", "RPOS", "SOG", "STW", "TWA", "TWS", "TWD", "WTemp" ] } { "calInstance2": "AWA" },
] { "calInstance2": "AWS" },
{ "calInstance2": "COG" },
{ "calInstance2": "DBT" },
{ "calInstance2": "HDM" },
{ "calInstance2": "PRPOS" },
{ "calInstance2": "RPOS" },
{ "calInstance2": "SOG" },
{ "calInstance2": "STW" },
{ "calInstance2": "TWA" },
{ "calInstance2": "TWS" },
{ "calInstance2": "TWD" },
{ "calInstance2": "WTemp" } ]
}, },
{ {
"name": "calSlope2", "name": "calSlope2",
@ -846,8 +890,19 @@
"obp40":"true" "obp40":"true"
}, },
"condition": [ "condition": [
{ "calInstance2": ["AWA", "AWS", "COG", "DBT", "HDM", "PRPOS", "RPOS", "SOG", "STW", "TWA", "TWS", "TWD", "WTemp" ] } { "calInstance2": "AWA" },
] { "calInstance2": "AWS" },
{ "calInstance2": "COG" },
{ "calInstance2": "DBT" },
{ "calInstance2": "HDM" },
{ "calInstance2": "PRPOS" },
{ "calInstance2": "RPOS" },
{ "calInstance2": "SOG" },
{ "calInstance2": "STW" },
{ "calInstance2": "TWA" },
{ "calInstance2": "TWS" },
{ "calInstance2": "TWD" },
{ "calInstance2": "WTemp" } ]
}, },
{ {
"name": "calSmooth2", "name": "calSmooth2",
@ -863,8 +918,19 @@
"obp40":"true" "obp40":"true"
}, },
"condition": [ "condition": [
{ "calInstance2": ["AWA", "AWS", "COG", "DBT", "HDM", "PRPOS", "RPOS", "SOG", "STW", "TWA", "TWS", "TWD", "WTemp" ] } { "calInstance2": "AWA" },
] { "calInstance2": "AWS" },
{ "calInstance2": "COG" },
{ "calInstance2": "DBT" },
{ "calInstance2": "HDM" },
{ "calInstance2": "PRPOS" },
{ "calInstance2": "RPOS" },
{ "calInstance2": "SOG" },
{ "calInstance2": "STW" },
{ "calInstance2": "TWA" },
{ "calInstance2": "TWS" },
{ "calInstance2": "TWD" },
{ "calInstance2": "WTemp" } ]
}, },
{ {
"name": "calInstance3", "name": "calInstance3",
@ -904,8 +970,19 @@
"obp40":"true" "obp40":"true"
}, },
"condition": [ "condition": [
{ "calInstance3": ["AWA", "AWS", "COG", "DBT", "HDM", "PRPOS", "RPOS", "SOG", "STW", "TWA", "TWS", "TWD", "WTemp" ] } { "calInstance3": "AWA" },
] { "calInstance3": "AWS" },
{ "calInstance3": "COG" },
{ "calInstance3": "DBT" },
{ "calInstance3": "HDM" },
{ "calInstance3": "PRPOS" },
{ "calInstance3": "RPOS" },
{ "calInstance3": "SOG" },
{ "calInstance3": "STW" },
{ "calInstance3": "TWA" },
{ "calInstance3": "TWS" },
{ "calInstance3": "TWD" },
{ "calInstance3": "WTemp" } ]
}, },
{ {
"name": "calSlope3", "name": "calSlope3",
@ -918,8 +995,19 @@
"obp40":"true" "obp40":"true"
}, },
"condition": [ "condition": [
{ "calInstance3": ["AWA", "AWS", "COG", "DBT", "HDM", "PRPOS", "RPOS", "SOG", "STW", "TWA", "TWS", "TWD", "WTemp" ] } { "calInstance3": "AWA" },
] { "calInstance3": "AWS" },
{ "calInstance3": "COG" },
{ "calInstance3": "DBT" },
{ "calInstance3": "HDM" },
{ "calInstance3": "PRPOS" },
{ "calInstance3": "RPOS" },
{ "calInstance3": "SOG" },
{ "calInstance3": "STW" },
{ "calInstance3": "TWA" },
{ "calInstance3": "TWS" },
{ "calInstance3": "TWD" },
{ "calInstance3": "WTemp" } ]
}, },
{ {
"name": "calSmooth3", "name": "calSmooth3",
@ -935,8 +1023,19 @@
"obp40":"true" "obp40":"true"
}, },
"condition": [ "condition": [
{ "calInstance3": ["AWA", "AWS", "COG", "DBT", "HDM", "PRPOS", "RPOS", "SOG", "STW", "TWA", "TWS", "TWD", "WTemp" ] } { "calInstance3": "AWA" },
] { "calInstance3": "AWS" },
{ "calInstance3": "COG" },
{ "calInstance3": "DBT" },
{ "calInstance3": "HDM" },
{ "calInstance3": "PRPOS" },
{ "calInstance3": "RPOS" },
{ "calInstance3": "SOG" },
{ "calInstance3": "STW" },
{ "calInstance3": "TWA" },
{ "calInstance3": "TWS" },
{ "calInstance3": "TWD" },
{ "calInstance3": "WTemp" } ]
}, },
{ {
"name": "display", "name": "display",
@ -1273,14 +1372,12 @@
"list": [ "list": [
"AIS", "AIS",
"Anchor", "Anchor",
"Autopilot",
"BME280", "BME280",
"Battery", "Battery",
"Battery2", "Battery2",
"Clock", "Clock",
"Compass", "Compass",
"DST810", "DST810",
"EPropulsion",
"Fluid", "Fluid",
"FourValues", "FourValues",
"FourValues2", "FourValues2",
@ -1559,14 +1656,12 @@
"list": [ "list": [
"AIS", "AIS",
"Anchor", "Anchor",
"Autopilot",
"BME280", "BME280",
"Battery", "Battery",
"Battery2", "Battery2",
"Clock", "Clock",
"Compass", "Compass",
"DST810", "DST810",
"EPropulsion",
"Fluid", "Fluid",
"FourValues", "FourValues",
"FourValues2", "FourValues2",
@ -1842,14 +1937,12 @@
"list": [ "list": [
"AIS", "AIS",
"Anchor", "Anchor",
"Autopilot",
"BME280", "BME280",
"Battery", "Battery",
"Battery2", "Battery2",
"Clock", "Clock",
"Compass", "Compass",
"DST810", "DST810",
"EPropulsion",
"Fluid", "Fluid",
"FourValues", "FourValues",
"FourValues2", "FourValues2",
@ -2122,14 +2215,12 @@
"list": [ "list": [
"AIS", "AIS",
"Anchor", "Anchor",
"Autopilot",
"BME280", "BME280",
"Battery", "Battery",
"Battery2", "Battery2",
"Clock", "Clock",
"Compass", "Compass",
"DST810", "DST810",
"EPropulsion",
"Fluid", "Fluid",
"FourValues", "FourValues",
"FourValues2", "FourValues2",
@ -2399,14 +2490,12 @@
"list": [ "list": [
"AIS", "AIS",
"Anchor", "Anchor",
"Autopilot",
"BME280", "BME280",
"Battery", "Battery",
"Battery2", "Battery2",
"Clock", "Clock",
"Compass", "Compass",
"DST810", "DST810",
"EPropulsion",
"Fluid", "Fluid",
"FourValues", "FourValues",
"FourValues2", "FourValues2",
@ -2673,14 +2762,12 @@
"list": [ "list": [
"AIS", "AIS",
"Anchor", "Anchor",
"Autopilot",
"BME280", "BME280",
"Battery", "Battery",
"Battery2", "Battery2",
"Clock", "Clock",
"Compass", "Compass",
"DST810", "DST810",
"EPropulsion",
"Fluid", "Fluid",
"FourValues", "FourValues",
"FourValues2", "FourValues2",
@ -2944,14 +3031,12 @@
"list": [ "list": [
"AIS", "AIS",
"Anchor", "Anchor",
"Autopilot",
"BME280", "BME280",
"Battery", "Battery",
"Battery2", "Battery2",
"Clock", "Clock",
"Compass", "Compass",
"DST810", "DST810",
"EPropulsion",
"Fluid", "Fluid",
"FourValues", "FourValues",
"FourValues2", "FourValues2",
@ -3212,14 +3297,12 @@
"list": [ "list": [
"AIS", "AIS",
"Anchor", "Anchor",
"Autopilot",
"BME280", "BME280",
"Battery", "Battery",
"Battery2", "Battery2",
"Clock", "Clock",
"Compass", "Compass",
"DST810", "DST810",
"EPropulsion",
"Fluid", "Fluid",
"FourValues", "FourValues",
"FourValues2", "FourValues2",
@ -3477,14 +3560,12 @@
"list": [ "list": [
"AIS", "AIS",
"Anchor", "Anchor",
"Autopilot",
"BME280", "BME280",
"Battery", "Battery",
"Battery2", "Battery2",
"Clock", "Clock",
"Compass", "Compass",
"DST810", "DST810",
"EPropulsion",
"Fluid", "Fluid",
"FourValues", "FourValues",
"FourValues2", "FourValues2",
@ -3739,14 +3820,12 @@
"list": [ "list": [
"AIS", "AIS",
"Anchor", "Anchor",
"Autopilot",
"BME280", "BME280",
"Battery", "Battery",
"Battery2", "Battery2",
"Clock", "Clock",
"Compass", "Compass",
"DST810", "DST810",
"EPropulsion",
"Fluid", "Fluid",
"FourValues", "FourValues",
"FourValues2", "FourValues2",

1
lib/obp60task/extra_task.py
View File

@ -28,3 +28,4 @@ except:
env["CPPDEFINES"].extend([("BOARD", env["BOARD"]), ("EPDTYPE", epdtype), ("PCBVERS", pcbvers), ("GXEPD2VERS", gxepd2vers)]) env["CPPDEFINES"].extend([("BOARD", env["BOARD"]), ("EPDTYPE", epdtype), ("PCBVERS", pcbvers), ("GXEPD2VERS", gxepd2vers)])
print("added hardware info to CPPDEFINES") print("added hardware info to CPPDEFINES")
print("friendly board name is '{}'".format(env.GetProjectOption("board_name")))

12
lib/obp60task/obp60task.cpp
View File

@ -231,12 +231,13 @@ class PageList{
* each page should have defined a registerXXXPage variable of type * each page should have defined a registerXXXPage variable of type
* PageData that describes what it needs * PageData that describes what it needs
*/ */
void registerAllPages(PageList &list){ void registerAllPages(GwLog *logger, PageList &list){
//the next line says that this variable is defined somewhere else //the next line says that this variable is defined somewhere else
//in our case in a separate C++ source file //in our case in a separate C++ source file
//this way this separate source file can be compiled by it's own //this way this separate source file can be compiled by it's own
//and has no access to any of our data except the one that we //and has no access to any of our data except the one that we
//give as a parameter to the page function //give as a parameter to the page function
logger->logDebug(GwLog::LOG, "Memory before registering pages: stack=%d, heap=%d", uxTaskGetStackHighWaterMark(NULL), ESP.getFreeHeap());
extern PageDescription registerPageSystem; extern PageDescription registerPageSystem;
//we add the variable to our list //we add the variable to our list
list.add(&registerPageSystem); list.add(&registerPageSystem);
@ -294,12 +295,9 @@ void registerAllPages(PageList &list){
list.add(&registerPageSkyView); list.add(&registerPageSkyView);
extern PageDescription registerPageAnchor; extern PageDescription registerPageAnchor;
list.add(&registerPageAnchor); list.add(&registerPageAnchor);
/* extern PageDescription registerPageAIS; extern PageDescription registerPageAIS;
list.add(&registerPageAIS); list.add(&registerPageAIS);
extern PageDescription registerPageAutopilot; logger->logDebug(GwLog::LOG,"Memory after registering pages: stack=%d, heap=%d", uxTaskGetStackHighWaterMark(NULL), ESP.getFreeHeap());
list.add(&registerPageAutopilot);
extern PageDescription registerPageEPropulsion;
list.add(&registerPageEPropulsion); */
} }
// Undervoltage detection for shutdown display // Undervoltage detection for shutdown display
@ -492,7 +490,7 @@ void OBP60Task(GwApi *api){
startLedTask(api); startLedTask(api);
#endif #endif
PageList allPages; PageList allPages;
registerAllPages(allPages); registerAllPages(logger, allPages);
CommonData commonData; CommonData commonData;
commonData.logger=logger; commonData.logger=logger;
commonData.config=config; commonData.config=config;

2
lib/obp60task/platformio.ini
View File

@ -16,6 +16,7 @@ board_build.variants_dir = variants
board = obp60_s3_n16r8 #ESP32-S3 N16R8, 16MB flash, 8MB PSRAM, production series board = obp60_s3_n16r8 #ESP32-S3 N16R8, 16MB flash, 8MB PSRAM, production series
#board_build.partitions = default_8MB.csv #ESP32-S3 N8, 8MB flash #board_build.partitions = default_8MB.csv #ESP32-S3 N8, 8MB flash
board_build.partitions = default_16MB.csv #ESP32-S3 N16, 16MB flash board_build.partitions = default_16MB.csv #ESP32-S3 N16, 16MB flash
board_name = OBP60
framework = arduino framework = arduino
lib_deps = lib_deps =
${basedeps.lib_deps} ${basedeps.lib_deps}
@ -66,6 +67,7 @@ platform = espressif32@6.8.1
board_build.variants_dir = variants board_build.variants_dir = variants
board = obp40_s3_n8r8 #ESP32-S3 N8R8, 8MB flash, 8MB PSRAM, OBP60 clone (CrowPanel 4.2) board = obp40_s3_n8r8 #ESP32-S3 N8R8, 8MB flash, 8MB PSRAM, OBP60 clone (CrowPanel 4.2)
board_build.partitions = default_8MB.csv #ESP32-S3 N8, 8MB flash board_build.partitions = default_8MB.csv #ESP32-S3 N8, 8MB flash
board_name = OBP40
custom_config = config_obp40.json custom_config = config_obp40.json
framework = arduino framework = arduino
lib_deps = lib_deps =