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

Compare commits

base: thooge:d094bfc32a8d80abe61707abccbb02a456f35ef3
Branches Tags
thooge:master
thooge:obp40
thooge:fonts
thooge:clock
thooge:simulation
thooge:symbols
thooge:system
thooge:skyview
thooge:autopilot
thooge:fluid
thooge:barograph
thooge:r20250120a-obp40
thooge:r20250116a-demo
..
compare: thooge:98c8d44d2f2f64f512b6ea33634ad2ce92dfb3f1
Branches Tags
thooge:obp40
thooge:master
thooge:fonts
thooge:clock
thooge:simulation
thooge:symbols
thooge:system
thooge:skyview
thooge:autopilot
thooge:fluid
thooge:barograph
thooge:r20250120a-obp40
thooge:r20250116a-demo

No commits in common. "d094bfc32a8d80abe61707abccbb02a456f35ef3" and "98c8d44d2f2f64f512b6ea33634ad2ce92dfb3f1" have entirely different histories.
d094bfc32a ... 98c8d44d2f

6 changed files with 35 additions and 1612 deletions
Show Stats Expand all files Collapse all files

16
extra_script.py
View File

@ -10,7 +10,7 @@ from datetime import datetime
import re import re
import pprint import pprint
from platformio.project.config import ProjectConfig from platformio.project.config import ProjectConfig
from platformio.project.exception import InvalidProjectConfError
Import("env") Import("env")
#print(env.Dump()) #print(env.Dump())
@ -104,17 +104,7 @@ def writeFileIfChanged(fileName,data):
return True return True
def mergeConfig(base,other): def mergeConfig(base,other):
try:
customconfig = env.GetProjectOption("custom_config")
except InvalidProjectConfError:
customconfig = None
for bdir in other: for bdir in other:
if customconfig and os.path.exists(os.path.join(bdir,customconfig)):
cname=os.path.join(bdir,customconfig)
print("merge custom config {}".format(cname))
with open(cname,'rb') as ah:
base += json.load(ah)
continue
cname=os.path.join(bdir,"config.json") cname=os.path.join(bdir,"config.json")
if os.path.exists(cname): if os.path.exists(cname):
print("merge config %s"%cname) print("merge config %s"%cname)
@ -284,9 +274,9 @@ class Grove:
def _ss(self,z=False): def _ss(self,z=False):
if z: if z:
return self.name return self.name
return self.name if self.name != 'Z' else '' return self.name if self.name is not 'Z' else ''
def _suffix(self): def _suffix(self):
return '_'+self.name if self.name != 'Z' else '' return '_'+self.name if self.name is not 'Z' else ''
def replace(self,line): def replace(self,line):
if line is None: if line is None:
return line return line

1198
lib/obp60task/DSEG7Classic-BoldItalic26pt7b.h
View File

File diff suppressed because it is too large Load Diff

176
lib/obp60task/PageSixValues.cpp
View File

@ -1,176 +0,0 @@
#if defined BOARD_OBP60S3
#include "Pagedata.h"
#include "OBP60Extensions.h"
#include "DSEG7Classic-BoldItalic26pt7b.h"
extern const GFXfont DSEG7Classic_BoldItalic30pt7b;
const int SixValues_x1 = 5;
const int SixValues_DeltaX = 200;
const int SixValues_y1 = 23;
const int SixValues_DeltaY = 83;
const int HowManyValues = 6;
class PageSixValues : public Page
{
public:
PageSixValues(CommonData &common){
commonData = &common;
common.logger->logDebug(GwLog::LOG,"Instantiate PageSixValues");
}
virtual int handleKey(int key){
// Code for keylock
if(key == 11){
commonData->keylock = !commonData->keylock;
return 0; // Commit the key
}
return key;
}
virtual void displayPage(PageData &pageData){
GwConfigHandler *config = commonData->config;
GwLog *logger = commonData->logger;
// Old values for hold function
static String OldDataText[HowManyValues] = {"", "", "", "", "", ""};
static String OldDataUnits[HowManyValues] = {"", "", "", "", "", ""};
// Get config data
String lengthformat = config->getString(config->lengthFormat);
// bool simulation = config->getBool(config->useSimuData);
bool holdvalues = config->getBool(config->holdvalues);
String flashLED = config->getString(config->flashLED);
String backlightMode = config->getString(config->backlight);
GwApi::BoatValue *bvalue;
String DataName[HowManyValues];
double DataValue[HowManyValues];
bool DataValid[HowManyValues];
String DataText[HowManyValues];
String DataUnits[HowManyValues];
String DataFormat[HowManyValues];
for (int i = 0; i < HowManyValues; i++){
bvalue = pageData.values[i];
DataName[i] = xdrDelete(bvalue->getName());
DataName[i] = DataName[i].substring(0, 6); // String length limit for value name
DataValue[i] = bvalue->value; // Value as double in SI unit
DataValid[i] = bvalue->valid;
DataText[i] = formatValue(bvalue, *commonData).svalue; // Formatted value as string including unit conversion and switching decimal places
DataUnits[i] = formatValue(bvalue, *commonData).unit;
DataFormat[i] = bvalue->getFormat(); // Unit of value
}
// Optical warning by limit violation (unused)
if(String(flashLED) == "Limit Violation"){
setBlinkingLED(false);
setFlashLED(false);
}
if (bvalue == NULL) return;
// Draw page
//***********************************************************
// Set display in partial refresh mode
getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
getdisplay().setTextColor(commonData->fgcolor);
for (int i = 0; i < ( HowManyValues / 2 ); i++){
// Horizontal line 3 pix
getdisplay().fillRect(0, SixValues_y1+i*SixValues_DeltaY, 400, 3, commonData->fgcolor);
for (int j = 0; j < 2; j++){
int ValueIndex = i * 2 + j;
int x0 = SixValues_x1 + j * SixValues_DeltaX;
int y0 = SixValues_y1 + i * SixValues_DeltaY;
LOG_DEBUG(GwLog::LOG,"Drawing at PageSixValue: %d %s %f %s", ValueIndex, DataName[ValueIndex], DataValue[ValueIndex], DataFormat[ValueIndex] );
// Show name
getdisplay().setFont(&Ubuntu_Bold12pt7b);
getdisplay().setCursor(x0, y0+25);
getdisplay().print(DataName[ValueIndex]); // Page name
// Show unit
getdisplay().setFont(&Ubuntu_Bold8pt7b);
getdisplay().setCursor(x0, y0+72);
if(holdvalues == false){
getdisplay().print(DataUnits[ValueIndex]); // Unit
}
else{
getdisplay().print(OldDataUnits[ValueIndex]);
}
// Switch font if format for any values
if(DataFormat[ValueIndex] == "formatLatitude" || DataFormat[ValueIndex] == "formatLongitude"){
getdisplay().setFont(&Ubuntu_Bold12pt7b);
getdisplay().setCursor(x0+10, y0+60);
}
else if(DataFormat[ValueIndex] == "formatTime" || DataFormat[ValueIndex] == "formatDate"){
getdisplay().setFont(&Ubuntu_Bold16pt7b);
getdisplay().setCursor(x0+20,y0+55);
}
// pressure in hPa
else if(DataFormat[ValueIndex] == "formatXdr:P:P"){
getdisplay().setFont(&DSEG7Classic_BoldItalic26pt7b);
getdisplay().setCursor(x0+5, y0+70);
}
// RPM
else if(DataFormat[ValueIndex] == "formatXdr:T:R"){
getdisplay().setFont(&DSEG7Classic_BoldItalic16pt7b);
getdisplay().setCursor(x0+25, y0+70);
}
else{
getdisplay().setFont(&DSEG7Classic_BoldItalic26pt7b);
if ( DataText[ValueIndex][0] == '-' )
getdisplay().setCursor(x0+25, y0+70);
else
getdisplay().setCursor(x0+65, y0+70);
}
// Show bus data
if(holdvalues == false){
getdisplay().print(DataText[ValueIndex]); // Real value as formated string
}
else{
getdisplay().print(OldDataText[ValueIndex]); // Old value as formated string
}
if(DataValid[ValueIndex] == true){
OldDataText[ValueIndex] = DataText[ValueIndex]; // Save the old value
OldDataUnits[ValueIndex] = DataUnits[ValueIndex]; // Save the old unit
}
}
// Vertical line 3 pix
getdisplay().fillRect(SixValues_x1+SixValues_DeltaX-8, SixValues_y1+i*SixValues_DeltaY, 3, SixValues_DeltaY, commonData->fgcolor);
}
getdisplay().fillRect(0, SixValues_y1+3*SixValues_DeltaY, 400, 3, commonData->fgcolor);
// Update display
getdisplay().nextPage(); // Partial update (fast)
};
};
static Page *createPage(CommonData &common){
return new PageSixValues(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
* we define which function is to be called
* and we provide the number of user parameters we expect
* this will be number of BoatValue pointers in pageData.values
*/
PageDescription registerPageSixValues(
"SixValues", // Page name
createPage, // Action
6, // Number of bus values depends on selection in Web configuration
true // Show display header on/off
);
#endif

253
lib/obp60task/config.json
View File

@ -968,7 +968,6 @@
"obp60":"true" "obp60":"true"
} }
}, },
{ {
"name": "page1type", "name": "page1type",
"label": "Type", "label": "Type",
@ -989,7 +988,6 @@
"OneValue", "OneValue",
"RollPitch", "RollPitch",
"RudderPosition", "RudderPosition",
"SixValues",
"Solar", "Solar",
"ThreeValues", "ThreeValues",
"TwoValues", "TwoValues",
@ -1048,9 +1046,6 @@
"obp60": "true" "obp60": "true"
}, },
"condition": [ "condition": [
{
"page1type": "Fluid"
},
{ {
"page1type": "FourValues" "page1type": "FourValues"
}, },
@ -1063,9 +1058,6 @@
{ {
"page1type": "RollPitch" "page1type": "RollPitch"
}, },
{
"page1type": "SixValues"
},
{ {
"page1type": "ThreeValues" "page1type": "ThreeValues"
}, },
@ -1074,6 +1066,9 @@
}, },
{ {
"page1type": "WindRoseFlex" "page1type": "WindRoseFlex"
},
{
"page1type": "Fluid"
} }
] ]
}, },
@ -1097,9 +1092,6 @@
{ {
"page1type": "RollPitch" "page1type": "RollPitch"
}, },
{
"page1type": "SixValues"
},
{ {
"page1type": "ThreeValues" "page1type": "ThreeValues"
}, },
@ -1128,9 +1120,6 @@
{ {
"page1type": "FourValues2" "page1type": "FourValues2"
}, },
{
"page1type": "SixValues"
},
{ {
"page1type": "ThreeValues" "page1type": "ThreeValues"
}, },
@ -1156,9 +1145,6 @@
{ {
"page1type": "FourValues2" "page1type": "FourValues2"
}, },
{
"page1type": "SixValues"
},
{ {
"page1type": "WindRoseFlex" "page1type": "WindRoseFlex"
} }
@ -1175,9 +1161,6 @@
"obp60": "true" "obp60": "true"
}, },
"condition": [ "condition": [
{
"page1type": "SixValues"
},
{ {
"page1type": "WindRoseFlex" "page1type": "WindRoseFlex"
} }
@ -1194,9 +1177,6 @@
"obp60": "true" "obp60": "true"
}, },
"condition": [ "condition": [
{
"page1type": "SixValues"
},
{ {
"page1type": "WindRoseFlex" "page1type": "WindRoseFlex"
} }
@ -1268,7 +1248,6 @@
"OneValue", "OneValue",
"RollPitch", "RollPitch",
"RudderPosition", "RudderPosition",
"SixValues",
"Solar", "Solar",
"ThreeValues", "ThreeValues",
"TwoValues", "TwoValues",
@ -1324,9 +1303,6 @@
"obp60": "true" "obp60": "true"
}, },
"condition": [ "condition": [
{
"page2type": "Fluid"
},
{ {
"page2type": "FourValues" "page2type": "FourValues"
}, },
@ -1339,9 +1315,6 @@
{ {
"page2type": "RollPitch" "page2type": "RollPitch"
}, },
{
"page2type": "SixValues"
},
{ {
"page2type": "ThreeValues" "page2type": "ThreeValues"
}, },
@ -1350,7 +1323,11 @@
}, },
{ {
"page2type": "WindRoseFlex" "page2type": "WindRoseFlex"
},
{
"page2type": "Fluid"
} }
] ]
}, },
{ {
@ -1373,9 +1350,6 @@
{ {
"page2type": "RollPitch" "page2type": "RollPitch"
}, },
{
"page2type": "SixValues"
},
{ {
"page2type": "ThreeValues" "page2type": "ThreeValues"
}, },
@ -1404,9 +1378,6 @@
{ {
"page2type": "FourValues2" "page2type": "FourValues2"
}, },
{
"page2type": "SixValues"
},
{ {
"page2type": "ThreeValues" "page2type": "ThreeValues"
}, },
@ -1432,9 +1403,6 @@
{ {
"page2type": "FourValues2" "page2type": "FourValues2"
}, },
{
"page2type": "SixValues"
},
{ {
"page2type": "WindRoseFlex" "page2type": "WindRoseFlex"
} }
@ -1451,9 +1419,6 @@
"obp60": "true" "obp60": "true"
}, },
"condition": [ "condition": [
{
"page2type": "SixValues"
},
{ {
"page2type": "WindRoseFlex" "page2type": "WindRoseFlex"
} }
@ -1470,9 +1435,6 @@
"obp60": "true" "obp60": "true"
}, },
"condition": [ "condition": [
{
"page2type": "SixValues"
},
{ {
"page2type": "WindRoseFlex" "page2type": "WindRoseFlex"
} }
@ -1544,7 +1506,6 @@
"OneValue", "OneValue",
"RollPitch", "RollPitch",
"RudderPosition", "RudderPosition",
"SixValues",
"Solar", "Solar",
"ThreeValues", "ThreeValues",
"TwoValues", "TwoValues",
@ -1597,9 +1558,6 @@
"obp60": "true" "obp60": "true"
}, },
"condition": [ "condition": [
{
"page3type": "Fluid"
},
{ {
"page3type": "FourValues" "page3type": "FourValues"
}, },
@ -1612,9 +1570,6 @@
{ {
"page3type": "RollPitch" "page3type": "RollPitch"
}, },
{
"page3type": "SixValues"
},
{ {
"page3type": "ThreeValues" "page3type": "ThreeValues"
}, },
@ -1623,6 +1578,9 @@
}, },
{ {
"page3type": "WindRoseFlex" "page3type": "WindRoseFlex"
},
{
"page3type": "Fluid"
} }
] ]
}, },
@ -1646,9 +1604,6 @@
{ {
"page3type": "RollPitch" "page3type": "RollPitch"
}, },
{
"page3type": "SixValues"
},
{ {
"page3type": "ThreeValues" "page3type": "ThreeValues"
}, },
@ -1677,9 +1632,6 @@
{ {
"page3type": "FourValues2" "page3type": "FourValues2"
}, },
{
"page3type": "SixValues"
},
{ {
"page3type": "ThreeValues" "page3type": "ThreeValues"
}, },
@ -1705,9 +1657,6 @@
{ {
"page3type": "FourValues2" "page3type": "FourValues2"
}, },
{
"page3type": "SixValues"
},
{ {
"page3type": "WindRoseFlex" "page3type": "WindRoseFlex"
} }
@ -1724,9 +1673,6 @@
"obp60": "true" "obp60": "true"
}, },
"condition": [ "condition": [
{
"page3type": "SixValues"
},
{ {
"page3type": "WindRoseFlex" "page3type": "WindRoseFlex"
} }
@ -1743,9 +1689,6 @@
"obp60": "true" "obp60": "true"
}, },
"condition": [ "condition": [
{
"page3type": "SixValues"
},
{ {
"page3type": "WindRoseFlex" "page3type": "WindRoseFlex"
} }
@ -1817,7 +1760,6 @@
"OneValue", "OneValue",
"RollPitch", "RollPitch",
"RudderPosition", "RudderPosition",
"SixValues",
"Solar", "Solar",
"ThreeValues", "ThreeValues",
"TwoValues", "TwoValues",
@ -1867,9 +1809,6 @@
"obp60": "true" "obp60": "true"
}, },
"condition": [ "condition": [
{
"page4type": "Fluid"
},
{ {
"page4type": "FourValues" "page4type": "FourValues"
}, },
@ -1882,9 +1821,6 @@
{ {
"page4type": "RollPitch" "page4type": "RollPitch"
}, },
{
"page4type": "SixValues"
},
{ {
"page4type": "ThreeValues" "page4type": "ThreeValues"
}, },
@ -1893,6 +1829,9 @@
}, },
{ {
"page4type": "WindRoseFlex" "page4type": "WindRoseFlex"
},
{
"page4type": "Fluid"
} }
] ]
}, },
@ -1916,9 +1855,6 @@
{ {
"page4type": "RollPitch" "page4type": "RollPitch"
}, },
{
"page4type": "SixValues"
},
{ {
"page4type": "ThreeValues" "page4type": "ThreeValues"
}, },
@ -1947,9 +1883,6 @@
{ {
"page4type": "FourValues2" "page4type": "FourValues2"
}, },
{
"page4type": "SixValues"
},
{ {
"page4type": "ThreeValues" "page4type": "ThreeValues"
}, },
@ -1975,9 +1908,6 @@
{ {
"page4type": "FourValues2" "page4type": "FourValues2"
}, },
{
"page4type": "SixValues"
},
{ {
"page4type": "WindRoseFlex" "page4type": "WindRoseFlex"
} }
@ -1994,9 +1924,6 @@
"obp60": "true" "obp60": "true"
}, },
"condition": [ "condition": [
{
"page4type": "SixValues"
},
{ {
"page4type": "WindRoseFlex" "page4type": "WindRoseFlex"
} }
@ -2013,9 +1940,6 @@
"obp60": "true" "obp60": "true"
}, },
"condition": [ "condition": [
{
"page4type": "SixValues"
},
{ {
"page4type": "WindRoseFlex" "page4type": "WindRoseFlex"
} }
@ -2087,7 +2011,6 @@
"OneValue", "OneValue",
"RollPitch", "RollPitch",
"RudderPosition", "RudderPosition",
"SixValues",
"Solar", "Solar",
"ThreeValues", "ThreeValues",
"TwoValues", "TwoValues",
@ -2134,9 +2057,6 @@
"obp60": "true" "obp60": "true"
}, },
"condition": [ "condition": [
{
"page5type": "Fluid"
},
{ {
"page5type": "FourValues" "page5type": "FourValues"
}, },
@ -2149,9 +2069,6 @@
{ {
"page5type": "RollPitch" "page5type": "RollPitch"
}, },
{
"page5type": "SixValues"
},
{ {
"page5type": "ThreeValues" "page5type": "ThreeValues"
}, },
@ -2160,6 +2077,9 @@
}, },
{ {
"page5type": "WindRoseFlex" "page5type": "WindRoseFlex"
},
{
"page5type": "Fluid"
} }
] ]
}, },
@ -2183,9 +2103,6 @@
{ {
"page5type": "RollPitch" "page5type": "RollPitch"
}, },
{
"page5type": "SixValues"
},
{ {
"page5type": "ThreeValues" "page5type": "ThreeValues"
}, },
@ -2214,9 +2131,6 @@
{ {
"page5type": "FourValues2" "page5type": "FourValues2"
}, },
{
"page5type": "SixValues"
},
{ {
"page5type": "ThreeValues" "page5type": "ThreeValues"
}, },
@ -2242,9 +2156,6 @@
{ {
"page5type": "FourValues2" "page5type": "FourValues2"
}, },
{
"page5type": "SixValues"
},
{ {
"page5type": "WindRoseFlex" "page5type": "WindRoseFlex"
} }
@ -2261,9 +2172,6 @@
"obp60": "true" "obp60": "true"
}, },
"condition": [ "condition": [
{
"page5type": "SixValues"
},
{ {
"page5type": "WindRoseFlex" "page5type": "WindRoseFlex"
} }
@ -2280,9 +2188,6 @@
"obp60": "true" "obp60": "true"
}, },
"condition": [ "condition": [
{
"page5type": "SixValues"
},
{ {
"page5type": "WindRoseFlex" "page5type": "WindRoseFlex"
} }
@ -2354,7 +2259,6 @@
"OneValue", "OneValue",
"RollPitch", "RollPitch",
"RudderPosition", "RudderPosition",
"SixValues",
"Solar", "Solar",
"ThreeValues", "ThreeValues",
"TwoValues", "TwoValues",
@ -2398,9 +2302,6 @@
"obp60": "true" "obp60": "true"
}, },
"condition": [ "condition": [
{
"page6type": "Fluid"
},
{ {
"page6type": "FourValues" "page6type": "FourValues"
}, },
@ -2413,9 +2314,6 @@
{ {
"page6type": "RollPitch" "page6type": "RollPitch"
}, },
{
"page6type": "SixValues"
},
{ {
"page6type": "ThreeValues" "page6type": "ThreeValues"
}, },
@ -2424,6 +2322,9 @@
}, },
{ {
"page6type": "WindRoseFlex" "page6type": "WindRoseFlex"
},
{
"page6type": "Fluid"
} }
] ]
}, },
@ -2447,9 +2348,6 @@
{ {
"page6type": "RollPitch" "page6type": "RollPitch"
}, },
{
"page6type": "SixValues"
},
{ {
"page6type": "ThreeValues" "page6type": "ThreeValues"
}, },
@ -2478,9 +2376,6 @@
{ {
"page6type": "FourValues2" "page6type": "FourValues2"
}, },
{
"page6type": "SixValues"
},
{ {
"page6type": "ThreeValues" "page6type": "ThreeValues"
}, },
@ -2506,9 +2401,6 @@
{ {
"page6type": "FourValues2" "page6type": "FourValues2"
}, },
{
"page6type": "SixValues"
},
{ {
"page6type": "WindRoseFlex" "page6type": "WindRoseFlex"
} }
@ -2525,9 +2417,6 @@
"obp60": "true" "obp60": "true"
}, },
"condition": [ "condition": [
{
"page6type": "SixValues"
},
{ {
"page6type": "WindRoseFlex" "page6type": "WindRoseFlex"
} }
@ -2544,9 +2433,6 @@
"obp60": "true" "obp60": "true"
}, },
"condition": [ "condition": [
{
"page6type": "SixValues"
},
{ {
"page6type": "WindRoseFlex" "page6type": "WindRoseFlex"
} }
@ -2618,7 +2504,6 @@
"OneValue", "OneValue",
"RollPitch", "RollPitch",
"RudderPosition", "RudderPosition",
"SixValues",
"Solar", "Solar",
"ThreeValues", "ThreeValues",
"TwoValues", "TwoValues",
@ -2659,9 +2544,6 @@
"obp60": "true" "obp60": "true"
}, },
"condition": [ "condition": [
{
"page7type": "Fluid"
},
{ {
"page7type": "FourValues" "page7type": "FourValues"
}, },
@ -2674,9 +2556,6 @@
{ {
"page7type": "RollPitch" "page7type": "RollPitch"
}, },
{
"page7type": "SixValues"
},
{ {
"page7type": "ThreeValues" "page7type": "ThreeValues"
}, },
@ -2685,6 +2564,9 @@
}, },
{ {
"page7type": "WindRoseFlex" "page7type": "WindRoseFlex"
},
{
"page7type": "Fluid"
} }
] ]
}, },
@ -2708,9 +2590,6 @@
{ {
"page7type": "RollPitch" "page7type": "RollPitch"
}, },
{
"page7type": "SixValues"
},
{ {
"page7type": "ThreeValues" "page7type": "ThreeValues"
}, },
@ -2739,9 +2618,6 @@
{ {
"page7type": "FourValues2" "page7type": "FourValues2"
}, },
{
"page7type": "SixValues"
},
{ {
"page7type": "ThreeValues" "page7type": "ThreeValues"
}, },
@ -2767,9 +2643,6 @@
{ {
"page7type": "FourValues2" "page7type": "FourValues2"
}, },
{
"page7type": "SixValues"
},
{ {
"page7type": "WindRoseFlex" "page7type": "WindRoseFlex"
} }
@ -2786,9 +2659,6 @@
"obp60": "true" "obp60": "true"
}, },
"condition": [ "condition": [
{
"page7type": "SixValues"
},
{ {
"page7type": "WindRoseFlex" "page7type": "WindRoseFlex"
} }
@ -2805,9 +2675,6 @@
"obp60": "true" "obp60": "true"
}, },
"condition": [ "condition": [
{
"page7type": "SixValues"
},
{ {
"page7type": "WindRoseFlex" "page7type": "WindRoseFlex"
} }
@ -2879,7 +2746,6 @@
"OneValue", "OneValue",
"RollPitch", "RollPitch",
"RudderPosition", "RudderPosition",
"SixValues",
"Solar", "Solar",
"ThreeValues", "ThreeValues",
"TwoValues", "TwoValues",
@ -2917,9 +2783,6 @@
"obp60": "true" "obp60": "true"
}, },
"condition": [ "condition": [
{
"page8type": "Fluid"
},
{ {
"page8type": "FourValues" "page8type": "FourValues"
}, },
@ -2932,9 +2795,6 @@
{ {
"page8type": "RollPitch" "page8type": "RollPitch"
}, },
{
"page8type": "SixValues"
},
{ {
"page8type": "ThreeValues" "page8type": "ThreeValues"
}, },
@ -2943,6 +2803,9 @@
}, },
{ {
"page8type": "WindRoseFlex" "page8type": "WindRoseFlex"
},
{
"page8type": "Fluid"
} }
] ]
}, },
@ -2966,9 +2829,6 @@
{ {
"page8type": "RollPitch" "page8type": "RollPitch"
}, },
{
"page8type": "SixValues"
},
{ {
"page8type": "ThreeValues" "page8type": "ThreeValues"
}, },
@ -2997,9 +2857,6 @@
{ {
"page8type": "FourValues2" "page8type": "FourValues2"
}, },
{
"page8type": "SixValues"
},
{ {
"page8type": "ThreeValues" "page8type": "ThreeValues"
}, },
@ -3025,9 +2882,6 @@
{ {
"page8type": "FourValues2" "page8type": "FourValues2"
}, },
{
"page8type": "SixValues"
},
{ {
"page8type": "WindRoseFlex" "page8type": "WindRoseFlex"
} }
@ -3044,9 +2898,6 @@
"obp60": "true" "obp60": "true"
}, },
"condition": [ "condition": [
{
"page8type": "SixValues"
},
{ {
"page8type": "WindRoseFlex" "page8type": "WindRoseFlex"
} }
@ -3063,9 +2914,6 @@
"obp60": "true" "obp60": "true"
}, },
"condition": [ "condition": [
{
"page8type": "SixValues"
},
{ {
"page8type": "WindRoseFlex" "page8type": "WindRoseFlex"
} }
@ -3137,7 +2985,6 @@
"OneValue", "OneValue",
"RollPitch", "RollPitch",
"RudderPosition", "RudderPosition",
"SixValues",
"Solar", "Solar",
"ThreeValues", "ThreeValues",
"TwoValues", "TwoValues",
@ -3172,9 +3019,6 @@
"obp60": "true" "obp60": "true"
}, },
"condition": [ "condition": [
{
"page9type": "Fluid"
},
{ {
"page9type": "FourValues" "page9type": "FourValues"
}, },
@ -3187,9 +3031,6 @@
{ {
"page9type": "RollPitch" "page9type": "RollPitch"
}, },
{
"page9type": "SixValues"
},
{ {
"page9type": "ThreeValues" "page9type": "ThreeValues"
}, },
@ -3198,6 +3039,9 @@
}, },
{ {
"page9type": "WindRoseFlex" "page9type": "WindRoseFlex"
},
{
"page9type": "Fluid"
} }
] ]
}, },
@ -3221,9 +3065,6 @@
{ {
"page9type": "RollPitch" "page9type": "RollPitch"
}, },
{
"page9type": "SixValues"
},
{ {
"page9type": "ThreeValues" "page9type": "ThreeValues"
}, },
@ -3252,9 +3093,6 @@
{ {
"page9type": "FourValues2" "page9type": "FourValues2"
}, },
{
"page9type": "SixValues"
},
{ {
"page9type": "ThreeValues" "page9type": "ThreeValues"
}, },
@ -3280,9 +3118,6 @@
{ {
"page9type": "FourValues2" "page9type": "FourValues2"
}, },
{
"page9type": "SixValues"
},
{ {
"page9type": "WindRoseFlex" "page9type": "WindRoseFlex"
} }
@ -3299,9 +3134,6 @@
"obp60": "true" "obp60": "true"
}, },
"condition": [ "condition": [
{
"page9type": "SixValues"
},
{ {
"page9type": "WindRoseFlex" "page9type": "WindRoseFlex"
} }
@ -3318,9 +3150,6 @@
"obp60": "true" "obp60": "true"
}, },
"condition": [ "condition": [
{
"page9type": "SixValues"
},
{ {
"page9type": "WindRoseFlex" "page9type": "WindRoseFlex"
} }
@ -3392,7 +3221,6 @@
"OneValue", "OneValue",
"RollPitch", "RollPitch",
"RudderPosition", "RudderPosition",
"SixValues",
"Solar", "Solar",
"ThreeValues", "ThreeValues",
"TwoValues", "TwoValues",
@ -3424,9 +3252,6 @@
"obp60": "true" "obp60": "true"
}, },
"condition": [ "condition": [
{
"page10type": "Fluid"
},
{ {
"page10type": "FourValues" "page10type": "FourValues"
}, },
@ -3439,9 +3264,6 @@
{ {
"page10type": "RollPitch" "page10type": "RollPitch"
}, },
{
"page10type": "SixValues"
},
{ {
"page10type": "ThreeValues" "page10type": "ThreeValues"
}, },
@ -3450,6 +3272,9 @@
}, },
{ {
"page10type": "WindRoseFlex" "page10type": "WindRoseFlex"
},
{
"page10type": "Fluid"
} }
] ]
}, },
@ -3473,9 +3298,6 @@
{ {
"page10type": "RollPitch" "page10type": "RollPitch"
}, },
{
"page10type": "SixValues"
},
{ {
"page10type": "ThreeValues" "page10type": "ThreeValues"
}, },
@ -3504,9 +3326,6 @@
{ {
"page10type": "FourValues2" "page10type": "FourValues2"
}, },
{
"page10type": "SixValues"
},
{ {
"page10type": "ThreeValues" "page10type": "ThreeValues"
}, },
@ -3532,9 +3351,6 @@
{ {
"page10type": "FourValues2" "page10type": "FourValues2"
}, },
{
"page10type": "SixValues"
},
{ {
"page10type": "WindRoseFlex" "page10type": "WindRoseFlex"
} }
@ -3551,9 +3367,6 @@
"obp60": "true" "obp60": "true"
}, },
"condition": [ "condition": [
{
"page10type": "SixValues"
},
{ {
"page10type": "WindRoseFlex" "page10type": "WindRoseFlex"
} }
@ -3570,9 +3383,6 @@
"obp60": "true" "obp60": "true"
}, },
"condition": [ "condition": [
{
"page10type": "SixValues"
},
{ {
"page10type": "WindRoseFlex" "page10type": "WindRoseFlex"
} }
@ -3625,4 +3435,3 @@
] ]
} }
] ]

2
lib/obp60task/gen_set.py
View File

@ -31,7 +31,7 @@ no_of_fields_per_page = {
"WhitePage": 0, "WhitePage": 0,
"WindRose": 0, "WindRose": 0,
"WindRoseFlex": 6, "WindRoseFlex": 6,
"SixValues" : 6, # "SixValues" : 6,
} }
# No changes needed beyond this point # No changes needed beyond this point

2
lib/obp60task/obp60task.cpp
View File

@ -266,8 +266,6 @@ void registerAllPages(PageList &list){
list.add(&registerPageTwoValues); list.add(&registerPageTwoValues);
extern PageDescription registerPageThreeValues; extern PageDescription registerPageThreeValues;
list.add(&registerPageThreeValues); list.add(&registerPageThreeValues);
extern PageDescription registerPageSixValues;
list.add(&registerPageSixValues);
extern PageDescription registerPageFourValues; extern PageDescription registerPageFourValues;
list.add(&registerPageFourValues); list.add(&registerPageFourValues);
extern PageDescription registerPageFourValues2; extern PageDescription registerPageFourValues2;