From 21549cd220450fa638db00751eefc2181505e348 Mon Sep 17 00:00:00 2001 From: norbert-walter Date: Wed, 30 Mar 2022 20:58:02 +0200 Subject: [PATCH] Change typo for pageFourValue (needs a full flash update!) --- lib/obp60task/OBP60Formater.cpp | 1 - lib/obp60task/OBPSensorTask.cpp | 67 +++++++++++- lib/obp60task/OBPSensorTask.h | 1 + .../{PageForValues.cpp => PageFourValues.cpp} | 14 +-- ...PageForValues2.cpp => PageFourValues2.cpp} | 14 +-- lib/obp60task/Pagedata.h | 4 + lib/obp60task/config.json | 100 +++++++++--------- lib/obp60task/obp60task.cpp | 8 +- lib/obp60task/platformio.ini | 1 + 9 files changed, 139 insertions(+), 71 deletions(-) rename lib/obp60task/{PageForValues.cpp => PageFourValues.cpp} (97%) rename lib/obp60task/{PageForValues2.cpp => PageFourValues2.cpp} (96%) diff --git a/lib/obp60task/OBP60Formater.cpp b/lib/obp60task/OBP60Formater.cpp index 9225886..c944fa6 100644 --- a/lib/obp60task/OBP60Formater.cpp +++ b/lib/obp60task/OBP60Formater.cpp @@ -11,7 +11,6 @@ FormatedData formatValue(GwApi::BoatValue *value, CommonData &commondata){ GwLog *logger = commondata.logger; FormatedData result; - static int dayoffset = 0; // Load configuration values diff --git a/lib/obp60task/OBPSensorTask.cpp b/lib/obp60task/OBPSensorTask.cpp index 035b92d..8d5de5e 100644 --- a/lib/obp60task/OBPSensorTask.cpp +++ b/lib/obp60task/OBPSensorTask.cpp @@ -4,8 +4,8 @@ #include // Adafruit Lib for BMP280 #include // Adafruit Lib for BMP085 and BMP180 #include // Lib for SHT21/HTU21 -#include // Lib for magnetic rotation sensor AS5600 -#include "INA226.h" // Lib for power management IC INA226 +#include "AS5600.h" // Lib for magnetic rotation sensor AS5600 +#include // Lib for power management IC INA226 #include // Timer Lib for timer interrupts #include "OBPSensorTask.h" #include "OBP60Hardware.h" @@ -14,6 +14,7 @@ #include "ObpNmea0183.h" #include "OBP60ExtensionPort.h" #include "movingAvg.h" // Lib for moving average building +#include "SunRise.h" // Lib for sunrise and sunset calculation // Timer Interrupts for hardware functions void underVoltageDetection(); @@ -53,6 +54,58 @@ void underVoltageDetection(){ } } +SensorData calcSunsetSunrise(double time, double date, double latitude, double longitude, int timezone){ + SensorData returnset; + SunRise sr; + int secPerHour = 3600; + int secPerYear = 86400; + sr.hasRise = false; + sr.hasSet = false; + time_t sunR = 0; + time_t sunS = 0; + int inthrSR = 0; + int intminSR = 0; + int inthrSS = 0; + int intminSS = 0; + static const int bsize = 6; + char buffer[bsize+1]; + buffer[0]=0; + String sSunR = " --- "; + String sSunS = " --- "; + + // Calculate local time + time_t t = (date * secPerYear) + (time + int(timezone * secPerHour)); + +// api->getLogger()->logDebug(GwLog::DEBUG,"... PageClock: Lat %f, Lon %f, at: %d, next SR: %d (%s), next SS: %d (%s)", latitude, longitude, t, sunR, sSunR, sunS, sSunS); + + if (!isnan(time) && !isnan(date) && !isnan(latitude) && !isnan(longitude) && !isnan(timezone)) { + sr.calculate(latitude, longitude, t); // LAT, LON, EPOCH + // Sunrise + if (sr.hasRise) { + sunR = (sr.riseTime + int(timezone * secPerHour) + 30) % secPerYear; // add 30 seconds: round to minutes + inthrSR = int (sunR / secPerHour); + intminSR = int((sunR - inthrSR * secPerHour)/60); + snprintf(buffer,bsize,"%02d:%02d", inthrSR, intminSR); + sSunR = String(buffer); + } + // Sunset + if (sr.hasSet) { + sunS = (sr.setTime + int(timezone * secPerHour) + 30) % secPerYear; // add 30 seconds: round to minutes + inthrSS = int (sunS / secPerHour); + intminSS = int((sunS - inthrSS * secPerHour)/60); + snprintf(buffer,bsize,"%02d:%02d", inthrSS, intminSS); + sSunS = String(buffer); + } + } + // Return values + returnset.sunsetHour = inthrSS; + returnset.sunsetMinute = intminSS; + returnset.sunriseHour = inthrSR; + returnset.sunriseMinute = intminSR; +// api->getLogger()->logDebug(GwLog::DEBUG,"... PageClock: at t: %d, hasRise: %d, next SR: %d '%s', hasSet: %d, next SS: %d '%s'\n", t, sr.hasRise, sr.riseTime, sSunR, sr.hasSet, sr.setTime, sSunS); + return returnset; +} + // Initialization for all sensors (RS232, I2C, 1Wire, IOs) //#################################################################################### @@ -96,6 +149,16 @@ void sensorTask(void *param){ } Timer2.start(); // Start Timer2 for blinking LED + // Calculate sunset and sunrise at start time + double actTime = 0; + double actDate = 0; + double actLatitude = 53.23; + double actLongitude = 9.16; + int actTimeZone = api->getConfig()->getConfigItem(api->getConfig()->timeZone, true)->asInt(); +// GwApi::BoatValue *date = boatValues.findValueOrCreate("GPSD"); // Load GpsDate +// GwApi::BoatValue *time = boatValues.findValueOrCreate("GPST"); // Load GpsTime + sensors = calcSunsetSunrise(actTime, actDate, actLatitude, actLongitude, actTimeZone); // copy sunrise and sunset to sensor data + // Settings for NMEA0183 String nmea0183Mode = api->getConfig()->getConfigItem(api->getConfig()->serialDirection, true)->asString(); api->getLogger()->logDebug(GwLog::LOG, "NMEA0183 Mode is: %s", nmea0183Mode); diff --git a/lib/obp60task/OBPSensorTask.h b/lib/obp60task/OBPSensorTask.h index 69e8f54..7dd9f24 100644 --- a/lib/obp60task/OBPSensorTask.h +++ b/lib/obp60task/OBPSensorTask.h @@ -26,3 +26,4 @@ class SharedData{ void createSensorTask(SharedData *shared); + diff --git a/lib/obp60task/PageForValues.cpp b/lib/obp60task/PageFourValues.cpp similarity index 97% rename from lib/obp60task/PageForValues.cpp rename to lib/obp60task/PageFourValues.cpp index d1a86f0..e5841fd 100644 --- a/lib/obp60task/PageForValues.cpp +++ b/lib/obp60task/PageFourValues.cpp @@ -3,13 +3,13 @@ #include "Pagedata.h" #include "OBP60ExtensionPort.h" -class PageForValues : public Page +class PageFourValues : public Page { bool keylock = false; // Keylock public: - PageForValues(CommonData &comon){ - comon.logger->logDebug(GwLog::LOG,"Show PageForValues"); + PageFourValues(CommonData &comon){ + comon.logger->logDebug(GwLog::LOG,"Show PageFourValues"); } virtual int handleKey(int key){ @@ -86,7 +86,7 @@ class PageForValues : public Page // Logging boat values if (bvalue1 == NULL) return; - LOG_DEBUG(GwLog::LOG,"Drawing at PageForValues, %s: %f, %s: %f, %s: %f, %s: %f", name1, value1, name2, value2, name3, value3, name4, value4); + LOG_DEBUG(GwLog::LOG,"Drawing at PageFourValues, %s: %f, %s: %f, %s: %f, %s: %f", name1, value1, name2, value2, name3, value3, name4, value4); // Draw page //*********************************************************** @@ -328,7 +328,7 @@ class PageForValues : public Page }; static Page *createPage(CommonData &common){ - return new PageForValues(common); + return new PageFourValues(common); }/** * with the code below we make this page known to the PageTask * we give it a type (name) that can be selected in the config @@ -336,8 +336,8 @@ static Page *createPage(CommonData &common){ * and we provide the number of user parameters we expect * this will be number of BoatValue pointers in pageData.values */ -PageDescription registerPageForValues( - "forValues", // Page name +PageDescription registerPageFourValues( + "FourValues", // Page name createPage, // Action 4, // Number of bus values depends on selection in Web configuration true // Show display header on/off diff --git a/lib/obp60task/PageForValues2.cpp b/lib/obp60task/PageFourValues2.cpp similarity index 96% rename from lib/obp60task/PageForValues2.cpp rename to lib/obp60task/PageFourValues2.cpp index 3cba2b5..4a3680b 100644 --- a/lib/obp60task/PageForValues2.cpp +++ b/lib/obp60task/PageFourValues2.cpp @@ -3,13 +3,13 @@ #include "Pagedata.h" #include "OBP60ExtensionPort.h" -class PageForValues2 : public Page +class PageFourValues2 : public Page { bool keylock = false; // Keylock public: - PageForValues2(CommonData &comon){ - comon.logger->logDebug(GwLog::LOG,"Show PageForValues2"); + PageFourValues2(CommonData &comon){ + comon.logger->logDebug(GwLog::LOG,"Show PageFourValues2"); } virtual int handleKey(int key){ @@ -86,7 +86,7 @@ class PageForValues2 : public Page // Logging boat values if (bvalue1 == NULL) return; - LOG_DEBUG(GwLog::LOG,"Drawing at PageForValues2, %s: %f, %s: %f, %s: %f, %s: %f", name1, value1, name2, value2, name3, value3, name4, value4); + LOG_DEBUG(GwLog::LOG,"Drawing at PageFourValues2, %s: %f, %s: %f, %s: %f, %s: %f", name1, value1, name2, value2, name3, value3, name4, value4); // Draw page //*********************************************************** @@ -328,7 +328,7 @@ class PageForValues2 : public Page }; static Page *createPage(CommonData &common){ - return new PageForValues2(common); + return new PageFourValues2(common); }/** * with the code below we make this page known to the PageTask * we give it a type (name) that can be selected in the config @@ -336,8 +336,8 @@ static Page *createPage(CommonData &common){ * and we provide the number of user parameters we expect * this will be number of BoatValue pointers in pageData.values */ -PageDescription registerPageForValues2( - "forValues2", // Page name +PageDescription registerPageFourValues2( + "FourValues2", // Page name createPage, // Action 4, // Number of bus values depends on selection in Web configuration true // Show display header on/off diff --git a/lib/obp60task/Pagedata.h b/lib/obp60task/Pagedata.h index 63bd44d..892f725 100644 --- a/lib/obp60task/Pagedata.h +++ b/lib/obp60task/Pagedata.h @@ -43,6 +43,10 @@ typedef struct{ double onewireTemp6 = 0; double rotationAngle = 0; // Rotation angle in radiant bool validRotAngle = false; // Valid flag for magnet present + int sunsetHour = 0; + int sunsetMinute = 0; + int sunriseHour = 0; + int sunriseMinute = 0; } SensorData; typedef struct{ diff --git a/lib/obp60task/config.json b/lib/obp60task/config.json index 00fdfb8..fd4ebce 100644 --- a/lib/obp60task/config.json +++ b/lib/obp60task/config.json @@ -656,7 +656,7 @@ "type": "list", "default": "Voltage", "description": "Type of page for page 1", - "list":["oneValue","twoValues","threeValues","forValues","forValues2","apparentWind","WindRose","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KellPosition","Battery"], + "list":["oneValue","twoValues","threeValues","FourValues","FourValues2","apparentWind","WindRose","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KellPosition","Battery"], "category": "OBP60 Page 1", "capabilities": { "obp60":"true" @@ -672,7 +672,7 @@ "capabilities": { "obp60":"true" }, - "condition":[{"page1type":"oneValue"},{"page1type":"twoValues"},{"page1type":"threeValues"},{"page1type":"forValues"},{"page1type":"forValues2"}] + "condition":[{"page1type":"oneValue"},{"page1type":"twoValues"},{"page1type":"threeValues"},{"page1type":"FourValues"},{"page1type":"FourValues2"}] }, { "name": "page1value2", @@ -684,7 +684,7 @@ "capabilities": { "obp60":"true" }, - "condition":[{"page1type":"twoValues"},{"page1type":"threeValues"},{"page1type":"forValues"},{"page1type":"forValues2"}] + "condition":[{"page1type":"twoValues"},{"page1type":"threeValues"},{"page1type":"FourValues"},{"page1type":"FourValues2"}] }, { "name": "page1value3", @@ -696,7 +696,7 @@ "capabilities": { "obp60":"true" }, - "condition":[{"page1type":"threeValues"},{"page1type":"forValues"},{"page1type":"forValues2"}] + "condition":[{"page1type":"threeValues"},{"page1type":"FourValues"},{"page1type":"FourValues2"}] }, { "name": "page1value4", @@ -708,7 +708,7 @@ "capabilities": { "obp60":"true" }, - "condition":[{"page1type":"forValues"},{"page1type":"forValues2"}] + "condition":[{"page1type":"FourValues"},{"page1type":"FourValues2"}] }, { "name": "page2type", @@ -716,7 +716,7 @@ "type": "list", "default": "apparentWind", "description": "Type of page for page 2", - "list":["oneValue","twoValues","threeValues","forValues","forValues2","apparentWind","WindRose","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KellPosition","Battery"], + "list":["oneValue","twoValues","threeValues","FourValues","FourValues2","apparentWind","WindRose","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KellPosition","Battery"], "category": "OBP60 Page 2", "capabilities": { "obp60":"true" @@ -733,7 +733,7 @@ "capabilities": { "obp60":"true" }, - "condition":[{"page2type":"oneValue"},{"page2type":"twoValues"},{"page2type":"threeValues"},{"page2type":"forValues"},{"page2type":"forValues2"}] + "condition":[{"page2type":"oneValue"},{"page2type":"twoValues"},{"page2type":"threeValues"},{"page2type":"FourValues"},{"page2type":"FourValues2"}] }, { "name": "page2value2", @@ -745,7 +745,7 @@ "capabilities": { "obp60":"true" }, - "condition":[{"page2type":"twoValues"},{"page2type":"threeValues"},{"page2type":"forValues"},{"page2type":"forValues2"}] + "condition":[{"page2type":"twoValues"},{"page2type":"threeValues"},{"page2type":"FourValues"},{"page2type":"FourValues2"}] }, { "name": "page2value3", @@ -757,7 +757,7 @@ "capabilities": { "obp60":"true" }, - "condition":[{"page2type":"threeValues"},{"page2type":"forValues"},{"page2type":"forValues2"}] + "condition":[{"page2type":"threeValues"},{"page2type":"FourValues"},{"page2type":"FourValues2"}] }, { "name": "page2value4", @@ -769,7 +769,7 @@ "capabilities": { "obp60":"true" }, - "condition":[{"page2type":"forValues"},{"page2type":"forValues2"}] + "condition":[{"page2type":"FourValues"},{"page2type":"FourValues2"}] }, { "name": "page3type", @@ -777,7 +777,7 @@ "type": "list", "default": "oneValue", "description": "Type of page for page 3", - "list":["oneValue","twoValues","threeValues","forValues","forValues2","apparentWind","WindRose","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KellPosition","Battery"], + "list":["oneValue","twoValues","threeValues","FourValues","FourValues2","apparentWind","WindRose","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KellPosition","Battery"], "category": "OBP60 Page 3", "capabilities": { "obp60":"true" @@ -794,7 +794,7 @@ "capabilities": { "obp60":"true" }, - "condition":[{"page3type":"oneValue"},{"page3type":"twoValues"},{"page3type":"threeValues"},{"page3type":"forValues"},{"page3type":"forValues2"}] + "condition":[{"page3type":"oneValue"},{"page3type":"twoValues"},{"page3type":"threeValues"},{"page3type":"FourValues"},{"page3type":"FourValues2"}] }, { "name": "page3value2", @@ -806,7 +806,7 @@ "capabilities": { "obp60":"true" }, - "condition":[{"page3type":"twoValues"},{"page3type":"threeValues"},{"page3type":"forValues"},{"page3type":"forValues2"}] + "condition":[{"page3type":"twoValues"},{"page3type":"threeValues"},{"page3type":"FourValues"},{"page3type":"FourValues2"}] }, { "name": "page3value3", @@ -818,7 +818,7 @@ "capabilities": { "obp60":"true" }, - "condition":[{"page3type":"threeValues"},{"page3type":"forValues"},{"page3type":"forValues2"}] + "condition":[{"page3type":"threeValues"},{"page3type":"FourValues"},{"page3type":"FourValues2"}] }, { "name": "page3value4", @@ -830,7 +830,7 @@ "capabilities": { "obp60":"true" }, - "condition":[{"page3type":"forValues"},{"page3type":"forValues2"}] + "condition":[{"page3type":"FourValues"},{"page3type":"FourValues2"}] }, { "name": "page4type", @@ -838,7 +838,7 @@ "type": "list", "default": "oneValue", "description": "Type of page for page 4", - "list":["oneValue","twoValues","threeValues","forValues","forValues2","apparentWind","WindRose","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KellPosition","Battery"], + "list":["oneValue","twoValues","threeValues","FourValues","FourValues2","apparentWind","WindRose","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KellPosition","Battery"], "category": "OBP60 Page 4", "capabilities": { "obp60":"true" @@ -855,7 +855,7 @@ "capabilities": { "obp60":"true" }, - "condition":[{"page4type":"oneValue"},{"page4type":"twoValues"},{"page4type":"threeValues"},{"page4type":"forValues"},{"page4type":"forValues2"}] + "condition":[{"page4type":"oneValue"},{"page4type":"twoValues"},{"page4type":"threeValues"},{"page4type":"FourValues"},{"page4type":"FourValues2"}] }, { "name": "page4value2", @@ -867,7 +867,7 @@ "capabilities": { "obp60":"true" }, - "condition":[{"page4type":"twoValues"},{"page4type":"threeValues"},{"page4type":"forValues"},{"page4type":"forValues2"}] + "condition":[{"page4type":"twoValues"},{"page4type":"threeValues"},{"page4type":"FourValues"},{"page4type":"FourValues2"}] }, { "name": "page4value3", @@ -879,7 +879,7 @@ "capabilities": { "obp60":"true" }, - "condition":[{"page4type":"threeValues"},{"page4type":"forValues"},{"page4type":"forValues2"}] + "condition":[{"page4type":"threeValues"},{"page4type":"FourValues"},{"page4type":"FourValues2"}] }, { "name": "page4value4", @@ -891,7 +891,7 @@ "capabilities": { "obp60":"true" }, - "condition":[{"page4type":"forValues"},{"page4type":"forValues2"}] + "condition":[{"page4type":"FourValues"},{"page4type":"FourValues2"}] }, { "name": "page5type", @@ -899,7 +899,7 @@ "type": "list", "default": "oneValue", "description": "Type of page for page 5", - "list":["oneValue","twoValues","threeValues","forValues","forValues2","apparentWind","WindRose","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KellPosition","Battery"], + "list":["oneValue","twoValues","threeValues","FourValues","FourValues2","apparentWind","WindRose","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KellPosition","Battery"], "category": "OBP60 Page 5", "capabilities": { "obp60":"true" @@ -916,7 +916,7 @@ "capabilities": { "obp60":"true" }, - "condition":[{"page5type":"oneValue"},{"page5type":"twoValues"},{"page5type":"threeValues"},{"page5type":"forValues"},{"page5type":"forValues2"}] + "condition":[{"page5type":"oneValue"},{"page5type":"twoValues"},{"page5type":"threeValues"},{"page5type":"FourValues"},{"page5type":"FourValues2"}] }, { "name": "page5value2", @@ -928,7 +928,7 @@ "capabilities": { "obp60":"true" }, - "condition":[{"page5type":"twoValues"},{"page5type":"threeValues"},{"page5type":"forValues"},{"page5type":"forValues2"}] + "condition":[{"page5type":"twoValues"},{"page5type":"threeValues"},{"page5type":"FourValues"},{"page5type":"FourValues2"}] }, { "name": "page5value3", @@ -940,7 +940,7 @@ "capabilities": { "obp60":"true" }, - "condition":[{"page5type":"threeValues"},{"page5type":"forValues"},{"page5type":"forValues2"}] + "condition":[{"page5type":"threeValues"},{"page5type":"FourValues"},{"page5type":"FourValues2"}] }, { "name": "page5value4", @@ -952,7 +952,7 @@ "capabilities": { "obp60":"true" }, - "condition":[{"page5type":"forValues"},{"page5type":"forValues2"}] + "condition":[{"page5type":"FourValues"},{"page5type":"FourValues2"}] }, { "name": "page6type", @@ -960,7 +960,7 @@ "type": "list", "default": "oneValue", "description": "Type of page for page 6", - "list":["oneValue","twoValues","threeValues","forValues","forValues2","apparentWind","WindRose","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KellPosition","Battery"], + "list":["oneValue","twoValues","threeValues","FourValues","FourValues2","apparentWind","WindRose","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KellPosition","Battery"], "category": "OBP60 Page 6", "capabilities": { "obp60":"true" @@ -977,7 +977,7 @@ "capabilities": { "obp60":"true" }, - "condition":[{"page6type":"oneValue"},{"page6type":"twoValues"},{"page6type":"threeValues"},{"page6type":"forValues"},{"page6type":"forValues2"}] + "condition":[{"page6type":"oneValue"},{"page6type":"twoValues"},{"page6type":"threeValues"},{"page6type":"FourValues"},{"page6type":"FourValues2"}] }, { "name": "page6value2", @@ -989,7 +989,7 @@ "capabilities": { "obp60":"true" }, - "condition":[{"page6type":"twoValues"},{"page6type":"threeValues"},{"page6type":"forValues"},{"page6type":"forValues2"}] + "condition":[{"page6type":"twoValues"},{"page6type":"threeValues"},{"page6type":"FourValues"},{"page6type":"FourValues2"}] }, { "name": "page6value3", @@ -1001,7 +1001,7 @@ "capabilities": { "obp60":"true" }, - "condition":[{"page6type":"threeValues"},{"page6type":"forValues"},{"page6type":"forValues2"}] + "condition":[{"page6type":"threeValues"},{"page6type":"FourValues"},{"page6type":"FourValues2"}] }, { "name": "page6value4", @@ -1013,7 +1013,7 @@ "capabilities": { "obp60":"true" }, - "condition":[{"page6type":"forValues"},{"page6type":"forValues2"}] + "condition":[{"page6type":"FourValues"},{"page6type":"FourValues2"}] }, { "name": "page7type", @@ -1021,7 +1021,7 @@ "type": "list", "default": "oneValue", "description": "Type of page for page 7", - "list":["oneValue","twoValues","threeValues","forValues","forValues2","apparentWind","WindRose","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KellPosition","Battery"], + "list":["oneValue","twoValues","threeValues","FourValues","FourValues2","apparentWind","WindRose","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KellPosition","Battery"], "category": "OBP60 Page 7", "capabilities": { "obp60":"true" @@ -1038,7 +1038,7 @@ "capabilities": { "obp60":"true" }, - "condition":[{"page7type":"oneValue"},{"page7type":"twoValues"},{"page7type":"threeValues"},{"page7type":"forValues"},{"page7type":"forValues2"}] + "condition":[{"page7type":"oneValue"},{"page7type":"twoValues"},{"page7type":"threeValues"},{"page7type":"FourValues"},{"page7type":"FourValues2"}] }, { "name": "page7value2", @@ -1050,7 +1050,7 @@ "capabilities": { "obp60":"true" }, - "condition":[{"page7type":"twoValues"},{"page7type":"threeValues"},{"page7type":"forValues"},{"page7type":"forValues2"}] + "condition":[{"page7type":"twoValues"},{"page7type":"threeValues"},{"page7type":"FourValues"},{"page7type":"FourValues2"}] }, { "name": "page7value3", @@ -1062,7 +1062,7 @@ "capabilities": { "obp60":"true" }, - "condition":[{"page7type":"threeValues"},{"page7type":"forValues"},{"page7type":"forValues2"}] + "condition":[{"page7type":"threeValues"},{"page7type":"FourValues"},{"page7type":"FourValues2"}] }, { "name": "page7value4", @@ -1074,7 +1074,7 @@ "capabilities": { "obp60":"true" }, - "condition":[{"page7type":"forValues"},{"page7type":"forValues2"}] + "condition":[{"page7type":"FourValues"},{"page7type":"FourValues2"}] }, { "name": "page8type", @@ -1082,7 +1082,7 @@ "type": "list", "default": "oneValue", "description": "Type of page for page 8", - "list":["oneValue","twoValues","threeValues","forValues","forValues2","apparentWind","WindRose","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KellPosition","Battery"], + "list":["oneValue","twoValues","threeValues","FourValues","FourValues2","apparentWind","WindRose","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KellPosition","Battery"], "category": "OBP60 Page 8", "capabilities": { "obp60":"true" @@ -1099,7 +1099,7 @@ "capabilities": { "obp60":"true" }, - "condition":[{"page8type":"oneValue"},{"page8type":"twoValues"},{"page8type":"threeValues"},{"page8type":"forValues"},{"page8type":"forValues2"}] + "condition":[{"page8type":"oneValue"},{"page8type":"twoValues"},{"page8type":"threeValues"},{"page8type":"FourValues"},{"page8type":"FourValues2"}] }, { "name": "page8value2", @@ -1111,7 +1111,7 @@ "capabilities": { "obp60":"true" }, - "condition":[{"page8type":"twoValues"},{"page8type":"threeValues"},{"page8type":"forValues"},{"page8type":"forValues2"}] + "condition":[{"page8type":"twoValues"},{"page8type":"threeValues"},{"page8type":"FourValues"},{"page8type":"FourValues2"}] }, { "name": "page8value3", @@ -1123,7 +1123,7 @@ "capabilities": { "obp60":"true" }, - "condition":[{"page8type":"threeValues"},{"page8type":"forValues"},{"page8type":"forValues2"}] + "condition":[{"page8type":"threeValues"},{"page8type":"FourValues"},{"page8type":"FourValues2"}] }, { "name": "page8value4", @@ -1135,7 +1135,7 @@ "capabilities": { "obp60":"true" }, - "condition":[{"page8type":"forValues"},{"page8type":"forValues2"}] + "condition":[{"page8type":"FourValues"},{"page8type":"FourValues2"}] }, { "name": "page9type", @@ -1143,7 +1143,7 @@ "type": "list", "default": "oneValue", "description": "Type of page for page 9", - "list":["oneValue","twoValues","threeValues","forValues","forValues2","apparentWind","WindRose","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KellPosition","Battery"], + "list":["oneValue","twoValues","threeValues","FourValues","FourValues2","apparentWind","WindRose","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KellPosition","Battery"], "category": "OBP60 Page 9", "capabilities": { "obp60":"true" @@ -1160,7 +1160,7 @@ "capabilities": { "obp60":"true" }, - "condition":[{"page9type":"oneValue"},{"page9type":"twoValues"},{"page9type":"threeValues"},{"page9type":"forValues"},{"page9type":"forValues2"}] + "condition":[{"page9type":"oneValue"},{"page9type":"twoValues"},{"page9type":"threeValues"},{"page9type":"FourValues"},{"page9type":"FourValues2"}] }, { "name": "page9value2", @@ -1172,7 +1172,7 @@ "capabilities": { "obp60":"true" }, - "condition":[{"page9type":"twoValues"},{"page9type":"threeValues"},{"page9type":"forValues"},{"page9type":"forValues2"}] + "condition":[{"page9type":"twoValues"},{"page9type":"threeValues"},{"page9type":"FourValues"},{"page9type":"FourValues2"}] }, { "name": "page9value3", @@ -1184,7 +1184,7 @@ "capabilities": { "obp60":"true" }, - "condition":[{"page9type":"threeValues"},{"page9type":"forValues"},{"page9type":"forValues2"}] + "condition":[{"page9type":"threeValues"},{"page9type":"FourValues"},{"page9type":"FourValues2"}] }, { "name": "page9value4", @@ -1196,7 +1196,7 @@ "capabilities": { "obp60":"true" }, - "condition":[{"page9type":"forValues"},{"page9type":"forValues2"}] + "condition":[{"page9type":"FourValues"},{"page9type":"FourValues2"}] }, { "name": "page10type", @@ -1204,7 +1204,7 @@ "type": "list", "default": "oneValue", "description": "Type of page for page 10", - "list":["oneValue","twoValues","threeValues","forValues","forValues2","apparentWind","WindRose","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KellPosition","Battery"], + "list":["oneValue","twoValues","threeValues","FourValues","FourValues2","apparentWind","WindRose","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KellPosition","Battery"], "category": "OBP60 Page 10", "capabilities": { "obp60":"true" @@ -1221,7 +1221,7 @@ "capabilities": { "obp60":"true" }, - "condition":[{"page10type":"oneValue"},{"page10type":"twoValues"},{"page10type":"threeValues"},{"page10type":"forValues"},{"page10type":"forValues2"}] + "condition":[{"page10type":"oneValue"},{"page10type":"twoValues"},{"page10type":"threeValues"},{"page10type":"FourValues"},{"page10type":"FourValues2"}] }, { "name": "page10value2", @@ -1233,7 +1233,7 @@ "capabilities": { "obp60":"true" }, - "condition":[{"page10type":"twoValues"},{"page10type":"threeValues"},{"page10type":"forValues"},{"page10type":"forValues2"}] + "condition":[{"page10type":"twoValues"},{"page10type":"threeValues"},{"page10type":"FourValues"},{"page10type":"FourValues2"}] }, { "name": "page10value3", @@ -1245,7 +1245,7 @@ "capabilities": { "obp60":"true" }, - "condition":[{"page10type":"threeValues"},{"page10type":"forValues"},{"page10type":"forValues2"}] + "condition":[{"page10type":"threeValues"},{"page10type":"FourValues"},{"page10type":"FourValues2"}] }, { "name": "page10value4", @@ -1257,6 +1257,6 @@ "capabilities": { "obp60":"true" }, - "condition":[{"page10type":"forValues"},{"page10type":"forValues2"}] + "condition":[{"page10type":"FourValues"},{"page10type":"FourValues2"}] } ] diff --git a/lib/obp60task/obp60task.cpp b/lib/obp60task/obp60task.cpp index ebb9a46..496170b 100644 --- a/lib/obp60task/obp60task.cpp +++ b/lib/obp60task/obp60task.cpp @@ -183,10 +183,10 @@ void registerAllPages(PageList &list){ list.add(®isterPageTwoValues); extern PageDescription registerPageThreeValues; list.add(®isterPageThreeValues); - extern PageDescription registerPageForValues; - list.add(®isterPageForValues); - extern PageDescription registerPageForValues2; - list.add(®isterPageForValues2); + extern PageDescription registerPageFourValues; + list.add(®isterPageFourValues); + extern PageDescription registerPageFourValues2; + list.add(®isterPageFourValues2); extern PageDescription registerPageApparentWind; list.add(®isterPageApparentWind); extern PageDescription registerPageWindRose; diff --git a/lib/obp60task/platformio.ini b/lib/obp60task/platformio.ini index 51c0222..6be9046 100644 --- a/lib/obp60task/platformio.ini +++ b/lib/obp60task/platformio.ini @@ -18,6 +18,7 @@ lib_deps = adafruit/Adafruit BMP085 Library@1.2.1 enjoyneering/HTU21D@1.2.1 robtillaart/INA226@0.2.0 + signetica/SunRise@2.0.2 build_flags= -D BOARD_NODEMCU32S_OBP60 ${env.build_flags}