From 15674543b6e8be9bb2cbda5c5723af33e002573f Mon Sep 17 00:00:00 2001 From: Thomas Hooge Date: Wed, 6 Aug 2025 11:36:05 +0200 Subject: [PATCH] Some modifications to avoid AP connection problems --- lib/obp60task/OBP60Extensions.cpp | 6 -- lib/obp60task/PageAIS.cpp | 22 +---- lib/obp60task/PageAutopilot.cpp | 14 +-- lib/obp60task/README | 13 ++- lib/obp60task/config.json | 155 ++++++++++++++++++++++-------- lib/obp60task/config_obp40.json | 155 ++++++++++++++++++++++-------- lib/obp60task/extra_task.py | 1 + lib/obp60task/obp60task.cpp | 12 +-- lib/obp60task/platformio.ini | 2 + 9 files changed, 259 insertions(+), 121 deletions(-) diff --git a/lib/obp60task/OBP60Extensions.cpp b/lib/obp60task/OBP60Extensions.cpp index a34aca9..22f2336 100644 --- a/lib/obp60task/OBP60Extensions.cpp +++ b/lib/obp60task/OBP60Extensions.cpp @@ -461,12 +461,6 @@ void displayHeader(CommonData &commonData, bool symbolmode, GwApi::BoatValue *da 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 epd->setTextColor(commonData.fgcolor); epd->setFont(&Ubuntu_Bold8pt8b); diff --git a/lib/obp60task/PageAIS.cpp b/lib/obp60task/PageAIS.cpp index 720cc4a..007ada9 100644 --- a/lib/obp60task/PageAIS.cpp +++ b/lib/obp60task/PageAIS.cpp @@ -3,7 +3,6 @@ #include "Pagedata.h" #include "OBP60Extensions.h" -#include "ConfigMenu.h" /* AIS Overview @@ -12,6 +11,9 @@ - perhaps collision alarm Data: LAT LON SOG HDT + Feature possibilities + - switch between North up / Heading up + */ class PageAIS : public Page @@ -31,9 +33,6 @@ private: int alarm_range = 3; char mode = 'N'; // (N)ormal, (C)onfig - int8_t editmode = -1; // marker for menu/edit/set function - - ConfigMenu *menu; void displayModeNormal(PageData &pageData) { @@ -98,21 +97,8 @@ public: flashLED = config->getString(config->flashLED); 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(){ diff --git a/lib/obp60task/PageAutopilot.cpp b/lib/obp60task/PageAutopilot.cpp index 1379a98..5be8485 100644 --- a/lib/obp60task/PageAutopilot.cpp +++ b/lib/obp60task/PageAutopilot.cpp @@ -3,7 +3,6 @@ #include "Pagedata.h" #include "OBP60Extensions.h" -#include "ConfigMenu.h" /* Autopilot @@ -21,9 +20,6 @@ private: String backlightMode; char mode = 'N'; // (N)ormal, (C)onfig - int8_t editmode = -1; // marker for menu/edit/set function - - ConfigMenu *menu; void displayModeNormal(PageData &pageData) { @@ -142,11 +138,11 @@ static Page *createPage(CommonData &common){ * this will be number of BoatValue pointers in pageData.values */ PageDescription registerPageAutopilot( - "Autopilot", // Page name - createPage, // Action - 0, // Number of bus values depends on selection in Web configuration - {}, // Names of bus values undepends on selection in Web configuration (refer GwBoatData.h) - true // Show display header on/off + "Autopilot", // Page name + createPage, // Action + 0, // Number of bus values depends on selection in Web configuration + {}, // Names of bus values undepends on selection in Web configuration (refer GwBoatData.h) + false // Show display header on/off ); #endif diff --git a/lib/obp60task/README b/lib/obp60task/README index 8e14fc0..1e35f8c 100644 --- a/lib/obp60task/README +++ b/lib/obp60task/README @@ -27,20 +27,23 @@ New pages --------- 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 3. Register new page in /lib/obp60task/obp60task.cpp in function 'registerAllPages' - 4. Add new page in /lib/obp60task/config.json for each page type or add - new page to gen_set.py and run it to auto-generate the relevant - section of config.json + 4. Add new page in /lib/obp60task/config.json for each page type + or use gen_set.py to auto-generate the relevant section of + 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 strings accordingly. E.g. obp60 to obp40. - Using Gitpod ------------ +Warning: You have to register with gitpod! + Open web page: https://gitpod.io/#https://github.com/norbert-walter/esp32-nmea2000-obp60/tree/master/lib/obp60task diff --git a/lib/obp60task/config.json b/lib/obp60task/config.json index c5b6312..f4ce02a 100644 --- a/lib/obp60task/config.json +++ b/lib/obp60task/config.json @@ -749,8 +749,19 @@ "obp60":"true" }, "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", @@ -763,8 +774,19 @@ "obp60":"true" }, "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", @@ -780,8 +802,19 @@ "obp60":"true" }, "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", @@ -821,8 +854,19 @@ "obp60":"true" }, "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", @@ -835,8 +879,19 @@ "obp60":"true" }, "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", @@ -852,8 +907,19 @@ "obp60":"true" }, "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", @@ -893,8 +959,19 @@ "obp60":"true" }, "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", @@ -907,8 +984,19 @@ "obp60":"true" }, "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", @@ -924,8 +1012,19 @@ "obp60":"true" }, "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", @@ -1250,14 +1349,12 @@ "list": [ "AIS", "Anchor", - "Autopilot", "BME280", "Battery", "Battery2", "Clock", "Compass", "DST810", - "EPropulsion", "Fluid", "FourValues", "FourValues2", @@ -1536,14 +1633,12 @@ "list": [ "AIS", "Anchor", - "Autopilot", "BME280", "Battery", "Battery2", "Clock", "Compass", "DST810", - "EPropulsion", "Fluid", "FourValues", "FourValues2", @@ -1819,14 +1914,12 @@ "list": [ "AIS", "Anchor", - "Autopilot", "BME280", "Battery", "Battery2", "Clock", "Compass", "DST810", - "EPropulsion", "Fluid", "FourValues", "FourValues2", @@ -2099,14 +2192,12 @@ "list": [ "AIS", "Anchor", - "Autopilot", "BME280", "Battery", "Battery2", "Clock", "Compass", "DST810", - "EPropulsion", "Fluid", "FourValues", "FourValues2", @@ -2376,14 +2467,12 @@ "list": [ "AIS", "Anchor", - "Autopilot", "BME280", "Battery", "Battery2", "Clock", "Compass", "DST810", - "EPropulsion", "Fluid", "FourValues", "FourValues2", @@ -2650,14 +2739,12 @@ "list": [ "AIS", "Anchor", - "Autopilot", "BME280", "Battery", "Battery2", "Clock", "Compass", "DST810", - "EPropulsion", "Fluid", "FourValues", "FourValues2", @@ -2921,14 +3008,12 @@ "list": [ "AIS", "Anchor", - "Autopilot", "BME280", "Battery", "Battery2", "Clock", "Compass", "DST810", - "EPropulsion", "Fluid", "FourValues", "FourValues2", @@ -3189,14 +3274,12 @@ "list": [ "AIS", "Anchor", - "Autopilot", "BME280", "Battery", "Battery2", "Clock", "Compass", "DST810", - "EPropulsion", "Fluid", "FourValues", "FourValues2", @@ -3454,14 +3537,12 @@ "list": [ "AIS", "Anchor", - "Autopilot", "BME280", "Battery", "Battery2", "Clock", "Compass", "DST810", - "EPropulsion", "Fluid", "FourValues", "FourValues2", @@ -3716,14 +3797,12 @@ "list": [ "AIS", "Anchor", - "Autopilot", "BME280", "Battery", "Battery2", "Clock", "Compass", "DST810", - "EPropulsion", "Fluid", "FourValues", "FourValues2", diff --git a/lib/obp60task/config_obp40.json b/lib/obp60task/config_obp40.json index 58bd3af..638445c 100644 --- a/lib/obp60task/config_obp40.json +++ b/lib/obp60task/config_obp40.json @@ -760,8 +760,19 @@ "obp40":"true" }, "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", @@ -774,8 +785,19 @@ "obp40":"true" }, "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", @@ -791,8 +813,19 @@ "obp40":"true" }, "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", @@ -832,8 +865,19 @@ "obp40":"true" }, "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", @@ -846,8 +890,19 @@ "obp40":"true" }, "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", @@ -863,8 +918,19 @@ "obp40":"true" }, "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", @@ -904,8 +970,19 @@ "obp40":"true" }, "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", @@ -918,8 +995,19 @@ "obp40":"true" }, "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", @@ -935,8 +1023,19 @@ "obp40":"true" }, "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", @@ -1273,14 +1372,12 @@ "list": [ "AIS", "Anchor", - "Autopilot", "BME280", "Battery", "Battery2", "Clock", "Compass", "DST810", - "EPropulsion", "Fluid", "FourValues", "FourValues2", @@ -1559,14 +1656,12 @@ "list": [ "AIS", "Anchor", - "Autopilot", "BME280", "Battery", "Battery2", "Clock", "Compass", "DST810", - "EPropulsion", "Fluid", "FourValues", "FourValues2", @@ -1842,14 +1937,12 @@ "list": [ "AIS", "Anchor", - "Autopilot", "BME280", "Battery", "Battery2", "Clock", "Compass", "DST810", - "EPropulsion", "Fluid", "FourValues", "FourValues2", @@ -2122,14 +2215,12 @@ "list": [ "AIS", "Anchor", - "Autopilot", "BME280", "Battery", "Battery2", "Clock", "Compass", "DST810", - "EPropulsion", "Fluid", "FourValues", "FourValues2", @@ -2399,14 +2490,12 @@ "list": [ "AIS", "Anchor", - "Autopilot", "BME280", "Battery", "Battery2", "Clock", "Compass", "DST810", - "EPropulsion", "Fluid", "FourValues", "FourValues2", @@ -2673,14 +2762,12 @@ "list": [ "AIS", "Anchor", - "Autopilot", "BME280", "Battery", "Battery2", "Clock", "Compass", "DST810", - "EPropulsion", "Fluid", "FourValues", "FourValues2", @@ -2944,14 +3031,12 @@ "list": [ "AIS", "Anchor", - "Autopilot", "BME280", "Battery", "Battery2", "Clock", "Compass", "DST810", - "EPropulsion", "Fluid", "FourValues", "FourValues2", @@ -3212,14 +3297,12 @@ "list": [ "AIS", "Anchor", - "Autopilot", "BME280", "Battery", "Battery2", "Clock", "Compass", "DST810", - "EPropulsion", "Fluid", "FourValues", "FourValues2", @@ -3477,14 +3560,12 @@ "list": [ "AIS", "Anchor", - "Autopilot", "BME280", "Battery", "Battery2", "Clock", "Compass", "DST810", - "EPropulsion", "Fluid", "FourValues", "FourValues2", @@ -3739,14 +3820,12 @@ "list": [ "AIS", "Anchor", - "Autopilot", "BME280", "Battery", "Battery2", "Clock", "Compass", "DST810", - "EPropulsion", "Fluid", "FourValues", "FourValues2", diff --git a/lib/obp60task/extra_task.py b/lib/obp60task/extra_task.py index 28e9980..eada874 100644 --- a/lib/obp60task/extra_task.py +++ b/lib/obp60task/extra_task.py @@ -28,3 +28,4 @@ except: env["CPPDEFINES"].extend([("BOARD", env["BOARD"]), ("EPDTYPE", epdtype), ("PCBVERS", pcbvers), ("GXEPD2VERS", gxepd2vers)]) print("added hardware info to CPPDEFINES") +print("friendly board name is '{}'".format(env.GetProjectOption("board_name"))) diff --git a/lib/obp60task/obp60task.cpp b/lib/obp60task/obp60task.cpp index ce9d8b8..543dd03 100644 --- a/lib/obp60task/obp60task.cpp +++ b/lib/obp60task/obp60task.cpp @@ -231,12 +231,13 @@ class PageList{ * each page should have defined a registerXXXPage variable of type * 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 //in our case in a separate C++ source file //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 //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; //we add the variable to our list list.add(®isterPageSystem); @@ -294,12 +295,9 @@ void registerAllPages(PageList &list){ list.add(®isterPageSkyView); extern PageDescription registerPageAnchor; list.add(®isterPageAnchor); -/* extern PageDescription registerPageAIS; + extern PageDescription registerPageAIS; list.add(®isterPageAIS); - extern PageDescription registerPageAutopilot; - list.add(®isterPageAutopilot); - extern PageDescription registerPageEPropulsion; - list.add(®isterPageEPropulsion); */ + logger->logDebug(GwLog::LOG,"Memory after registering pages: stack=%d, heap=%d", uxTaskGetStackHighWaterMark(NULL), ESP.getFreeHeap()); } // Undervoltage detection for shutdown display @@ -492,7 +490,7 @@ void OBP60Task(GwApi *api){ startLedTask(api); #endif PageList allPages; - registerAllPages(allPages); + registerAllPages(logger, allPages); CommonData commonData; commonData.logger=logger; commonData.config=config; diff --git a/lib/obp60task/platformio.ini b/lib/obp60task/platformio.ini index 16cd23c..77bd525 100644 --- a/lib/obp60task/platformio.ini +++ b/lib/obp60task/platformio.ini @@ -16,6 +16,7 @@ board_build.variants_dir = variants 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_16MB.csv #ESP32-S3 N16, 16MB flash +board_name = OBP60 framework = arduino lib_deps = ${basedeps.lib_deps} @@ -66,6 +67,7 @@ platform = espressif32@6.8.1 board_build.variants_dir = variants 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_name = OBP40 custom_config = config_obp40.json framework = arduino lib_deps =