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

Backup

This commit is contained in:
norbert-walter 2022-04-01 12:44:02 +02:00
parent 591e7a690a
commit b1296061e3
7 changed files with 59 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/obp60task/OBPSensorTask.cpp
View File

@ -53,7 +53,7 @@ void underVoltageDetection(){
undervoltage = false; undervoltage = false;
} }
} }
/*
SensorData calcSunsetSunrise(double time, double date, double latitude, double longitude, int timezone){ SensorData calcSunsetSunrise(double time, double date, double latitude, double longitude, int timezone){
SensorData returnset; SensorData returnset;
SunRise sr; SunRise sr;
@ -67,11 +67,6 @@ SensorData calcSunsetSunrise(double time, double date, double latitude, double l
int intminSR = 0; int intminSR = 0;
int inthrSS = 0; int inthrSS = 0;
int intminSS = 0; int intminSS = 0;
static const int bsize = 6;
char buffer[bsize+1];
buffer[0]=0;
String sSunR = " --- ";
String sSunS = " --- ";
// Calculate local time // Calculate local time
time_t t = (date * secPerYear) + (time + int(timezone * secPerHour)); time_t t = (date * secPerYear) + (time + int(timezone * secPerHour));
@ -85,16 +80,12 @@ SensorData calcSunsetSunrise(double time, double date, double latitude, double l
sunR = (sr.riseTime + int(timezone * secPerHour) + 30) % secPerYear; // add 30 seconds: round to minutes sunR = (sr.riseTime + int(timezone * secPerHour) + 30) % secPerYear; // add 30 seconds: round to minutes
inthrSR = int (sunR / secPerHour); inthrSR = int (sunR / secPerHour);
intminSR = int((sunR - inthrSR * secPerHour)/60); intminSR = int((sunR - inthrSR * secPerHour)/60);
snprintf(buffer,bsize,"%02d:%02d", inthrSR, intminSR);
sSunR = String(buffer);
} }
// Sunset // Sunset
if (sr.hasSet) { if (sr.hasSet) {
sunS = (sr.setTime + int(timezone * secPerHour) + 30) % secPerYear; // add 30 seconds: round to minutes sunS = (sr.setTime + int(timezone * secPerHour) + 30) % secPerYear; // add 30 seconds: round to minutes
inthrSS = int (sunS / secPerHour); inthrSS = int (sunS / secPerHour);
intminSS = int((sunS - inthrSS * secPerHour)/60); intminSS = int((sunS - inthrSS * secPerHour)/60);
snprintf(buffer,bsize,"%02d:%02d", inthrSS, intminSS);
sSunS = String(buffer);
} }
} }
// Return values // Return values
@ -105,6 +96,7 @@ SensorData calcSunsetSunrise(double time, double date, double latitude, double l
// 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); // 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; return returnset;
} }
*/
// Initialization for all sensors (RS232, I2C, 1Wire, IOs) // Initialization for all sensors (RS232, I2C, 1Wire, IOs)
//#################################################################################### //####################################################################################
@ -148,7 +140,7 @@ void sensorTask(void *param){
Timer1.start(); // Start Timer1 for undervoltage detection Timer1.start(); // Start Timer1 for undervoltage detection
} }
Timer2.start(); // Start Timer2 for blinking LED Timer2.start(); // Start Timer2 for blinking LED
/*
// Calculate sunset and sunrise at start time // Calculate sunset and sunrise at start time
double actTime = 0; double actTime = 0;
double actDate = 0; double actDate = 0;
@ -158,7 +150,7 @@ void sensorTask(void *param){
// GwApi::BoatValue *date = boatValues.findValueOrCreate("GPSD"); // Load GpsDate // GwApi::BoatValue *date = boatValues.findValueOrCreate("GPSD"); // Load GpsDate
// GwApi::BoatValue *time = boatValues.findValueOrCreate("GPST"); // Load GpsTime // GwApi::BoatValue *time = boatValues.findValueOrCreate("GPST"); // Load GpsTime
sensors = calcSunsetSunrise(actTime, actDate, actLatitude, actLongitude, actTimeZone); // copy sunrise and sunset to sensor data sensors = calcSunsetSunrise(actTime, actDate, actLatitude, actLongitude, actTimeZone); // copy sunrise and sunset to sensor data
*/
// Settings for NMEA0183 // Settings for NMEA0183
String nmea0183Mode = api->getConfig()->getConfigItem(api->getConfig()->serialDirection, true)->asString(); String nmea0183Mode = api->getConfig()->getConfigItem(api->getConfig()->serialDirection, true)->asString();
api->getLogger()->logDebug(GwLog::LOG, "NMEA0183 Mode is: %s", nmea0183Mode); api->getLogger()->logDebug(GwLog::LOG, "NMEA0183 Mode is: %s", nmea0183Mode);

2
lib/obp60task/PageApparentWind.cpp
View File

@ -197,7 +197,7 @@ static Page *createPage(CommonData &common){
* and will will provide the names of the fixed values we need * and will will provide the names of the fixed values we need
*/ */
PageDescription registerPageApparentWind( PageDescription registerPageApparentWind(
"apparentWind", // Page name "ApparentWind", // 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
{"AWS","AWA"}, // Bus values we need in the page {"AWS","AWA"}, // Bus values we need in the page

2
lib/obp60task/PageOneValue.cpp
View File

@ -150,7 +150,7 @@ 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 registerPageOneValue( PageDescription registerPageOneValue(
"oneValue", // Page name "OneValue", // Page name
createPage, // Action createPage, // Action
1, // Number of bus values depends on selection in Web configuration 1, // Number of bus values depends on selection in Web configuration
true // Show display header on/off true // Show display header on/off

2
lib/obp60task/PageThreeValues.cpp
View File

@ -276,7 +276,7 @@ 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 registerPageThreeValues( PageDescription registerPageThreeValues(
"threeValues", // Page name "ThreeValues", // Page name
createPage, // Action createPage, // Action
3, // Number of bus values depends on selection in Web configuration 3, // Number of bus values depends on selection in Web configuration
true // Show display header on/off true // Show display header on/off

2
lib/obp60task/PageTwoValues.cpp
View File

@ -216,7 +216,7 @@ 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 registerPageTwoValues( PageDescription registerPageTwoValues(
"twoValues", // Page name "TwoValues", // Page name
createPage, // Action createPage, // Action
2, // Number of bus values depends on selection in Web configuration 2, // Number of bus values depends on selection in Web configuration
true // Show display header on/off true // Show display header on/off

98
lib/obp60task/config.json
View File

@ -656,7 +656,7 @@
"type": "list", "type": "list",
"default": "Voltage", "default": "Voltage",
"description": "Type of page for page 1", "description": "Type of page for page 1",
"list":["oneValue","twoValues","threeValues","FourValues","FourValues2","apparentWind","WindRose","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KellPosition","Battery","Battery2"], "list":["OneValue","TwoValues","ThreeValues","FourValues","FourValues2","ApparentWind","WindRose","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KeelPosition","Battery","Battery2"],
"category": "OBP60 Page 1", "category": "OBP60 Page 1",
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"
@ -672,7 +672,7 @@
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"
}, },
"condition":[{"page1type":"oneValue"},{"page1type":"twoValues"},{"page1type":"threeValues"},{"page1type":"FourValues"},{"page1type":"FourValues2"}] "condition":[{"page1type":"OneValue"},{"page1type":"TwoValue"},{"page1type":"ThreeValue"},{"page1type":"FourValues"},{"page1type":"FourValues2"}]
}, },
{ {
"name": "page1value2", "name": "page1value2",
@ -684,7 +684,7 @@
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"
}, },
"condition":[{"page1type":"twoValues"},{"page1type":"threeValues"},{"page1type":"FourValues"},{"page1type":"FourValues2"}] "condition":[{"page1type":"TwoValue"},{"page1type":"ThreeValue"},{"page1type":"FourValues"},{"page1type":"FourValues2"}]
}, },
{ {
"name": "page1value3", "name": "page1value3",
@ -696,7 +696,7 @@
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"
}, },
"condition":[{"page1type":"threeValues"},{"page1type":"FourValues"},{"page1type":"FourValues2"}] "condition":[{"page1type":"ThreeValue"},{"page1type":"FourValues"},{"page1type":"FourValues2"}]
}, },
{ {
"name": "page1value4", "name": "page1value4",
@ -714,9 +714,9 @@
"name": "page2type", "name": "page2type",
"label": "Type", "label": "Type",
"type": "list", "type": "list",
"default": "apparentWind", "default": "ApparentWind",
"description": "Type of page for page 2", "description": "Type of page for page 2",
"list":["oneValue","twoValues","threeValues","FourValues","FourValues2","apparentWind","WindRose","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KellPosition","Battery","Battery2"], "list":["OneValue","TwoValues","ThreeValues","FourValues","FourValues2","ApparentWind","WindRose","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KeelPosition","Battery","Battery2"],
"category": "OBP60 Page 2", "category": "OBP60 Page 2",
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"
@ -733,7 +733,7 @@
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"
}, },
"condition":[{"page2type":"oneValue"},{"page2type":"twoValues"},{"page2type":"threeValues"},{"page2type":"FourValues"},{"page2type":"FourValues2"}] "condition":[{"page2type":"OneValue"},{"page2type":"TwoValue"},{"page2type":"ThreeValue"},{"page2type":"FourValues"},{"page2type":"FourValues2"}]
}, },
{ {
"name": "page2value2", "name": "page2value2",
@ -745,7 +745,7 @@
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"
}, },
"condition":[{"page2type":"twoValues"},{"page2type":"threeValues"},{"page2type":"FourValues"},{"page2type":"FourValues2"}] "condition":[{"page2type":"TwoValue"},{"page2type":"ThreeValue"},{"page2type":"FourValues"},{"page2type":"FourValues2"}]
}, },
{ {
"name": "page2value3", "name": "page2value3",
@ -757,7 +757,7 @@
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"
}, },
"condition":[{"page2type":"threeValues"},{"page2type":"FourValues"},{"page2type":"FourValues2"}] "condition":[{"page2type":"ThreeValue"},{"page2type":"FourValues"},{"page2type":"FourValues2"}]
}, },
{ {
"name": "page2value4", "name": "page2value4",
@ -775,9 +775,9 @@
"name": "page3type", "name": "page3type",
"label": "Type", "label": "Type",
"type": "list", "type": "list",
"default": "oneValue", "default": "OneValue",
"description": "Type of page for page 3", "description": "Type of page for page 3",
"list":["oneValue","twoValues","threeValues","FourValues","FourValues2","apparentWind","WindRose","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KellPosition","Battery","Battery2"], "list":["OneValue","TwoValues","ThreeValues","FourValues","FourValues2","ApparentWind","WindRose","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KeelPosition","Battery","Battery2"],
"category": "OBP60 Page 3", "category": "OBP60 Page 3",
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"
@ -794,7 +794,7 @@
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"
}, },
"condition":[{"page3type":"oneValue"},{"page3type":"twoValues"},{"page3type":"threeValues"},{"page3type":"FourValues"},{"page3type":"FourValues2"}] "condition":[{"page3type":"OneValue"},{"page3type":"TwoValue"},{"page3type":"ThreeValue"},{"page3type":"FourValues"},{"page3type":"FourValues2"}]
}, },
{ {
"name": "page3value2", "name": "page3value2",
@ -806,7 +806,7 @@
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"
}, },
"condition":[{"page3type":"twoValues"},{"page3type":"threeValues"},{"page3type":"FourValues"},{"page3type":"FourValues2"}] "condition":[{"page3type":"TwoValue"},{"page3type":"ThreeValue"},{"page3type":"FourValues"},{"page3type":"FourValues2"}]
}, },
{ {
"name": "page3value3", "name": "page3value3",
@ -818,7 +818,7 @@
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"
}, },
"condition":[{"page3type":"threeValues"},{"page3type":"FourValues"},{"page3type":"FourValues2"}] "condition":[{"page3type":"ThreeValue"},{"page3type":"FourValues"},{"page3type":"FourValues2"}]
}, },
{ {
"name": "page3value4", "name": "page3value4",
@ -836,9 +836,9 @@
"name": "page4type", "name": "page4type",
"label": "Type", "label": "Type",
"type": "list", "type": "list",
"default": "oneValue", "default": "OneValue",
"description": "Type of page for page 4", "description": "Type of page for page 4",
"list":["oneValue","twoValues","threeValues","FourValues","FourValues2","apparentWind","WindRose","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KellPosition","Battery","Battery2"], "list":["OneValue","TwoValues","ThreeValues","FourValues","FourValues2","ApparentWind","WindRose","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KeelPosition","Battery","Battery2"],
"category": "OBP60 Page 4", "category": "OBP60 Page 4",
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"
@ -855,7 +855,7 @@
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"
}, },
"condition":[{"page4type":"oneValue"},{"page4type":"twoValues"},{"page4type":"threeValues"},{"page4type":"FourValues"},{"page4type":"FourValues2"}] "condition":[{"page4type":"OneValue"},{"page4type":"TwoValue"},{"page4type":"ThreeValue"},{"page4type":"FourValues"},{"page4type":"FourValues2"}]
}, },
{ {
"name": "page4value2", "name": "page4value2",
@ -867,7 +867,7 @@
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"
}, },
"condition":[{"page4type":"twoValues"},{"page4type":"threeValues"},{"page4type":"FourValues"},{"page4type":"FourValues2"}] "condition":[{"page4type":"TwoValue"},{"page4type":"ThreeValue"},{"page4type":"FourValues"},{"page4type":"FourValues2"}]
}, },
{ {
"name": "page4value3", "name": "page4value3",
@ -879,7 +879,7 @@
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"
}, },
"condition":[{"page4type":"threeValues"},{"page4type":"FourValues"},{"page4type":"FourValues2"}] "condition":[{"page4type":"ThreeValue"},{"page4type":"FourValues"},{"page4type":"FourValues2"}]
}, },
{ {
"name": "page4value4", "name": "page4value4",
@ -897,9 +897,9 @@
"name": "page5type", "name": "page5type",
"label": "Type", "label": "Type",
"type": "list", "type": "list",
"default": "oneValue", "default": "OneValue",
"description": "Type of page for page 5", "description": "Type of page for page 5",
"list":["oneValue","twoValues","threeValues","FourValues","FourValues2","apparentWind","WindRose","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KellPosition","Battery","Battery2"], "list":["OneValue","TwoValues","ThreeValues","FourValues","FourValues2","ApparentWind","WindRose","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KeelPosition","Battery","Battery2"],
"category": "OBP60 Page 5", "category": "OBP60 Page 5",
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"
@ -916,7 +916,7 @@
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"
}, },
"condition":[{"page5type":"oneValue"},{"page5type":"twoValues"},{"page5type":"threeValues"},{"page5type":"FourValues"},{"page5type":"FourValues2"}] "condition":[{"page5type":"OneValue"},{"page5type":"TwoValue"},{"page5type":"ThreeValue"},{"page5type":"FourValues"},{"page5type":"FourValues2"}]
}, },
{ {
"name": "page5value2", "name": "page5value2",
@ -928,7 +928,7 @@
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"
}, },
"condition":[{"page5type":"twoValues"},{"page5type":"threeValues"},{"page5type":"FourValues"},{"page5type":"FourValues2"}] "condition":[{"page5type":"TwoValue"},{"page5type":"ThreeValue"},{"page5type":"FourValues"},{"page5type":"FourValues2"}]
}, },
{ {
"name": "page5value3", "name": "page5value3",
@ -940,7 +940,7 @@
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"
}, },
"condition":[{"page5type":"threeValues"},{"page5type":"FourValues"},{"page5type":"FourValues2"}] "condition":[{"page5type":"ThreeValue"},{"page5type":"FourValues"},{"page5type":"FourValues2"}]
}, },
{ {
"name": "page5value4", "name": "page5value4",
@ -958,9 +958,9 @@
"name": "page6type", "name": "page6type",
"label": "Type", "label": "Type",
"type": "list", "type": "list",
"default": "oneValue", "default": "OneValue",
"description": "Type of page for page 6", "description": "Type of page for page 6",
"list":["oneValue","twoValues","threeValues","FourValues","FourValues2","apparentWind","WindRose","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KellPosition","Battery","Battery2"], "list":["OneValue","TwoValues","ThreeValues","FourValues","FourValues2","ApparentWind","WindRose","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KeelPosition","Battery","Battery2"],
"category": "OBP60 Page 6", "category": "OBP60 Page 6",
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"
@ -977,7 +977,7 @@
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"
}, },
"condition":[{"page6type":"oneValue"},{"page6type":"twoValues"},{"page6type":"threeValues"},{"page6type":"FourValues"},{"page6type":"FourValues2"}] "condition":[{"page6type":"OneValue"},{"page6type":"TwoValue"},{"page6type":"ThreeValue"},{"page6type":"FourValues"},{"page6type":"FourValues2"}]
}, },
{ {
"name": "page6value2", "name": "page6value2",
@ -989,7 +989,7 @@
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"
}, },
"condition":[{"page6type":"twoValues"},{"page6type":"threeValues"},{"page6type":"FourValues"},{"page6type":"FourValues2"}] "condition":[{"page6type":"TwoValue"},{"page6type":"ThreeValue"},{"page6type":"FourValues"},{"page6type":"FourValues2"}]
}, },
{ {
"name": "page6value3", "name": "page6value3",
@ -1001,7 +1001,7 @@
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"
}, },
"condition":[{"page6type":"threeValues"},{"page6type":"FourValues"},{"page6type":"FourValues2"}] "condition":[{"page6type":"ThreeValue"},{"page6type":"FourValues"},{"page6type":"FourValues2"}]
}, },
{ {
"name": "page6value4", "name": "page6value4",
@ -1019,9 +1019,9 @@
"name": "page7type", "name": "page7type",
"label": "Type", "label": "Type",
"type": "list", "type": "list",
"default": "oneValue", "default": "OneValue",
"description": "Type of page for page 7", "description": "Type of page for page 7",
"list":["oneValue","twoValues","threeValues","FourValues","FourValues2","apparentWind","WindRose","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KellPosition","Battery","Battery2"], "list":["OneValue","TwoValues","ThreeValues","FourValues","FourValues2","ApparentWind","WindRose","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KeelPosition","Battery","Battery2"],
"category": "OBP60 Page 7", "category": "OBP60 Page 7",
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"
@ -1038,7 +1038,7 @@
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"
}, },
"condition":[{"page7type":"oneValue"},{"page7type":"twoValues"},{"page7type":"threeValues"},{"page7type":"FourValues"},{"page7type":"FourValues2"}] "condition":[{"page7type":"OneValue"},{"page7type":"TwoValue"},{"page7type":"ThreeValue"},{"page7type":"FourValues"},{"page7type":"FourValues2"}]
}, },
{ {
"name": "page7value2", "name": "page7value2",
@ -1050,7 +1050,7 @@
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"
}, },
"condition":[{"page7type":"twoValues"},{"page7type":"threeValues"},{"page7type":"FourValues"},{"page7type":"FourValues2"}] "condition":[{"page7type":"TwoValue"},{"page7type":"ThreeValue"},{"page7type":"FourValues"},{"page7type":"FourValues2"}]
}, },
{ {
"name": "page7value3", "name": "page7value3",
@ -1062,7 +1062,7 @@
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"
}, },
"condition":[{"page7type":"threeValues"},{"page7type":"FourValues"},{"page7type":"FourValues2"}] "condition":[{"page7type":"ThreeValue"},{"page7type":"FourValues"},{"page7type":"FourValues2"}]
}, },
{ {
"name": "page7value4", "name": "page7value4",
@ -1080,9 +1080,9 @@
"name": "page8type", "name": "page8type",
"label": "Type", "label": "Type",
"type": "list", "type": "list",
"default": "oneValue", "default": "OneValue",
"description": "Type of page for page 8", "description": "Type of page for page 8",
"list":["oneValue","twoValues","threeValues","FourValues","FourValues2","apparentWind","WindRose","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KellPosition","Battery","Battery2"], "list":["OneValue","TwoValues","ThreeValues","FourValues","FourValues2","ApparentWind","WindRose","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KeelPosition","Battery","Battery2"],
"category": "OBP60 Page 8", "category": "OBP60 Page 8",
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"
@ -1099,7 +1099,7 @@
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"
}, },
"condition":[{"page8type":"oneValue"},{"page8type":"twoValues"},{"page8type":"threeValues"},{"page8type":"FourValues"},{"page8type":"FourValues2"}] "condition":[{"page8type":"OneValue"},{"page8type":"TwoValue"},{"page8type":"ThreeValue"},{"page8type":"FourValues"},{"page8type":"FourValues2"}]
}, },
{ {
"name": "page8value2", "name": "page8value2",
@ -1111,7 +1111,7 @@
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"
}, },
"condition":[{"page8type":"twoValues"},{"page8type":"threeValues"},{"page8type":"FourValues"},{"page8type":"FourValues2"}] "condition":[{"page8type":"TwoValue"},{"page8type":"ThreeValue"},{"page8type":"FourValues"},{"page8type":"FourValues2"}]
}, },
{ {
"name": "page8value3", "name": "page8value3",
@ -1123,7 +1123,7 @@
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"
}, },
"condition":[{"page8type":"threeValues"},{"page8type":"FourValues"},{"page8type":"FourValues2"}] "condition":[{"page8type":"ThreeValue"},{"page8type":"FourValues"},{"page8type":"FourValues2"}]
}, },
{ {
"name": "page8value4", "name": "page8value4",
@ -1141,9 +1141,9 @@
"name": "page9type", "name": "page9type",
"label": "Type", "label": "Type",
"type": "list", "type": "list",
"default": "oneValue", "default": "OneValue",
"description": "Type of page for page 9", "description": "Type of page for page 9",
"list":["oneValue","twoValues","threeValues","FourValues","FourValues2","apparentWind","WindRose","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KellPosition","Battery","Battery2"], "list":["OneValue","TwoValues","ThreeValues","FourValues","FourValues2","ApparentWind","WindRose","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KeelPosition","Battery","Battery2"],
"category": "OBP60 Page 9", "category": "OBP60 Page 9",
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"
@ -1160,7 +1160,7 @@
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"
}, },
"condition":[{"page9type":"oneValue"},{"page9type":"twoValues"},{"page9type":"threeValues"},{"page9type":"FourValues"},{"page9type":"FourValues2"}] "condition":[{"page9type":"OneValue"},{"page9type":"TwoValue"},{"page9type":"ThreeValue"},{"page9type":"FourValues"},{"page9type":"FourValues2"}]
}, },
{ {
"name": "page9value2", "name": "page9value2",
@ -1172,7 +1172,7 @@
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"
}, },
"condition":[{"page9type":"twoValues"},{"page9type":"threeValues"},{"page9type":"FourValues"},{"page9type":"FourValues2"}] "condition":[{"page9type":"TwoValue"},{"page9type":"ThreeValue"},{"page9type":"FourValues"},{"page9type":"FourValues2"}]
}, },
{ {
"name": "page9value3", "name": "page9value3",
@ -1184,7 +1184,7 @@
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"
}, },
"condition":[{"page9type":"threeValues"},{"page9type":"FourValues"},{"page9type":"FourValues2"}] "condition":[{"page9type":"ThreeValue"},{"page9type":"FourValues"},{"page9type":"FourValues2"}]
}, },
{ {
"name": "page9value4", "name": "page9value4",
@ -1202,9 +1202,9 @@
"name": "page10type", "name": "page10type",
"label": "Type", "label": "Type",
"type": "list", "type": "list",
"default": "oneValue", "default": "OneValue",
"description": "Type of page for page 10", "description": "Type of page for page 10",
"list":["oneValue","twoValues","threeValues","FourValues","FourValues2","apparentWind","WindRose","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KellPosition","Battery","Battery2"], "list":["OneValue","TwoValues","ThreeValues","FourValues","FourValues2","ApparentWind","WindRose","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KeelPosition","Battery","Battery2"],
"category": "OBP60 Page 10", "category": "OBP60 Page 10",
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"
@ -1221,7 +1221,7 @@
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"
}, },
"condition":[{"page10type":"oneValue"},{"page10type":"twoValues"},{"page10type":"threeValues"},{"page10type":"FourValues"},{"page10type":"FourValues2"}] "condition":[{"page10type":"OneValue"},{"page10type":"TwoValue"},{"page10type":"ThreeValue"},{"page10type":"FourValues"},{"page10type":"FourValues2"}]
}, },
{ {
"name": "page10value2", "name": "page10value2",
@ -1233,7 +1233,7 @@
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"
}, },
"condition":[{"page10type":"twoValues"},{"page10type":"threeValues"},{"page10type":"FourValues"},{"page10type":"FourValues2"}] "condition":[{"page10type":"TwoValue"},{"page10type":"ThreeValue"},{"page10type":"FourValues"},{"page10type":"FourValues2"}]
}, },
{ {
"name": "page10value3", "name": "page10value3",
@ -1245,7 +1245,7 @@
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"
}, },
"condition":[{"page10type":"threeValues"},{"page10type":"FourValues"},{"page10type":"FourValues2"}] "condition":[{"page10type":"ThreeValue"},{"page10type":"FourValues"},{"page10type":"FourValues2"}]
}, },
{ {
"name": "page10value4", "name": "page10value4",

2
lib/obp60task/obp60task.h
View File

@ -20,7 +20,7 @@ DECLARE_INITFUNCTION(OBP60Init);
// OBP60 Task // OBP60 Task
void OBP60Task(GwApi *param); void OBP60Task(GwApi *param);
DECLARE_USERTASK_PARAM(OBP60Task, 10000) // Need 25k RAM as stack size DECLARE_USERTASK_PARAM(OBP60Task, 10000) // Need 10k RAM as stack size
DECLARE_CAPABILITY(obp60,true); DECLARE_CAPABILITY(obp60,true);
#endif #endif