diff --git a/lib/obp60task/OBP60Extensions.cpp b/lib/obp60task/OBP60Extensions.cpp index 88d8325..e45c90b 100644 --- a/lib/obp60task/OBP60Extensions.cpp +++ b/lib/obp60task/OBP60Extensions.cpp @@ -24,6 +24,7 @@ #include "fonts/Ubuntu_Bold20pt8b.h" #include "fonts/Ubuntu_Bold32pt8b.h" #include "fonts/Atari16px8b.h" // Key label font +#include "fonts/IBM8x8px.h" // E-Ink Display #define GxEPD_WIDTH 400 // Display width diff --git a/lib/obp60task/OBP60Extensions.h b/lib/obp60task/OBP60Extensions.h index d7727ed..15d2396 100644 --- a/lib/obp60task/OBP60Extensions.h +++ b/lib/obp60task/OBP60Extensions.h @@ -51,6 +51,7 @@ extern const GFXfont Ubuntu_Bold16pt8b; extern const GFXfont Ubuntu_Bold20pt8b; extern const GFXfont Ubuntu_Bold32pt8b; extern const GFXfont Atari16px; +extern const GFXfont IBM8x8px; // Global functions #ifdef DISPLAY_GDEW042T2 diff --git a/lib/obp60task/PageSkyView.cpp b/lib/obp60task/PageSkyView.cpp index f61962d..9d80a85 100644 --- a/lib/obp60task/PageSkyView.cpp +++ b/lib/obp60task/PageSkyView.cpp @@ -121,18 +121,20 @@ public: getdisplay().setCursor(c.x - r + 3 , c.y + h / 2); getdisplay().print("W"); - getdisplay().setFont(&Ubuntu_Bold8pt8b); - // show satellites in "map" + getdisplay().setFont(&IBM8x8px); for (int i = 0; i < nSat; i++) { float arad = (sats[i].Azimut * M_PI / 180.0) + M_PI; float erad = sats[i].Elevation * M_PI / 180.0; uint16_t x = c.x + sin(arad) * erad * r1; uint16_t y = c.y + cos(arad) * erad * r1; getdisplay().fillRect(x-4, y-4, 8, 8, commonData->fgcolor); + getdisplay().setCursor(x-7, y+12); + getdisplay().printf("%02d", static_cast(sats[i].PRN)); } // Signal / Noise bars + getdisplay().setFont(&Ubuntu_Bold8pt8b); getdisplay().setCursor(325, 34); getdisplay().print("SNR"); // getdisplay().drawRect(270, 20, 125, 257, commonData->fgcolor); diff --git a/lib/obp60task/PageWind.cpp b/lib/obp60task/PageWind.cpp index 460d1fb..226b430 100644 --- a/lib/obp60task/PageWind.cpp +++ b/lib/obp60task/PageWind.cpp @@ -247,8 +247,8 @@ public: if(key == 1){ // Mode switch if(mode == 'N'){ mode = 'L'; - } else if (mode == 'L') { - mode = 'X'; + // } else if (mode == 'L') { + // mode = 'X'; } else { mode = 'N'; } diff --git a/lib/obp60task/PageWindRoseFlex.cpp b/lib/obp60task/PageWindRoseFlex.cpp index 8fefb21..69ad611 100644 --- a/lib/obp60task/PageWindRoseFlex.cpp +++ b/lib/obp60task/PageWindRoseFlex.cpp @@ -58,6 +58,11 @@ public: static String unit5old = ""; static String svalue6old = ""; static String unit6old = ""; + static GFXfont name3font; + static GFXfont name4font; + static GFXfont name5font; + static GFXfont name6font; + // Get config data String lengthformat = config->getString(config->lengthFormat); @@ -114,6 +119,12 @@ public: GwApi::BoatValue *bvalue3 = pageData.values[0]; String name3 = xdrDelete(bvalue3->getName()); // Value name name3 = name3.substring(0, 6); // String length limit for value name + if (name3.length()>3){ + name3font=Ubuntu_Bold8pt8b; + } + else{ + name3font=Ubuntu_Bold12pt8b; + } calibrationData.calibrateInstance(bvalue3, logger); // Check if boat data value is to be calibrated double value3 = bvalue3->value; // Value as double in SI unit bool valid3 = bvalue3->valid; // Valid information @@ -128,6 +139,12 @@ public: GwApi::BoatValue *bvalue4 = pageData.values[1]; String name4 = xdrDelete(bvalue4->getName()); // Value name name4 = name4.substring(0, 6); // String length limit for value name + if (name4.length()>3){ + name4font=Ubuntu_Bold8pt8b; + } + else{ + name4font=Ubuntu_Bold12pt8b; + } calibrationData.calibrateInstance(bvalue4, logger); // Check if boat data value is to be calibrated double value4 = bvalue4->value; // Value as double in SI unit bool valid4 = bvalue4->valid; // Valid information @@ -142,6 +159,12 @@ public: GwApi::BoatValue *bvalue5 = pageData.values[2]; String name5 = xdrDelete(bvalue5->getName()); // Value name name5 = name5.substring(0, 6); // String length limit for value name + if (name5.length()>3){ + name5font=Ubuntu_Bold8pt8b; + } + else{ + name5font=Ubuntu_Bold12pt8b; + } calibrationData.calibrateInstance(bvalue5, logger); // Check if boat data value is to be calibrated double value5 = bvalue5->value; // Value as double in SI unit bool valid5 = bvalue5->valid; // Valid information @@ -152,10 +175,16 @@ public: unit5old = unit5; // Save old unit } - // Get boat value for center + // Get boat value for center (name is not displayed) GwApi::BoatValue *bvalue6 = pageData.values[3]; String name6 = xdrDelete(bvalue6->getName()); // Value name name6 = name6.substring(0, 6); // String length limit for value name + if (name6.length()>3){ + name6font=Ubuntu_Bold8pt8b; + } + else{ + name6font=Ubuntu_Bold8pt8b; + } calibrationData.calibrateInstance(bvalue6, logger); // Check if boat data value is to be calibrated double value6 = bvalue6->value; // Value as double in SI unit bool valid6 = bvalue6->valid; // Valid information @@ -209,7 +238,7 @@ public: getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b); getdisplay().setCursor(10, 270); getdisplay().print(svalue3); // Value - getdisplay().setFont(&Ubuntu_Bold12pt8b); + getdisplay().setFont(&name3font); getdisplay().setCursor(10, 220); getdisplay().print(name3); // Name getdisplay().setFont(&Ubuntu_Bold8pt8b); @@ -224,18 +253,13 @@ public: // Show value 4 (=second user-configured parameter) at top right getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b); - getdisplay().setCursor(295, 65); - if(valid3 == true){ - getdisplay().print(svalue4); // Value - } - else{ - getdisplay().print("---"); // Value - } - getdisplay().setFont(&Ubuntu_Bold12pt8b); - getdisplay().setCursor(335, 95); + getdisplay().setCursor(295, 65); + getdisplay().print(svalue4); // Value + getdisplay().setFont(&name4font); + getdisplay().setCursor(325, 95); getdisplay().print(name4); // Name getdisplay().setFont(&Ubuntu_Bold8pt8b); - getdisplay().setCursor(335, 115); + getdisplay().setCursor(325, 115); getdisplay().print(" "); if(holdvalues == false){ getdisplay().print(unit4); // Unit @@ -251,11 +275,11 @@ public: getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b); getdisplay().setCursor(295, 270); getdisplay().print(svalue5); // Value - getdisplay().setFont(&Ubuntu_Bold12pt8b); - getdisplay().setCursor(335, 220); + getdisplay().setFont(&name5font); + getdisplay().setCursor(325, 220); getdisplay().print(name5); // Name getdisplay().setFont(&Ubuntu_Bold8pt8b); - getdisplay().setCursor(335, 190); + getdisplay().setCursor(325, 190); getdisplay().print(" "); if(holdvalues == false){ getdisplay().print(unit5); // Unit diff --git a/lib/obp60task/config.json b/lib/obp60task/config.json index dffdeff..f633762 100644 --- a/lib/obp60task/config.json +++ b/lib/obp60task/config.json @@ -735,19 +735,8 @@ "obp60":"true" }, "condition": [ - { "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" } ] + { "calInstance1": ["AWA", "AWS", "COG", "DBT", "HDM", "PRPOS", "RPOS", "SOG", "STW", "TWA", "TWS", "TWD", "WTemp" ] } + ] }, { "name": "calSlope1", @@ -760,19 +749,8 @@ "obp60":"true" }, "condition": [ - { "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" } ] + { "calInstance1": ["AWA", "AWS", "COG", "DBT", "HDM", "PRPOS", "RPOS", "SOG", "STW", "TWA", "TWS", "TWD", "WTemp" ] } + ] }, { "name": "calSmooth1", @@ -788,19 +766,8 @@ "obp60":"true" }, "condition": [ - { "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" } ] + { "calInstance1": ["AWA", "AWS", "COG", "DBT", "HDM", "PRPOS", "RPOS", "SOG", "STW", "TWA", "TWS", "TWD", "WTemp" ] } + ] }, { "name": "calInstance2", @@ -840,19 +807,8 @@ "obp60":"true" }, "condition": [ - { "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" } ] + { "calInstance2": ["AWA", "AWS", "COG", "DBT", "HDM", "PRPOS", "RPOS", "SOG", "STW", "TWA", "TWS", "TWD", "WTemp" ] } + ] }, { "name": "calSlope2", @@ -865,19 +821,8 @@ "obp60":"true" }, "condition": [ - { "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" } ] + { "calInstance2": ["AWA", "AWS", "COG", "DBT", "HDM", "PRPOS", "RPOS", "SOG", "STW", "TWA", "TWS", "TWD", "WTemp" ] } + ] }, { "name": "calSmooth2", @@ -893,19 +838,8 @@ "obp60":"true" }, "condition": [ - { "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" } ] + { "calInstance2": ["AWA", "AWS", "COG", "DBT", "HDM", "PRPOS", "RPOS", "SOG", "STW", "TWA", "TWS", "TWD", "WTemp" ] } + ] }, { "name": "calInstance3", @@ -945,19 +879,8 @@ "obp60":"true" }, "condition": [ - { "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" } ] + { "calInstance3": ["AWA", "AWS", "COG", "DBT", "HDM", "PRPOS", "RPOS", "SOG", "STW", "TWA", "TWS", "TWD", "WTemp" ] } + ] }, { "name": "calSlope3", @@ -970,19 +893,8 @@ "obp60":"true" }, "condition": [ - { "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" } ] + { "calInstance3": ["AWA", "AWS", "COG", "DBT", "HDM", "PRPOS", "RPOS", "SOG", "STW", "TWA", "TWS", "TWD", "WTemp" ] } + ] }, { "name": "calSmooth3", @@ -998,19 +910,8 @@ "obp60":"true" }, "condition": [ - { "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" } ] + { "calInstance3": ["AWA", "AWS", "COG", "DBT", "HDM", "PRPOS", "RPOS", "SOG", "STW", "TWA", "TWS", "TWD", "WTemp" ] } + ] }, { "name": "display", @@ -1311,6 +1212,7 @@ "obp60":"true" } }, + { "name": "page1type", "label": "Type", @@ -1349,38 +1251,20 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "visiblePages": 1 - }, - { - "visiblePages": 2 - }, - { - "visiblePages": 3 - }, - { - "visiblePages": 4 - }, - { - "visiblePages": 5 - }, - { - "visiblePages": 6 - }, - { - "visiblePages": 7 - }, - { - "visiblePages": 8 - }, - { - "visiblePages": 9 - }, - { - "visiblePages": 10 - } - ] + "condition": { + "visiblePages": [ + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page1value1", @@ -1392,35 +1276,31 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page1type": "Fluid" - }, - { - "page1type": "FourValues" - }, - { - "page1type": "FourValues2" - }, - { - "page1type": "OneValue" - }, - { - "page1type": "RollPitch" - }, - { - "page1type": "SixValues" - }, - { - "page1type": "ThreeValues" - }, - { - "page1type": "TwoValues" - }, - { - "page1type": "WindRoseFlex" - } - ] + "condition": { + "page1type": [ + "Fluid", + "FourValues", + "FourValues2", + "OneValue", + "RollPitch", + "SixValues", + "ThreeValues", + "TwoValues", + "WindRoseFlex" + ], + "visiblePages": [ + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page1value2", @@ -1432,29 +1312,29 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page1type": "FourValues" - }, - { - "page1type": "FourValues2" - }, - { - "page1type": "RollPitch" - }, - { - "page1type": "SixValues" - }, - { - "page1type": "ThreeValues" - }, - { - "page1type": "TwoValues" - }, - { - "page1type": "WindRoseFlex" - } - ] + "condition": { + "page1type": [ + "FourValues", + "FourValues2", + "RollPitch", + "SixValues", + "ThreeValues", + "TwoValues", + "WindRoseFlex" + ], + "visiblePages": [ + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page1value3", @@ -1466,23 +1346,27 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page1type": "FourValues" - }, - { - "page1type": "FourValues2" - }, - { - "page1type": "SixValues" - }, - { - "page1type": "ThreeValues" - }, - { - "page1type": "WindRoseFlex" - } - ] + "condition": { + "page1type": [ + "FourValues", + "FourValues2", + "SixValues", + "ThreeValues", + "WindRoseFlex" + ], + "visiblePages": [ + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page1value4", @@ -1494,20 +1378,26 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page1type": "FourValues" - }, - { - "page1type": "FourValues2" - }, - { - "page1type": "SixValues" - }, - { - "page1type": "WindRoseFlex" - } - ] + "condition": { + "page1type": [ + "FourValues", + "FourValues2", + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page1value5", @@ -1519,11 +1409,23 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page1type": "SixValues" - } - ] + "condition": { + "page1type": [ + "SixValues" + ], + "visiblePages": [ + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page1value6", @@ -1535,11 +1437,23 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page1type": "SixValues" - } - ] + "condition": { + "page1type": [ + "SixValues" + ], + "visiblePages": [ + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page1fluid", @@ -1581,11 +1495,21 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page1type": "Fluid" - } - ] + "condition": { + "page1type": "Fluid", + "visiblePages": [ + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page2type", @@ -1625,35 +1549,19 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "visiblePages": 2 - }, - { - "visiblePages": 3 - }, - { - "visiblePages": 4 - }, - { - "visiblePages": 5 - }, - { - "visiblePages": 6 - }, - { - "visiblePages": 7 - }, - { - "visiblePages": 8 - }, - { - "visiblePages": 9 - }, - { - "visiblePages": 10 - } - ] + "condition": { + "visiblePages": [ + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page2value1", @@ -1665,35 +1573,30 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page2type": "Fluid" - }, - { - "page2type": "FourValues" - }, - { - "page2type": "FourValues2" - }, - { - "page2type": "OneValue" - }, - { - "page2type": "RollPitch" - }, - { - "page2type": "SixValues" - }, - { - "page2type": "ThreeValues" - }, - { - "page2type": "TwoValues" - }, - { - "page2type": "WindRoseFlex" - } - ] + "condition": { + "page2type": [ + "Fluid", + "FourValues", + "FourValues2", + "OneValue", + "RollPitch", + "SixValues", + "ThreeValues", + "TwoValues", + "WindRoseFlex" + ], + "visiblePages": [ + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page2value2", @@ -1705,29 +1608,28 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page2type": "FourValues" - }, - { - "page2type": "FourValues2" - }, - { - "page2type": "RollPitch" - }, - { - "page2type": "SixValues" - }, - { - "page2type": "ThreeValues" - }, - { - "page2type": "TwoValues" - }, - { - "page2type": "WindRoseFlex" - } - ] + "condition": { + "page2type": [ + "FourValues", + "FourValues2", + "RollPitch", + "SixValues", + "ThreeValues", + "TwoValues", + "WindRoseFlex" + ], + "visiblePages": [ + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page2value3", @@ -1739,23 +1641,26 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page2type": "FourValues" - }, - { - "page2type": "FourValues2" - }, - { - "page2type": "SixValues" - }, - { - "page2type": "ThreeValues" - }, - { - "page2type": "WindRoseFlex" - } - ] + "condition": { + "page2type": [ + "FourValues", + "FourValues2", + "SixValues", + "ThreeValues", + "WindRoseFlex" + ], + "visiblePages": [ + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page2value4", @@ -1767,20 +1672,25 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page2type": "FourValues" - }, - { - "page2type": "FourValues2" - }, - { - "page2type": "SixValues" - }, - { - "page2type": "WindRoseFlex" - } - ] + "condition": { + "page2type": [ + "FourValues", + "FourValues2", + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page2value5", @@ -1792,11 +1702,22 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page2type": "SixValues" - } - ] + "condition": { + "page2type": [ + "SixValues" + ], + "visiblePages": [ + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page2value6", @@ -1808,11 +1729,22 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page2type": "SixValues" - } - ] + "condition": { + "page2type": [ + "SixValues" + ], + "visiblePages": [ + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page2fluid", @@ -1854,11 +1786,20 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page2type": "Fluid" - } - ] + "condition": { + "page2type": "Fluid", + "visiblePages": [ + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page3type", @@ -1898,32 +1839,18 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "visiblePages": 3 - }, - { - "visiblePages": 4 - }, - { - "visiblePages": 5 - }, - { - "visiblePages": 6 - }, - { - "visiblePages": 7 - }, - { - "visiblePages": 8 - }, - { - "visiblePages": 9 - }, - { - "visiblePages": 10 - } - ] + "condition": { + "visiblePages": [ + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page3value1", @@ -1935,35 +1862,29 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page3type": "Fluid" - }, - { - "page3type": "FourValues" - }, - { - "page3type": "FourValues2" - }, - { - "page3type": "OneValue" - }, - { - "page3type": "RollPitch" - }, - { - "page3type": "SixValues" - }, - { - "page3type": "ThreeValues" - }, - { - "page3type": "TwoValues" - }, - { - "page3type": "WindRoseFlex" - } - ] + "condition": { + "page3type": [ + "Fluid", + "FourValues", + "FourValues2", + "OneValue", + "RollPitch", + "SixValues", + "ThreeValues", + "TwoValues", + "WindRoseFlex" + ], + "visiblePages": [ + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page3value2", @@ -1975,29 +1896,27 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page3type": "FourValues" - }, - { - "page3type": "FourValues2" - }, - { - "page3type": "RollPitch" - }, - { - "page3type": "SixValues" - }, - { - "page3type": "ThreeValues" - }, - { - "page3type": "TwoValues" - }, - { - "page3type": "WindRoseFlex" - } - ] + "condition": { + "page3type": [ + "FourValues", + "FourValues2", + "RollPitch", + "SixValues", + "ThreeValues", + "TwoValues", + "WindRoseFlex" + ], + "visiblePages": [ + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page3value3", @@ -2009,23 +1928,25 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page3type": "FourValues" - }, - { - "page3type": "FourValues2" - }, - { - "page3type": "SixValues" - }, - { - "page3type": "ThreeValues" - }, - { - "page3type": "WindRoseFlex" - } - ] + "condition": { + "page3type": [ + "FourValues", + "FourValues2", + "SixValues", + "ThreeValues", + "WindRoseFlex" + ], + "visiblePages": [ + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page3value4", @@ -2037,20 +1958,24 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page3type": "FourValues" - }, - { - "page3type": "FourValues2" - }, - { - "page3type": "SixValues" - }, - { - "page3type": "WindRoseFlex" - } - ] + "condition": { + "page3type": [ + "FourValues", + "FourValues2", + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page3value5", @@ -2062,11 +1987,21 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page3type": "SixValues" - } - ] + "condition": { + "page3type": [ + "SixValues" + ], + "visiblePages": [ + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page3value6", @@ -2078,11 +2013,21 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page3type": "SixValues" - } - ] + "condition": { + "page3type": [ + "SixValues" + ], + "visiblePages": [ + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page3fluid", @@ -2124,11 +2069,19 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page3type": "Fluid" - } - ] + "condition": { + "page3type": "Fluid", + "visiblePages": [ + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page4type", @@ -2168,29 +2121,17 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "visiblePages": 4 - }, - { - "visiblePages": 5 - }, - { - "visiblePages": 6 - }, - { - "visiblePages": 7 - }, - { - "visiblePages": 8 - }, - { - "visiblePages": 9 - }, - { - "visiblePages": 10 - } - ] + "condition": { + "visiblePages": [ + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page4value1", @@ -2202,35 +2143,28 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page4type": "Fluid" - }, - { - "page4type": "FourValues" - }, - { - "page4type": "FourValues2" - }, - { - "page4type": "OneValue" - }, - { - "page4type": "RollPitch" - }, - { - "page4type": "SixValues" - }, - { - "page4type": "ThreeValues" - }, - { - "page4type": "TwoValues" - }, - { - "page4type": "WindRoseFlex" - } - ] + "condition": { + "page4type": [ + "Fluid", + "FourValues", + "FourValues2", + "OneValue", + "RollPitch", + "SixValues", + "ThreeValues", + "TwoValues", + "WindRoseFlex" + ], + "visiblePages": [ + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page4value2", @@ -2242,29 +2176,26 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page4type": "FourValues" - }, - { - "page4type": "FourValues2" - }, - { - "page4type": "RollPitch" - }, - { - "page4type": "SixValues" - }, - { - "page4type": "ThreeValues" - }, - { - "page4type": "TwoValues" - }, - { - "page4type": "WindRoseFlex" - } - ] + "condition": { + "page4type": [ + "FourValues", + "FourValues2", + "RollPitch", + "SixValues", + "ThreeValues", + "TwoValues", + "WindRoseFlex" + ], + "visiblePages": [ + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page4value3", @@ -2276,23 +2207,24 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page4type": "FourValues" - }, - { - "page4type": "FourValues2" - }, - { - "page4type": "SixValues" - }, - { - "page4type": "ThreeValues" - }, - { - "page4type": "WindRoseFlex" - } - ] + "condition": { + "page4type": [ + "FourValues", + "FourValues2", + "SixValues", + "ThreeValues", + "WindRoseFlex" + ], + "visiblePages": [ + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page4value4", @@ -2304,20 +2236,23 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page4type": "FourValues" - }, - { - "page4type": "FourValues2" - }, - { - "page4type": "SixValues" - }, - { - "page4type": "WindRoseFlex" - } - ] + "condition": { + "page4type": [ + "FourValues", + "FourValues2", + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page4value5", @@ -2329,11 +2264,20 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page4type": "SixValues" - } - ] + "condition": { + "page4type": [ + "SixValues" + ], + "visiblePages": [ + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page4value6", @@ -2345,11 +2289,20 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page4type": "SixValues" - } - ] + "condition": { + "page4type": [ + "SixValues" + ], + "visiblePages": [ + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page4fluid", @@ -2391,11 +2344,18 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page4type": "Fluid" - } - ] + "condition": { + "page4type": "Fluid", + "visiblePages": [ + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page5type", @@ -2435,26 +2395,16 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "visiblePages": 5 - }, - { - "visiblePages": 6 - }, - { - "visiblePages": 7 - }, - { - "visiblePages": 8 - }, - { - "visiblePages": 9 - }, - { - "visiblePages": 10 - } - ] + "condition": { + "visiblePages": [ + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page5value1", @@ -2466,35 +2416,27 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page5type": "Fluid" - }, - { - "page5type": "FourValues" - }, - { - "page5type": "FourValues2" - }, - { - "page5type": "OneValue" - }, - { - "page5type": "RollPitch" - }, - { - "page5type": "SixValues" - }, - { - "page5type": "ThreeValues" - }, - { - "page5type": "TwoValues" - }, - { - "page5type": "WindRoseFlex" - } - ] + "condition": { + "page5type": [ + "Fluid", + "FourValues", + "FourValues2", + "OneValue", + "RollPitch", + "SixValues", + "ThreeValues", + "TwoValues", + "WindRoseFlex" + ], + "visiblePages": [ + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page5value2", @@ -2506,29 +2448,25 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page5type": "FourValues" - }, - { - "page5type": "FourValues2" - }, - { - "page5type": "RollPitch" - }, - { - "page5type": "SixValues" - }, - { - "page5type": "ThreeValues" - }, - { - "page5type": "TwoValues" - }, - { - "page5type": "WindRoseFlex" - } - ] + "condition": { + "page5type": [ + "FourValues", + "FourValues2", + "RollPitch", + "SixValues", + "ThreeValues", + "TwoValues", + "WindRoseFlex" + ], + "visiblePages": [ + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page5value3", @@ -2540,23 +2478,23 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page5type": "FourValues" - }, - { - "page5type": "FourValues2" - }, - { - "page5type": "SixValues" - }, - { - "page5type": "ThreeValues" - }, - { - "page5type": "WindRoseFlex" - } - ] + "condition": { + "page5type": [ + "FourValues", + "FourValues2", + "SixValues", + "ThreeValues", + "WindRoseFlex" + ], + "visiblePages": [ + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page5value4", @@ -2568,20 +2506,22 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page5type": "FourValues" - }, - { - "page5type": "FourValues2" - }, - { - "page5type": "SixValues" - }, - { - "page5type": "WindRoseFlex" - } - ] + "condition": { + "page5type": [ + "FourValues", + "FourValues2", + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page5value5", @@ -2593,11 +2533,19 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page5type": "SixValues" - } - ] + "condition": { + "page5type": [ + "SixValues" + ], + "visiblePages": [ + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page5value6", @@ -2609,11 +2557,19 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page5type": "SixValues" - } - ] + "condition": { + "page5type": [ + "SixValues" + ], + "visiblePages": [ + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page5fluid", @@ -2655,11 +2611,17 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page5type": "Fluid" - } - ] + "condition": { + "page5type": "Fluid", + "visiblePages": [ + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page6type", @@ -2699,23 +2661,15 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "visiblePages": 6 - }, - { - "visiblePages": 7 - }, - { - "visiblePages": 8 - }, - { - "visiblePages": 9 - }, - { - "visiblePages": 10 - } - ] + "condition": { + "visiblePages": [ + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page6value1", @@ -2727,35 +2681,26 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page6type": "Fluid" - }, - { - "page6type": "FourValues" - }, - { - "page6type": "FourValues2" - }, - { - "page6type": "OneValue" - }, - { - "page6type": "RollPitch" - }, - { - "page6type": "SixValues" - }, - { - "page6type": "ThreeValues" - }, - { - "page6type": "TwoValues" - }, - { - "page6type": "WindRoseFlex" - } - ] + "condition": { + "page6type": [ + "Fluid", + "FourValues", + "FourValues2", + "OneValue", + "RollPitch", + "SixValues", + "ThreeValues", + "TwoValues", + "WindRoseFlex" + ], + "visiblePages": [ + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page6value2", @@ -2767,29 +2712,24 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page6type": "FourValues" - }, - { - "page6type": "FourValues2" - }, - { - "page6type": "RollPitch" - }, - { - "page6type": "SixValues" - }, - { - "page6type": "ThreeValues" - }, - { - "page6type": "TwoValues" - }, - { - "page6type": "WindRoseFlex" - } - ] + "condition": { + "page6type": [ + "FourValues", + "FourValues2", + "RollPitch", + "SixValues", + "ThreeValues", + "TwoValues", + "WindRoseFlex" + ], + "visiblePages": [ + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page6value3", @@ -2801,23 +2741,22 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page6type": "FourValues" - }, - { - "page6type": "FourValues2" - }, - { - "page6type": "SixValues" - }, - { - "page6type": "ThreeValues" - }, - { - "page6type": "WindRoseFlex" - } - ] + "condition": { + "page6type": [ + "FourValues", + "FourValues2", + "SixValues", + "ThreeValues", + "WindRoseFlex" + ], + "visiblePages": [ + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page6value4", @@ -2829,20 +2768,21 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page6type": "FourValues" - }, - { - "page6type": "FourValues2" - }, - { - "page6type": "SixValues" - }, - { - "page6type": "WindRoseFlex" - } - ] + "condition": { + "page6type": [ + "FourValues", + "FourValues2", + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page6value5", @@ -2854,11 +2794,18 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page6type": "SixValues" - } - ] + "condition": { + "page6type": [ + "SixValues" + ], + "visiblePages": [ + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page6value6", @@ -2870,11 +2817,18 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page6type": "SixValues" - } - ] + "condition": { + "page6type": [ + "SixValues" + ], + "visiblePages": [ + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page6fluid", @@ -2916,11 +2870,16 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page6type": "Fluid" - } - ] + "condition": { + "page6type": "Fluid", + "visiblePages": [ + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page7type", @@ -2960,20 +2919,14 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "visiblePages": 7 - }, - { - "visiblePages": 8 - }, - { - "visiblePages": 9 - }, - { - "visiblePages": 10 - } - ] + "condition": { + "visiblePages": [ + "7", + "8", + "9", + "10" + ] + } }, { "name": "page7value1", @@ -2985,35 +2938,25 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page7type": "Fluid" - }, - { - "page7type": "FourValues" - }, - { - "page7type": "FourValues2" - }, - { - "page7type": "OneValue" - }, - { - "page7type": "RollPitch" - }, - { - "page7type": "SixValues" - }, - { - "page7type": "ThreeValues" - }, - { - "page7type": "TwoValues" - }, - { - "page7type": "WindRoseFlex" - } - ] + "condition": { + "page7type": [ + "Fluid", + "FourValues", + "FourValues2", + "OneValue", + "RollPitch", + "SixValues", + "ThreeValues", + "TwoValues", + "WindRoseFlex" + ], + "visiblePages": [ + "7", + "8", + "9", + "10" + ] + } }, { "name": "page7value2", @@ -3025,29 +2968,23 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page7type": "FourValues" - }, - { - "page7type": "FourValues2" - }, - { - "page7type": "RollPitch" - }, - { - "page7type": "SixValues" - }, - { - "page7type": "ThreeValues" - }, - { - "page7type": "TwoValues" - }, - { - "page7type": "WindRoseFlex" - } - ] + "condition": { + "page7type": [ + "FourValues", + "FourValues2", + "RollPitch", + "SixValues", + "ThreeValues", + "TwoValues", + "WindRoseFlex" + ], + "visiblePages": [ + "7", + "8", + "9", + "10" + ] + } }, { "name": "page7value3", @@ -3059,23 +2996,21 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page7type": "FourValues" - }, - { - "page7type": "FourValues2" - }, - { - "page7type": "SixValues" - }, - { - "page7type": "ThreeValues" - }, - { - "page7type": "WindRoseFlex" - } - ] + "condition": { + "page7type": [ + "FourValues", + "FourValues2", + "SixValues", + "ThreeValues", + "WindRoseFlex" + ], + "visiblePages": [ + "7", + "8", + "9", + "10" + ] + } }, { "name": "page7value4", @@ -3087,20 +3022,20 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page7type": "FourValues" - }, - { - "page7type": "FourValues2" - }, - { - "page7type": "SixValues" - }, - { - "page7type": "WindRoseFlex" - } - ] + "condition": { + "page7type": [ + "FourValues", + "FourValues2", + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + "7", + "8", + "9", + "10" + ] + } }, { "name": "page7value5", @@ -3112,11 +3047,17 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page7type": "SixValues" - } - ] + "condition": { + "page7type": [ + "SixValues" + ], + "visiblePages": [ + "7", + "8", + "9", + "10" + ] + } }, { "name": "page7value6", @@ -3128,11 +3069,17 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page7type": "SixValues" - } - ] + "condition": { + "page7type": [ + "SixValues" + ], + "visiblePages": [ + "7", + "8", + "9", + "10" + ] + } }, { "name": "page7fluid", @@ -3174,11 +3121,15 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page7type": "Fluid" - } - ] + "condition": { + "page7type": "Fluid", + "visiblePages": [ + "7", + "8", + "9", + "10" + ] + } }, { "name": "page8type", @@ -3218,17 +3169,13 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "visiblePages": 8 - }, - { - "visiblePages": 9 - }, - { - "visiblePages": 10 - } - ] + "condition": { + "visiblePages": [ + "8", + "9", + "10" + ] + } }, { "name": "page8value1", @@ -3240,35 +3187,24 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page8type": "Fluid" - }, - { - "page8type": "FourValues" - }, - { - "page8type": "FourValues2" - }, - { - "page8type": "OneValue" - }, - { - "page8type": "RollPitch" - }, - { - "page8type": "SixValues" - }, - { - "page8type": "ThreeValues" - }, - { - "page8type": "TwoValues" - }, - { - "page8type": "WindRoseFlex" - } - ] + "condition": { + "page8type": [ + "Fluid", + "FourValues", + "FourValues2", + "OneValue", + "RollPitch", + "SixValues", + "ThreeValues", + "TwoValues", + "WindRoseFlex" + ], + "visiblePages": [ + "8", + "9", + "10" + ] + } }, { "name": "page8value2", @@ -3280,29 +3216,22 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page8type": "FourValues" - }, - { - "page8type": "FourValues2" - }, - { - "page8type": "RollPitch" - }, - { - "page8type": "SixValues" - }, - { - "page8type": "ThreeValues" - }, - { - "page8type": "TwoValues" - }, - { - "page8type": "WindRoseFlex" - } - ] + "condition": { + "page8type": [ + "FourValues", + "FourValues2", + "RollPitch", + "SixValues", + "ThreeValues", + "TwoValues", + "WindRoseFlex" + ], + "visiblePages": [ + "8", + "9", + "10" + ] + } }, { "name": "page8value3", @@ -3314,23 +3243,20 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page8type": "FourValues" - }, - { - "page8type": "FourValues2" - }, - { - "page8type": "SixValues" - }, - { - "page8type": "ThreeValues" - }, - { - "page8type": "WindRoseFlex" - } - ] + "condition": { + "page8type": [ + "FourValues", + "FourValues2", + "SixValues", + "ThreeValues", + "WindRoseFlex" + ], + "visiblePages": [ + "8", + "9", + "10" + ] + } }, { "name": "page8value4", @@ -3342,20 +3268,19 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page8type": "FourValues" - }, - { - "page8type": "FourValues2" - }, - { - "page8type": "SixValues" - }, - { - "page8type": "WindRoseFlex" - } - ] + "condition": { + "page8type": [ + "FourValues", + "FourValues2", + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + "8", + "9", + "10" + ] + } }, { "name": "page8value5", @@ -3367,11 +3292,16 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page8type": "SixValues" - } - ] + "condition": { + "page8type": [ + "SixValues" + ], + "visiblePages": [ + "8", + "9", + "10" + ] + } }, { "name": "page8value6", @@ -3383,11 +3313,16 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page8type": "SixValues" - } - ] + "condition": { + "page8type": [ + "SixValues" + ], + "visiblePages": [ + "8", + "9", + "10" + ] + } }, { "name": "page8fluid", @@ -3429,11 +3364,14 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page8type": "Fluid" - } - ] + "condition": { + "page8type": "Fluid", + "visiblePages": [ + "8", + "9", + "10" + ] + } }, { "name": "page9type", @@ -3473,14 +3411,12 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "visiblePages": 9 - }, - { - "visiblePages": 10 - } - ] + "condition": { + "visiblePages": [ + "9", + "10" + ] + } }, { "name": "page9value1", @@ -3492,35 +3428,23 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page9type": "Fluid" - }, - { - "page9type": "FourValues" - }, - { - "page9type": "FourValues2" - }, - { - "page9type": "OneValue" - }, - { - "page9type": "RollPitch" - }, - { - "page9type": "SixValues" - }, - { - "page9type": "ThreeValues" - }, - { - "page9type": "TwoValues" - }, - { - "page9type": "WindRoseFlex" - } - ] + "condition": { + "page9type": [ + "Fluid", + "FourValues", + "FourValues2", + "OneValue", + "RollPitch", + "SixValues", + "ThreeValues", + "TwoValues", + "WindRoseFlex" + ], + "visiblePages": [ + "9", + "10" + ] + } }, { "name": "page9value2", @@ -3532,29 +3456,21 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page9type": "FourValues" - }, - { - "page9type": "FourValues2" - }, - { - "page9type": "RollPitch" - }, - { - "page9type": "SixValues" - }, - { - "page9type": "ThreeValues" - }, - { - "page9type": "TwoValues" - }, - { - "page9type": "WindRoseFlex" - } - ] + "condition": { + "page9type": [ + "FourValues", + "FourValues2", + "RollPitch", + "SixValues", + "ThreeValues", + "TwoValues", + "WindRoseFlex" + ], + "visiblePages": [ + "9", + "10" + ] + } }, { "name": "page9value3", @@ -3566,23 +3482,19 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page9type": "FourValues" - }, - { - "page9type": "FourValues2" - }, - { - "page9type": "SixValues" - }, - { - "page9type": "ThreeValues" - }, - { - "page9type": "WindRoseFlex" - } - ] + "condition": { + "page9type": [ + "FourValues", + "FourValues2", + "SixValues", + "ThreeValues", + "WindRoseFlex" + ], + "visiblePages": [ + "9", + "10" + ] + } }, { "name": "page9value4", @@ -3594,20 +3506,18 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page9type": "FourValues" - }, - { - "page9type": "FourValues2" - }, - { - "page9type": "SixValues" - }, - { - "page9type": "WindRoseFlex" - } - ] + "condition": { + "page9type": [ + "FourValues", + "FourValues2", + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + "9", + "10" + ] + } }, { "name": "page9value5", @@ -3619,11 +3529,15 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page9type": "SixValues" - } - ] + "condition": { + "page9type": [ + "SixValues" + ], + "visiblePages": [ + "9", + "10" + ] + } }, { "name": "page9value6", @@ -3635,11 +3549,15 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page9type": "SixValues" - } - ] + "condition": { + "page9type": [ + "SixValues" + ], + "visiblePages": [ + "9", + "10" + ] + } }, { "name": "page9fluid", @@ -3681,11 +3599,13 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page9type": "Fluid" - } - ] + "condition": { + "page9type": "Fluid", + "visiblePages": [ + "9", + "10" + ] + } }, { "name": "page10type", @@ -3725,11 +3645,11 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "visiblePages": 10 - } - ] + "condition": { + "visiblePages": [ + "10" + ] + } }, { "name": "page10value1", @@ -3741,35 +3661,22 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page10type": "Fluid" - }, - { - "page10type": "FourValues" - }, - { - "page10type": "FourValues2" - }, - { - "page10type": "OneValue" - }, - { - "page10type": "RollPitch" - }, - { - "page10type": "SixValues" - }, - { - "page10type": "ThreeValues" - }, - { - "page10type": "TwoValues" - }, - { - "page10type": "WindRoseFlex" - } - ] + "condition": { + "page10type": [ + "Fluid", + "FourValues", + "FourValues2", + "OneValue", + "RollPitch", + "SixValues", + "ThreeValues", + "TwoValues", + "WindRoseFlex" + ], + "visiblePages": [ + "10" + ] + } }, { "name": "page10value2", @@ -3781,29 +3688,20 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page10type": "FourValues" - }, - { - "page10type": "FourValues2" - }, - { - "page10type": "RollPitch" - }, - { - "page10type": "SixValues" - }, - { - "page10type": "ThreeValues" - }, - { - "page10type": "TwoValues" - }, - { - "page10type": "WindRoseFlex" - } - ] + "condition": { + "page10type": [ + "FourValues", + "FourValues2", + "RollPitch", + "SixValues", + "ThreeValues", + "TwoValues", + "WindRoseFlex" + ], + "visiblePages": [ + "10" + ] + } }, { "name": "page10value3", @@ -3815,23 +3713,18 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page10type": "FourValues" - }, - { - "page10type": "FourValues2" - }, - { - "page10type": "SixValues" - }, - { - "page10type": "ThreeValues" - }, - { - "page10type": "WindRoseFlex" - } - ] + "condition": { + "page10type": [ + "FourValues", + "FourValues2", + "SixValues", + "ThreeValues", + "WindRoseFlex" + ], + "visiblePages": [ + "10" + ] + } }, { "name": "page10value4", @@ -3843,20 +3736,17 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page10type": "FourValues" - }, - { - "page10type": "FourValues2" - }, - { - "page10type": "SixValues" - }, - { - "page10type": "WindRoseFlex" - } - ] + "condition": { + "page10type": [ + "FourValues", + "FourValues2", + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + "10" + ] + } }, { "name": "page10value5", @@ -3868,11 +3758,14 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page10type": "SixValues" - } - ] + "condition": { + "page10type": [ + "SixValues" + ], + "visiblePages": [ + "10" + ] + } }, { "name": "page10value6", @@ -3884,11 +3777,14 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page10type": "SixValues" - } - ] + "condition": { + "page10type": [ + "SixValues" + ], + "visiblePages": [ + "10" + ] + } }, { "name": "page10fluid", @@ -3930,10 +3826,11 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page10type": "Fluid" - } - ] + "condition": { + "page10type": "Fluid", + "visiblePages": [ + "10" + ] + } } ] diff --git a/lib/obp60task/config_obp40.json b/lib/obp60task/config_obp40.json index 1eeaa2f..9addd67 100644 --- a/lib/obp60task/config_obp40.json +++ b/lib/obp60task/config_obp40.json @@ -746,19 +746,8 @@ "obp40":"true" }, "condition": [ - { "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" } ] + { "calInstance1": ["AWA", "AWS", "COG", "DBT", "HDM", "PRPOS", "RPOS", "SOG", "STW", "TWA", "TWS", "TWD", "WTemp" ] } + ] }, { "name": "calSlope1", @@ -771,19 +760,8 @@ "obp40":"true" }, "condition": [ - { "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" } ] + { "calInstance1": ["AWA", "AWS", "COG", "DBT", "HDM", "PRPOS", "RPOS", "SOG", "STW", "TWA", "TWS", "TWD", "WTemp" ] } + ] }, { "name": "calSmooth1", @@ -799,19 +777,8 @@ "obp40":"true" }, "condition": [ - { "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" } ] + { "calInstance1": ["AWA", "AWS", "COG", "DBT", "HDM", "PRPOS", "RPOS", "SOG", "STW", "TWA", "TWS", "TWD", "WTemp" ] } + ] }, { "name": "calInstance2", @@ -851,19 +818,8 @@ "obp40":"true" }, "condition": [ - { "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" } ] + { "calInstance2": ["AWA", "AWS", "COG", "DBT", "HDM", "PRPOS", "RPOS", "SOG", "STW", "TWA", "TWS", "TWD", "WTemp" ] } + ] }, { "name": "calSlope2", @@ -876,19 +832,8 @@ "obp40":"true" }, "condition": [ - { "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" } ] + { "calInstance2": ["AWA", "AWS", "COG", "DBT", "HDM", "PRPOS", "RPOS", "SOG", "STW", "TWA", "TWS", "TWD", "WTemp" ] } + ] }, { "name": "calSmooth2", @@ -904,19 +849,8 @@ "obp40":"true" }, "condition": [ - { "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" } ] + { "calInstance2": ["AWA", "AWS", "COG", "DBT", "HDM", "PRPOS", "RPOS", "SOG", "STW", "TWA", "TWS", "TWD", "WTemp" ] } + ] }, { "name": "calInstance3", @@ -956,19 +890,8 @@ "obp40":"true" }, "condition": [ - { "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" } ] + { "calInstance3": ["AWA", "AWS", "COG", "DBT", "HDM", "PRPOS", "RPOS", "SOG", "STW", "TWA", "TWS", "TWD", "WTemp" ] } + ] }, { "name": "calSlope3", @@ -981,19 +904,8 @@ "obp40":"true" }, "condition": [ - { "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" } ] + { "calInstance3": ["AWA", "AWS", "COG", "DBT", "HDM", "PRPOS", "RPOS", "SOG", "STW", "TWA", "TWS", "TWD", "WTemp" ] } + ] }, { "name": "calSmooth3", @@ -1009,19 +921,8 @@ "obp40":"true" }, "condition": [ - { "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" } ] + { "calInstance3": ["AWA", "AWS", "COG", "DBT", "HDM", "PRPOS", "RPOS", "SOG", "STW", "TWA", "TWS", "TWD", "WTemp" ] } + ] }, { "name": "display", @@ -1334,11 +1235,12 @@ "obp40": "true" } }, + { "name": "page1type", "label": "Type", "type": "list", - "default": "Clock", + "default": "Voltage", "description": "Type of page for page 1", "list": [ "BME280", @@ -1372,38 +1274,20 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "visiblePages": 1 - }, - { - "visiblePages": 2 - }, - { - "visiblePages": 3 - }, - { - "visiblePages": 4 - }, - { - "visiblePages": 5 - }, - { - "visiblePages": 6 - }, - { - "visiblePages": 7 - }, - { - "visiblePages": 8 - }, - { - "visiblePages": 9 - }, - { - "visiblePages": 10 - } - ] + "condition": { + "visiblePages": [ + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page1value1", @@ -1415,35 +1299,31 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page1type": "Fluid" - }, - { - "page1type": "FourValues" - }, - { - "page1type": "FourValues2" - }, - { - "page1type": "OneValue" - }, - { - "page1type": "RollPitch" - }, - { - "page1type": "SixValues" - }, - { - "page1type": "ThreeValues" - }, - { - "page1type": "TwoValues" - }, - { - "page1type": "WindRoseFlex" - } - ] + "condition": { + "page1type": [ + "Fluid", + "FourValues", + "FourValues2", + "OneValue", + "RollPitch", + "SixValues", + "ThreeValues", + "TwoValues", + "WindRoseFlex" + ], + "visiblePages": [ + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page1value2", @@ -1455,29 +1335,29 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page1type": "FourValues" - }, - { - "page1type": "FourValues2" - }, - { - "page1type": "RollPitch" - }, - { - "page1type": "SixValues" - }, - { - "page1type": "ThreeValues" - }, - { - "page1type": "TwoValues" - }, - { - "page1type": "WindRoseFlex" - } - ] + "condition": { + "page1type": [ + "FourValues", + "FourValues2", + "RollPitch", + "SixValues", + "ThreeValues", + "TwoValues", + "WindRoseFlex" + ], + "visiblePages": [ + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page1value3", @@ -1489,23 +1369,27 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page1type": "FourValues" - }, - { - "page1type": "FourValues2" - }, - { - "page1type": "SixValues" - }, - { - "page1type": "ThreeValues" - }, - { - "page1type": "WindRoseFlex" - } - ] + "condition": { + "page1type": [ + "FourValues", + "FourValues2", + "SixValues", + "ThreeValues", + "WindRoseFlex" + ], + "visiblePages": [ + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page1value4", @@ -1517,20 +1401,26 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page1type": "FourValues" - }, - { - "page1type": "FourValues2" - }, - { - "page1type": "SixValues" - }, - { - "page1type": "WindRoseFlex" - } - ] + "condition": { + "page1type": [ + "FourValues", + "FourValues2", + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page1value5", @@ -1542,14 +1432,23 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page1type": "SixValues" - }, - { - "page1type": "WindRoseFlex" - } - ] + "condition": { + "page1type": [ + "SixValues" + ], + "visiblePages": [ + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page1value6", @@ -1561,14 +1460,23 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page1type": "SixValues" - }, - { - "page1type": "WindRoseFlex" - } - ] + "condition": { + "page1type": [ + "SixValues" + ], + "visiblePages": [ + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page1fluid", @@ -1610,18 +1518,28 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page1type": "Fluid" - } - ] + "condition": { + "page1type": "Fluid", + "visiblePages": [ + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page1wndsrc", "label": "Wind source", "type": "list", "default": "True wind", - "description": "Wind source for page 1: [true|apparant]", + "description": "Wind source for page 1: [true|apparent]", "list": [ "True wind", "Apparant wind" @@ -1630,17 +1548,27 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page1type": "WindPlot" - } - ] + "condition": { + "page1type": "WindPlot", + "visiblePages": [ + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page2type", "label": "Type", "type": "list", - "default": "Wind", + "default": "WindRose", "description": "Type of page for page 2", "list": [ "BME280", @@ -1674,35 +1602,19 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "visiblePages": 2 - }, - { - "visiblePages": 3 - }, - { - "visiblePages": 4 - }, - { - "visiblePages": 5 - }, - { - "visiblePages": 6 - }, - { - "visiblePages": 7 - }, - { - "visiblePages": 8 - }, - { - "visiblePages": 9 - }, - { - "visiblePages": 10 - } - ] + "condition": { + "visiblePages": [ + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page2value1", @@ -1714,35 +1626,30 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page2type": "Fluid" - }, - { - "page2type": "FourValues" - }, - { - "page2type": "FourValues2" - }, - { - "page2type": "OneValue" - }, - { - "page2type": "RollPitch" - }, - { - "page2type": "SixValues" - }, - { - "page2type": "ThreeValues" - }, - { - "page2type": "TwoValues" - }, - { - "page2type": "WindRoseFlex" - } - ] + "condition": { + "page2type": [ + "Fluid", + "FourValues", + "FourValues2", + "OneValue", + "RollPitch", + "SixValues", + "ThreeValues", + "TwoValues", + "WindRoseFlex" + ], + "visiblePages": [ + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page2value2", @@ -1754,29 +1661,28 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page2type": "FourValues" - }, - { - "page2type": "FourValues2" - }, - { - "page2type": "RollPitch" - }, - { - "page2type": "SixValues" - }, - { - "page2type": "ThreeValues" - }, - { - "page2type": "TwoValues" - }, - { - "page2type": "WindRoseFlex" - } - ] + "condition": { + "page2type": [ + "FourValues", + "FourValues2", + "RollPitch", + "SixValues", + "ThreeValues", + "TwoValues", + "WindRoseFlex" + ], + "visiblePages": [ + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page2value3", @@ -1788,23 +1694,26 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page2type": "FourValues" - }, - { - "page2type": "FourValues2" - }, - { - "page2type": "SixValues" - }, - { - "page2type": "ThreeValues" - }, - { - "page2type": "WindRoseFlex" - } - ] + "condition": { + "page2type": [ + "FourValues", + "FourValues2", + "SixValues", + "ThreeValues", + "WindRoseFlex" + ], + "visiblePages": [ + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page2value4", @@ -1816,20 +1725,25 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page2type": "FourValues" - }, - { - "page2type": "FourValues2" - }, - { - "page2type": "SixValues" - }, - { - "page2type": "WindRoseFlex" - } - ] + "condition": { + "page2type": [ + "FourValues", + "FourValues2", + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page2value5", @@ -1841,14 +1755,22 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page2type": "SixValues" - }, - { - "page2type": "WindRoseFlex" - } - ] + "condition": { + "page2type": [ + "SixValues" + ], + "visiblePages": [ + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page2value6", @@ -1860,14 +1782,22 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page2type": "SixValues" - }, - { - "page2type": "WindRoseFlex" - } - ] + "condition": { + "page2type": [ + "SixValues" + ], + "visiblePages": [ + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page2fluid", @@ -1909,18 +1839,27 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page2type": "Fluid" - } - ] + "condition": { + "page2type": "Fluid", + "visiblePages": [ + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page2wndsrc", "label": "Wind source", "type": "list", "default": "True wind", - "description": "Wind source for page 2: [true|apparant]", + "description": "Wind source for page 2: [true|apparent]", "list": [ "True wind", "Apparant wind" @@ -1929,11 +1868,20 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page2type": "WindPlot" - } - ] + "condition": { + "page2type": "WindPlot", + "visiblePages": [ + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page3type", @@ -1973,32 +1921,18 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "visiblePages": 3 - }, - { - "visiblePages": 4 - }, - { - "visiblePages": 5 - }, - { - "visiblePages": 6 - }, - { - "visiblePages": 7 - }, - { - "visiblePages": 8 - }, - { - "visiblePages": 9 - }, - { - "visiblePages": 10 - } - ] + "condition": { + "visiblePages": [ + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page3value1", @@ -2010,35 +1944,29 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page3type": "Fluid" - }, - { - "page3type": "FourValues" - }, - { - "page3type": "FourValues2" - }, - { - "page3type": "OneValue" - }, - { - "page3type": "RollPitch" - }, - { - "page3type": "SixValues" - }, - { - "page3type": "ThreeValues" - }, - { - "page3type": "TwoValues" - }, - { - "page3type": "WindRoseFlex" - } - ] + "condition": { + "page3type": [ + "Fluid", + "FourValues", + "FourValues2", + "OneValue", + "RollPitch", + "SixValues", + "ThreeValues", + "TwoValues", + "WindRoseFlex" + ], + "visiblePages": [ + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page3value2", @@ -2050,29 +1978,27 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page3type": "FourValues" - }, - { - "page3type": "FourValues2" - }, - { - "page3type": "RollPitch" - }, - { - "page3type": "SixValues" - }, - { - "page3type": "ThreeValues" - }, - { - "page3type": "TwoValues" - }, - { - "page3type": "WindRoseFlex" - } - ] + "condition": { + "page3type": [ + "FourValues", + "FourValues2", + "RollPitch", + "SixValues", + "ThreeValues", + "TwoValues", + "WindRoseFlex" + ], + "visiblePages": [ + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page3value3", @@ -2084,23 +2010,25 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page3type": "FourValues" - }, - { - "page3type": "FourValues2" - }, - { - "page3type": "SixValues" - }, - { - "page3type": "ThreeValues" - }, - { - "page3type": "WindRoseFlex" - } - ] + "condition": { + "page3type": [ + "FourValues", + "FourValues2", + "SixValues", + "ThreeValues", + "WindRoseFlex" + ], + "visiblePages": [ + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page3value4", @@ -2112,20 +2040,24 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page3type": "FourValues" - }, - { - "page3type": "FourValues2" - }, - { - "page3type": "SixValues" - }, - { - "page3type": "WindRoseFlex" - } - ] + "condition": { + "page3type": [ + "FourValues", + "FourValues2", + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page3value5", @@ -2137,14 +2069,21 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page3type": "SixValues" - }, - { - "page3type": "WindRoseFlex" - } - ] + "condition": { + "page3type": [ + "SixValues" + ], + "visiblePages": [ + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page3value6", @@ -2156,14 +2095,21 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page3type": "SixValues" - }, - { - "page3type": "WindRoseFlex" - } - ] + "condition": { + "page3type": [ + "SixValues" + ], + "visiblePages": [ + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page3fluid", @@ -2205,18 +2151,26 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page3type": "Fluid" - } - ] + "condition": { + "page3type": "Fluid", + "visiblePages": [ + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page3wndsrc", "label": "Wind source", "type": "list", "default": "True wind", - "description": "Wind source for page 3: [true|apparant]", + "description": "Wind source for page 3: [true|apparent]", "list": [ "True wind", "Apparant wind" @@ -2225,11 +2179,19 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page3type": "WindPlot" - } - ] + "condition": { + "page3type": "WindPlot", + "visiblePages": [ + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page4type", @@ -2269,29 +2231,17 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "visiblePages": 4 - }, - { - "visiblePages": 5 - }, - { - "visiblePages": 6 - }, - { - "visiblePages": 7 - }, - { - "visiblePages": 8 - }, - { - "visiblePages": 9 - }, - { - "visiblePages": 10 - } - ] + "condition": { + "visiblePages": [ + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page4value1", @@ -2303,35 +2253,28 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page4type": "Fluid" - }, - { - "page4type": "FourValues" - }, - { - "page4type": "FourValues2" - }, - { - "page4type": "OneValue" - }, - { - "page4type": "RollPitch" - }, - { - "page4type": "SixValues" - }, - { - "page4type": "ThreeValues" - }, - { - "page4type": "TwoValues" - }, - { - "page4type": "WindRoseFlex" - } - ] + "condition": { + "page4type": [ + "Fluid", + "FourValues", + "FourValues2", + "OneValue", + "RollPitch", + "SixValues", + "ThreeValues", + "TwoValues", + "WindRoseFlex" + ], + "visiblePages": [ + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page4value2", @@ -2343,29 +2286,26 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page4type": "FourValues" - }, - { - "page4type": "FourValues2" - }, - { - "page4type": "RollPitch" - }, - { - "page4type": "SixValues" - }, - { - "page4type": "ThreeValues" - }, - { - "page4type": "TwoValues" - }, - { - "page4type": "WindRoseFlex" - } - ] + "condition": { + "page4type": [ + "FourValues", + "FourValues2", + "RollPitch", + "SixValues", + "ThreeValues", + "TwoValues", + "WindRoseFlex" + ], + "visiblePages": [ + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page4value3", @@ -2377,23 +2317,24 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page4type": "FourValues" - }, - { - "page4type": "FourValues2" - }, - { - "page4type": "SixValues" - }, - { - "page4type": "ThreeValues" - }, - { - "page4type": "WindRoseFlex" - } - ] + "condition": { + "page4type": [ + "FourValues", + "FourValues2", + "SixValues", + "ThreeValues", + "WindRoseFlex" + ], + "visiblePages": [ + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page4value4", @@ -2405,20 +2346,23 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page4type": "FourValues" - }, - { - "page4type": "FourValues2" - }, - { - "page4type": "SixValues" - }, - { - "page4type": "WindRoseFlex" - } - ] + "condition": { + "page4type": [ + "FourValues", + "FourValues2", + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page4value5", @@ -2430,14 +2374,20 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page4type": "SixValues" - }, - { - "page4type": "WindRoseFlex" - } - ] + "condition": { + "page4type": [ + "SixValues" + ], + "visiblePages": [ + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page4value6", @@ -2449,14 +2399,20 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page4type": "SixValues" - }, - { - "page4type": "WindRoseFlex" - } - ] + "condition": { + "page4type": [ + "SixValues" + ], + "visiblePages": [ + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page4fluid", @@ -2498,18 +2454,25 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page4type": "Fluid" - } - ] + "condition": { + "page4type": "Fluid", + "visiblePages": [ + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page4wndsrc", "label": "Wind source", "type": "list", "default": "True wind", - "description": "Wind source for page 4: [true|apparant]", + "description": "Wind source for page 4: [true|apparent]", "list": [ "True wind", "Apparant wind" @@ -2518,11 +2481,18 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page4type": "WindPlot" - } - ] + "condition": { + "page4type": "WindPlot", + "visiblePages": [ + "4", + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page5type", @@ -2562,26 +2532,16 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "visiblePages": 5 - }, - { - "visiblePages": 6 - }, - { - "visiblePages": 7 - }, - { - "visiblePages": 8 - }, - { - "visiblePages": 9 - }, - { - "visiblePages": 10 - } - ] + "condition": { + "visiblePages": [ + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page5value1", @@ -2593,35 +2553,27 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page5type": "Fluid" - }, - { - "page5type": "FourValues" - }, - { - "page5type": "FourValues2" - }, - { - "page5type": "OneValue" - }, - { - "page5type": "RollPitch" - }, - { - "page5type": "SixValues" - }, - { - "page5type": "ThreeValues" - }, - { - "page5type": "TwoValues" - }, - { - "page5type": "WindRoseFlex" - } - ] + "condition": { + "page5type": [ + "Fluid", + "FourValues", + "FourValues2", + "OneValue", + "RollPitch", + "SixValues", + "ThreeValues", + "TwoValues", + "WindRoseFlex" + ], + "visiblePages": [ + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page5value2", @@ -2633,29 +2585,25 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page5type": "FourValues" - }, - { - "page5type": "FourValues2" - }, - { - "page5type": "RollPitch" - }, - { - "page5type": "SixValues" - }, - { - "page5type": "ThreeValues" - }, - { - "page5type": "TwoValues" - }, - { - "page5type": "WindRoseFlex" - } - ] + "condition": { + "page5type": [ + "FourValues", + "FourValues2", + "RollPitch", + "SixValues", + "ThreeValues", + "TwoValues", + "WindRoseFlex" + ], + "visiblePages": [ + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page5value3", @@ -2667,23 +2615,23 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page5type": "FourValues" - }, - { - "page5type": "FourValues2" - }, - { - "page5type": "SixValues" - }, - { - "page5type": "ThreeValues" - }, - { - "page5type": "WindRoseFlex" - } - ] + "condition": { + "page5type": [ + "FourValues", + "FourValues2", + "SixValues", + "ThreeValues", + "WindRoseFlex" + ], + "visiblePages": [ + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page5value4", @@ -2695,20 +2643,22 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page5type": "FourValues" - }, - { - "page5type": "FourValues2" - }, - { - "page5type": "SixValues" - }, - { - "page5type": "WindRoseFlex" - } - ] + "condition": { + "page5type": [ + "FourValues", + "FourValues2", + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page5value5", @@ -2720,14 +2670,19 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page5type": "SixValues" - }, - { - "page5type": "WindRoseFlex" - } - ] + "condition": { + "page5type": [ + "SixValues" + ], + "visiblePages": [ + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page5value6", @@ -2739,14 +2694,19 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page5type": "SixValues" - }, - { - "page5type": "WindRoseFlex" - } - ] + "condition": { + "page5type": [ + "SixValues" + ], + "visiblePages": [ + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page5fluid", @@ -2788,18 +2748,24 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page5type": "Fluid" - } - ] + "condition": { + "page5type": "Fluid", + "visiblePages": [ + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page5wndsrc", "label": "Wind source", "type": "list", "default": "True wind", - "description": "Wind source for page 5: [true|apparant]", + "description": "Wind source for page 5: [true|apparent]", "list": [ "True wind", "Apparant wind" @@ -2808,11 +2774,17 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page5type": "WindPlot" - } - ] + "condition": { + "page5type": "WindPlot", + "visiblePages": [ + "5", + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page6type", @@ -2852,23 +2824,15 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "visiblePages": 6 - }, - { - "visiblePages": 7 - }, - { - "visiblePages": 8 - }, - { - "visiblePages": 9 - }, - { - "visiblePages": 10 - } - ] + "condition": { + "visiblePages": [ + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page6value1", @@ -2880,35 +2844,26 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page6type": "Fluid" - }, - { - "page6type": "FourValues" - }, - { - "page6type": "FourValues2" - }, - { - "page6type": "OneValue" - }, - { - "page6type": "RollPitch" - }, - { - "page6type": "SixValues" - }, - { - "page6type": "ThreeValues" - }, - { - "page6type": "TwoValues" - }, - { - "page6type": "WindRoseFlex" - } - ] + "condition": { + "page6type": [ + "Fluid", + "FourValues", + "FourValues2", + "OneValue", + "RollPitch", + "SixValues", + "ThreeValues", + "TwoValues", + "WindRoseFlex" + ], + "visiblePages": [ + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page6value2", @@ -2920,29 +2875,24 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page6type": "FourValues" - }, - { - "page6type": "FourValues2" - }, - { - "page6type": "RollPitch" - }, - { - "page6type": "SixValues" - }, - { - "page6type": "ThreeValues" - }, - { - "page6type": "TwoValues" - }, - { - "page6type": "WindRoseFlex" - } - ] + "condition": { + "page6type": [ + "FourValues", + "FourValues2", + "RollPitch", + "SixValues", + "ThreeValues", + "TwoValues", + "WindRoseFlex" + ], + "visiblePages": [ + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page6value3", @@ -2954,23 +2904,22 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page6type": "FourValues" - }, - { - "page6type": "FourValues2" - }, - { - "page6type": "SixValues" - }, - { - "page6type": "ThreeValues" - }, - { - "page6type": "WindRoseFlex" - } - ] + "condition": { + "page6type": [ + "FourValues", + "FourValues2", + "SixValues", + "ThreeValues", + "WindRoseFlex" + ], + "visiblePages": [ + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page6value4", @@ -2982,20 +2931,21 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page6type": "FourValues" - }, - { - "page6type": "FourValues2" - }, - { - "page6type": "SixValues" - }, - { - "page6type": "WindRoseFlex" - } - ] + "condition": { + "page6type": [ + "FourValues", + "FourValues2", + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page6value5", @@ -3007,14 +2957,18 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page6type": "SixValues" - }, - { - "page6type": "WindRoseFlex" - } - ] + "condition": { + "page6type": [ + "SixValues" + ], + "visiblePages": [ + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page6value6", @@ -3026,14 +2980,18 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page6type": "SixValues" - }, - { - "page6type": "WindRoseFlex" - } - ] + "condition": { + "page6type": [ + "SixValues" + ], + "visiblePages": [ + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page6fluid", @@ -3075,18 +3033,23 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page6type": "Fluid" - } - ] + "condition": { + "page6type": "Fluid", + "visiblePages": [ + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page6wndsrc", "label": "Wind source", "type": "list", "default": "True wind", - "description": "Wind source for page 6: [true|apparant]", + "description": "Wind source for page 6: [true|apparent]", "list": [ "True wind", "Apparant wind" @@ -3095,11 +3058,16 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page6type": "WindPlot" - } - ] + "condition": { + "page6type": "WindPlot", + "visiblePages": [ + "6", + "7", + "8", + "9", + "10" + ] + } }, { "name": "page7type", @@ -3139,20 +3107,14 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "visiblePages": 7 - }, - { - "visiblePages": 8 - }, - { - "visiblePages": 9 - }, - { - "visiblePages": 10 - } - ] + "condition": { + "visiblePages": [ + "7", + "8", + "9", + "10" + ] + } }, { "name": "page7value1", @@ -3164,35 +3126,25 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page7type": "Fluid" - }, - { - "page7type": "FourValues" - }, - { - "page7type": "FourValues2" - }, - { - "page7type": "OneValue" - }, - { - "page7type": "RollPitch" - }, - { - "page7type": "SixValues" - }, - { - "page7type": "ThreeValues" - }, - { - "page7type": "TwoValues" - }, - { - "page7type": "WindRoseFlex" - } - ] + "condition": { + "page7type": [ + "Fluid", + "FourValues", + "FourValues2", + "OneValue", + "RollPitch", + "SixValues", + "ThreeValues", + "TwoValues", + "WindRoseFlex" + ], + "visiblePages": [ + "7", + "8", + "9", + "10" + ] + } }, { "name": "page7value2", @@ -3204,29 +3156,23 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page7type": "FourValues" - }, - { - "page7type": "FourValues2" - }, - { - "page7type": "RollPitch" - }, - { - "page7type": "SixValues" - }, - { - "page7type": "ThreeValues" - }, - { - "page7type": "TwoValues" - }, - { - "page7type": "WindRoseFlex" - } - ] + "condition": { + "page7type": [ + "FourValues", + "FourValues2", + "RollPitch", + "SixValues", + "ThreeValues", + "TwoValues", + "WindRoseFlex" + ], + "visiblePages": [ + "7", + "8", + "9", + "10" + ] + } }, { "name": "page7value3", @@ -3238,23 +3184,21 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page7type": "FourValues" - }, - { - "page7type": "FourValues2" - }, - { - "page7type": "SixValues" - }, - { - "page7type": "ThreeValues" - }, - { - "page7type": "WindRoseFlex" - } - ] + "condition": { + "page7type": [ + "FourValues", + "FourValues2", + "SixValues", + "ThreeValues", + "WindRoseFlex" + ], + "visiblePages": [ + "7", + "8", + "9", + "10" + ] + } }, { "name": "page7value4", @@ -3266,20 +3210,20 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page7type": "FourValues" - }, - { - "page7type": "FourValues2" - }, - { - "page7type": "SixValues" - }, - { - "page7type": "WindRoseFlex" - } - ] + "condition": { + "page7type": [ + "FourValues", + "FourValues2", + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + "7", + "8", + "9", + "10" + ] + } }, { "name": "page7value5", @@ -3291,14 +3235,17 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page7type": "SixValues" - }, - { - "page7type": "WindRoseFlex" - } - ] + "condition": { + "page7type": [ + "SixValues" + ], + "visiblePages": [ + "7", + "8", + "9", + "10" + ] + } }, { "name": "page7value6", @@ -3310,14 +3257,17 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page7type": "SixValues" - }, - { - "page7type": "WindRoseFlex" - } - ] + "condition": { + "page7type": [ + "SixValues" + ], + "visiblePages": [ + "7", + "8", + "9", + "10" + ] + } }, { "name": "page7fluid", @@ -3359,18 +3309,22 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page7type": "Fluid" - } - ] + "condition": { + "page7type": "Fluid", + "visiblePages": [ + "7", + "8", + "9", + "10" + ] + } }, { "name": "page7wndsrc", "label": "Wind source", "type": "list", "default": "True wind", - "description": "Wind source for page 7: [true|apparant]", + "description": "Wind source for page 7: [true|apparent]", "list": [ "True wind", "Apparant wind" @@ -3379,17 +3333,21 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page7type": "WindPlot" - } - ] + "condition": { + "page7type": "WindPlot", + "visiblePages": [ + "7", + "8", + "9", + "10" + ] + } }, { "name": "page8type", "label": "Type", "type": "list", - "default": "Fluid", + "default": "Clock", "description": "Type of page for page 8", "list": [ "BME280", @@ -3423,17 +3381,13 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "visiblePages": 8 - }, - { - "visiblePages": 9 - }, - { - "visiblePages": 10 - } - ] + "condition": { + "visiblePages": [ + "8", + "9", + "10" + ] + } }, { "name": "page8value1", @@ -3445,35 +3399,24 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page8type": "Fluid" - }, - { - "page8type": "FourValues" - }, - { - "page8type": "FourValues2" - }, - { - "page8type": "OneValue" - }, - { - "page8type": "RollPitch" - }, - { - "page8type": "SixValues" - }, - { - "page8type": "ThreeValues" - }, - { - "page8type": "TwoValues" - }, - { - "page8type": "WindRoseFlex" - } - ] + "condition": { + "page8type": [ + "Fluid", + "FourValues", + "FourValues2", + "OneValue", + "RollPitch", + "SixValues", + "ThreeValues", + "TwoValues", + "WindRoseFlex" + ], + "visiblePages": [ + "8", + "9", + "10" + ] + } }, { "name": "page8value2", @@ -3485,29 +3428,22 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page8type": "FourValues" - }, - { - "page8type": "FourValues2" - }, - { - "page8type": "RollPitch" - }, - { - "page8type": "SixValues" - }, - { - "page8type": "ThreeValues" - }, - { - "page8type": "TwoValues" - }, - { - "page8type": "WindRoseFlex" - } - ] + "condition": { + "page8type": [ + "FourValues", + "FourValues2", + "RollPitch", + "SixValues", + "ThreeValues", + "TwoValues", + "WindRoseFlex" + ], + "visiblePages": [ + "8", + "9", + "10" + ] + } }, { "name": "page8value3", @@ -3519,23 +3455,20 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page8type": "FourValues" - }, - { - "page8type": "FourValues2" - }, - { - "page8type": "SixValues" - }, - { - "page8type": "ThreeValues" - }, - { - "page8type": "WindRoseFlex" - } - ] + "condition": { + "page8type": [ + "FourValues", + "FourValues2", + "SixValues", + "ThreeValues", + "WindRoseFlex" + ], + "visiblePages": [ + "8", + "9", + "10" + ] + } }, { "name": "page8value4", @@ -3547,20 +3480,19 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page8type": "FourValues" - }, - { - "page8type": "FourValues2" - }, - { - "page8type": "SixValues" - }, - { - "page8type": "WindRoseFlex" - } - ] + "condition": { + "page8type": [ + "FourValues", + "FourValues2", + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + "8", + "9", + "10" + ] + } }, { "name": "page8value5", @@ -3572,14 +3504,16 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page8type": "SixValues" - }, - { - "page8type": "WindRoseFlex" - } - ] + "condition": { + "page8type": [ + "SixValues" + ], + "visiblePages": [ + "8", + "9", + "10" + ] + } }, { "name": "page8value6", @@ -3591,14 +3525,16 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page8type": "SixValues" - }, - { - "page8type": "WindRoseFlex" - } - ] + "condition": { + "page8type": [ + "SixValues" + ], + "visiblePages": [ + "8", + "9", + "10" + ] + } }, { "name": "page8fluid", @@ -3640,18 +3576,21 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page8type": "Fluid" - } - ] + "condition": { + "page8type": "Fluid", + "visiblePages": [ + "8", + "9", + "10" + ] + } }, { "name": "page8wndsrc", "label": "Wind source", "type": "list", "default": "True wind", - "description": "Wind source for page 8: [true|apparant]", + "description": "Wind source for page 8: [true|apparent]", "list": [ "True wind", "Apparant wind" @@ -3660,11 +3599,14 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page8type": "WindPlot" - } - ] + "condition": { + "page8type": "WindPlot", + "visiblePages": [ + "8", + "9", + "10" + ] + } }, { "name": "page9type", @@ -3704,14 +3646,12 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "visiblePages": 9 - }, - { - "visiblePages": 10 - } - ] + "condition": { + "visiblePages": [ + "9", + "10" + ] + } }, { "name": "page9value1", @@ -3723,35 +3663,23 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page9type": "Fluid" - }, - { - "page9type": "FourValues" - }, - { - "page9type": "FourValues2" - }, - { - "page9type": "OneValue" - }, - { - "page9type": "RollPitch" - }, - { - "page9type": "SixValues" - }, - { - "page9type": "ThreeValues" - }, - { - "page9type": "TwoValues" - }, - { - "page9type": "WindRoseFlex" - } - ] + "condition": { + "page9type": [ + "Fluid", + "FourValues", + "FourValues2", + "OneValue", + "RollPitch", + "SixValues", + "ThreeValues", + "TwoValues", + "WindRoseFlex" + ], + "visiblePages": [ + "9", + "10" + ] + } }, { "name": "page9value2", @@ -3763,29 +3691,21 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page9type": "FourValues" - }, - { - "page9type": "FourValues2" - }, - { - "page9type": "RollPitch" - }, - { - "page9type": "SixValues" - }, - { - "page9type": "ThreeValues" - }, - { - "page9type": "TwoValues" - }, - { - "page9type": "WindRoseFlex" - } - ] + "condition": { + "page9type": [ + "FourValues", + "FourValues2", + "RollPitch", + "SixValues", + "ThreeValues", + "TwoValues", + "WindRoseFlex" + ], + "visiblePages": [ + "9", + "10" + ] + } }, { "name": "page9value3", @@ -3797,23 +3717,19 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page9type": "FourValues" - }, - { - "page9type": "FourValues2" - }, - { - "page9type": "SixValues" - }, - { - "page9type": "ThreeValues" - }, - { - "page9type": "WindRoseFlex" - } - ] + "condition": { + "page9type": [ + "FourValues", + "FourValues2", + "SixValues", + "ThreeValues", + "WindRoseFlex" + ], + "visiblePages": [ + "9", + "10" + ] + } }, { "name": "page9value4", @@ -3825,20 +3741,18 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page9type": "FourValues" - }, - { - "page9type": "FourValues2" - }, - { - "page9type": "SixValues" - }, - { - "page9type": "WindRoseFlex" - } - ] + "condition": { + "page9type": [ + "FourValues", + "FourValues2", + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + "9", + "10" + ] + } }, { "name": "page9value5", @@ -3850,14 +3764,15 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page9type": "SixValues" - }, - { - "page9type": "WindRoseFlex" - } - ] + "condition": { + "page9type": [ + "SixValues" + ], + "visiblePages": [ + "9", + "10" + ] + } }, { "name": "page9value6", @@ -3869,14 +3784,15 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page9type": "SixValues" - }, - { - "page9type": "WindRoseFlex" - } - ] + "condition": { + "page9type": [ + "SixValues" + ], + "visiblePages": [ + "9", + "10" + ] + } }, { "name": "page9fluid", @@ -3918,18 +3834,20 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page9type": "Fluid" - } - ] + "condition": { + "page9type": "Fluid", + "visiblePages": [ + "9", + "10" + ] + } }, { "name": "page9wndsrc", "label": "Wind source", "type": "list", "default": "True wind", - "description": "Wind source for page 9: [true|apparant]", + "description": "Wind source for page 9: [true|apparent]", "list": [ "True wind", "Apparant wind" @@ -3938,11 +3856,13 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page9type": "WindPlot" - } - ] + "condition": { + "page9type": "WindPlot", + "visiblePages": [ + "9", + "10" + ] + } }, { "name": "page10type", @@ -3982,11 +3902,11 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "visiblePages": 10 - } - ] + "condition": { + "visiblePages": [ + "10" + ] + } }, { "name": "page10value1", @@ -3998,35 +3918,22 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page10type": "Fluid" - }, - { - "page10type": "FourValues" - }, - { - "page10type": "FourValues2" - }, - { - "page10type": "OneValue" - }, - { - "page10type": "RollPitch" - }, - { - "page10type": "SixValues" - }, - { - "page10type": "ThreeValues" - }, - { - "page10type": "TwoValues" - }, - { - "page10type": "WindRoseFlex" - } - ] + "condition": { + "page10type": [ + "Fluid", + "FourValues", + "FourValues2", + "OneValue", + "RollPitch", + "SixValues", + "ThreeValues", + "TwoValues", + "WindRoseFlex" + ], + "visiblePages": [ + "10" + ] + } }, { "name": "page10value2", @@ -4038,29 +3945,20 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page10type": "FourValues" - }, - { - "page10type": "FourValues2" - }, - { - "page10type": "RollPitch" - }, - { - "page10type": "SixValues" - }, - { - "page10type": "ThreeValues" - }, - { - "page10type": "TwoValues" - }, - { - "page10type": "WindRoseFlex" - } - ] + "condition": { + "page10type": [ + "FourValues", + "FourValues2", + "RollPitch", + "SixValues", + "ThreeValues", + "TwoValues", + "WindRoseFlex" + ], + "visiblePages": [ + "10" + ] + } }, { "name": "page10value3", @@ -4072,23 +3970,18 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page10type": "FourValues" - }, - { - "page10type": "FourValues2" - }, - { - "page10type": "SixValues" - }, - { - "page10type": "ThreeValues" - }, - { - "page10type": "WindRoseFlex" - } - ] + "condition": { + "page10type": [ + "FourValues", + "FourValues2", + "SixValues", + "ThreeValues", + "WindRoseFlex" + ], + "visiblePages": [ + "10" + ] + } }, { "name": "page10value4", @@ -4100,20 +3993,17 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page10type": "FourValues" - }, - { - "page10type": "FourValues2" - }, - { - "page10type": "SixValues" - }, - { - "page10type": "WindRoseFlex" - } - ] + "condition": { + "page10type": [ + "FourValues", + "FourValues2", + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + "10" + ] + } }, { "name": "page10value5", @@ -4125,14 +4015,14 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page10type": "SixValues" - }, - { - "page10type": "WindRoseFlex" - } - ] + "condition": { + "page10type": [ + "SixValues" + ], + "visiblePages": [ + "10" + ] + } }, { "name": "page10value6", @@ -4144,14 +4034,14 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page10type": "SixValues" - }, - { - "page10type": "WindRoseFlex" - } - ] + "condition": { + "page10type": [ + "SixValues" + ], + "visiblePages": [ + "10" + ] + } }, { "name": "page10fluid", @@ -4193,18 +4083,19 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page10type": "Fluid" - } - ] + "condition": { + "page10type": "Fluid", + "visiblePages": [ + "10" + ] + } }, { "name": "page10wndsrc", "label": "Wind source", "type": "list", "default": "True wind", - "description": "Wind source for page 10: [true|apparant]", + "description": "Wind source for page 10: [true|apparent]", "list": [ "True wind", "Apparant wind" @@ -4213,10 +4104,11 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page10type": "WindPlot" - } - ] + "condition": { + "page10type": "WindPlot", + "visiblePages": [ + "10" + ] + } } ] diff --git a/lib/obp60task/fonts/IBM8x8px.h b/lib/obp60task/fonts/IBM8x8px.h new file mode 100644 index 0000000..fb617e6 --- /dev/null +++ b/lib/obp60task/fonts/IBM8x8px.h @@ -0,0 +1,202 @@ +const uint8_t IBM8x8pxBitmaps[] PROGMEM = { + 0x00, /* 0x20 space */ + 0x6F, 0xF6, 0x60, 0x60, /* 0x21 exclam */ + 0xDE, 0xF6, /* 0x22 quotedbl */ + 0x6C, 0xDB, 0xFB, 0x6F, 0xED, 0x9B, 0x00, /* 0x23 numbersign */ + 0x31, 0xFC, 0x1E, 0x0F, 0xE3, 0x00, /* 0x24 dollar */ + 0xC7, 0x98, 0x61, 0x86, 0x78, 0xC0, /* 0x25 percent */ + 0x38, 0xD8, 0xE3, 0xBD, 0xD9, 0x9D, 0x80, /* 0x26 ampersand */ + 0x6F, 0x00, /* 0x27 quotesingle */ + 0x36, 0xCC, 0xC6, 0x30, /* 0x28 parenleft */ + 0xC6, 0x33, 0x36, 0xC0, /* 0x29 parenright */ + 0x66, 0x3C, 0xFF, 0x3C, 0x66, /* 0x2A asterisk */ + 0x30, 0xCF, 0xCC, 0x30, /* 0x2B plus */ + 0x6F, 0x00, /* 0x2C comma */ + 0xFC, /* 0x2D hyphen */ + 0xF0, /* 0x2E period */ + 0x06, 0x18, 0x61, 0x86, 0x18, 0x20, 0x00, /* 0x2F slash */ + 0x7D, 0x8F, 0x3E, 0xFF, 0x7C, 0xDF, 0x00, /* 0x30 zero */ + 0x31, 0xC3, 0x0C, 0x30, 0xCF, 0xC0, /* 0x31 one */ + 0x7B, 0x30, 0xCE, 0x63, 0x1F, 0xC0, /* 0x32 two */ + 0x7B, 0x30, 0xCE, 0x0F, 0x37, 0x80, /* 0x33 three */ + 0x1C, 0x79, 0xB6, 0x6F, 0xE1, 0x87, 0x80, /* 0x34 four */ + 0xFF, 0x0F, 0x83, 0x0F, 0x37, 0x80, /* 0x35 five */ + 0x39, 0x8C, 0x3E, 0xCF, 0x37, 0x80, /* 0x36 six */ + 0xFF, 0x30, 0xC6, 0x30, 0xC3, 0x00, /* 0x37 seven */ + 0x7B, 0x3C, 0xDE, 0xCF, 0x37, 0x80, /* 0x38 eight */ + 0x7B, 0x3C, 0xDF, 0x0C, 0x67, 0x00, /* 0x39 nine */ + 0xF0, 0xF0, /* 0x3A colon */ + 0x6C, 0x37, 0x80, /* 0x3B semicolon */ + 0x19, 0x99, 0x86, 0x18, 0x60, /* 0x3C less */ + 0xFC, 0x00, 0x3F, /* 0x3D equal */ + 0xC3, 0x0C, 0x33, 0x33, 0x00, /* 0x3E greater */ + 0x7B, 0x30, 0xC6, 0x30, 0x03, 0x00, /* 0x3F question */ + 0x7D, 0x8F, 0x7E, 0xFD, 0xF8, 0x1E, 0x00, /* 0x40 at */ + 0x31, 0xEC, 0xF3, 0xFF, 0x3C, 0xC0, /* 0x41 A */ + 0xFC, 0xCD, 0x9B, 0xE6, 0x6C, 0xFF, 0x00, /* 0x42 B */ + 0x3C, 0xCF, 0x06, 0x0C, 0x0C, 0xCF, 0x00, /* 0x43 C */ + 0xF8, 0xD9, 0x9B, 0x36, 0x6D, 0xBE, 0x00, /* 0x44 D */ + 0xFE, 0xC5, 0xA3, 0xC6, 0x8C, 0x7F, 0x80, /* 0x45 E */ + 0xFE, 0xC5, 0xA3, 0xC6, 0x8C, 0x3C, 0x00, /* 0x46 F */ + 0x3C, 0xCF, 0x06, 0x0C, 0xEC, 0xCF, 0x80, /* 0x47 G */ + 0xCF, 0x3C, 0xFF, 0xCF, 0x3C, 0xC0, /* 0x48 H */ + 0xF6, 0x66, 0x66, 0xF0, /* 0x49 I */ + 0x1E, 0x18, 0x30, 0x6C, 0xD9, 0x9E, 0x00, /* 0x4A J */ + 0xE6, 0xCD, 0xB3, 0xC6, 0xCC, 0xF9, 0x80, /* 0x4B K */ + 0xF0, 0xC1, 0x83, 0x06, 0x2C, 0xFF, 0x80, /* 0x4C L */ + 0xC7, 0xDF, 0xFF, 0xFD, 0x78, 0xF1, 0x80, /* 0x4D M */ + 0xC7, 0xCF, 0xDE, 0xFC, 0xF8, 0xF1, 0x80, /* 0x4E N */ + 0x38, 0xDB, 0x1E, 0x3C, 0x6D, 0x8E, 0x00, /* 0x4F O */ + 0xFC, 0xCD, 0x9B, 0xE6, 0x0C, 0x3C, 0x00, /* 0x50 P */ + 0x7B, 0x3C, 0xF3, 0xDD, 0xE1, 0xC0, /* 0x51 Q */ + 0xFC, 0xCD, 0x9B, 0xE6, 0xCC, 0xF9, 0x80, /* 0x52 R */ + 0x7B, 0x3E, 0x1C, 0x1F, 0x37, 0x80, /* 0x53 S */ + 0xFE, 0xD3, 0x0C, 0x30, 0xC7, 0x80, /* 0x54 T */ + 0xCF, 0x3C, 0xF3, 0xCF, 0x3F, 0xC0, /* 0x55 U */ + 0xCF, 0x3C, 0xF3, 0xCD, 0xE3, 0x00, /* 0x56 V */ + 0xC7, 0x8F, 0x1E, 0xBF, 0xFD, 0xF1, 0x80, /* 0x57 W */ + 0xC7, 0x8D, 0xB1, 0xC3, 0x8D, 0xB1, 0x80, /* 0x58 X */ + 0xCF, 0x3C, 0xDE, 0x30, 0xC7, 0x80, /* 0x59 Y */ + 0xFF, 0x8E, 0x30, 0xC3, 0x2C, 0xFF, 0x80, /* 0x5A Z */ + 0xFC, 0xCC, 0xCC, 0xF0, /* 0x5B bracketleft */ + 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0x80, /* 0x5C backslash */ + 0xF3, 0x33, 0x33, 0xF0, /* 0x5D bracketright */ + 0x10, 0x71, 0xB6, 0x30, /* 0x5E asciicircum */ + 0xFF, /* 0x5F underscore */ + 0xD9, 0x80, /* 0x60 grave */ + 0x78, 0x19, 0xF6, 0x67, 0x60, /* 0x61 a */ + 0xE0, 0xC1, 0x83, 0xE6, 0x6C, 0xF7, 0x00, /* 0x62 b */ + 0x7B, 0x3C, 0x33, 0x78, /* 0x63 c */ + 0x1C, 0x18, 0x33, 0xEC, 0xD9, 0x9D, 0x80, /* 0x64 d */ + 0x7B, 0x3F, 0xF0, 0x78, /* 0x65 e */ + 0x39, 0xB6, 0x3C, 0x61, 0x8F, 0x00, /* 0x66 f */ + 0x77, 0x9B, 0x33, 0xE0, 0xDF, 0x00, /* 0x67 g */ + 0xE0, 0xC1, 0xB3, 0xB6, 0x6C, 0xF9, 0x80, /* 0x68 h */ + 0x60, 0xE6, 0x66, 0xF0, /* 0x69 i */ + 0x0C, 0x00, 0xC3, 0x0F, 0x3C, 0xDE, /* 0x6A j */ + 0xE0, 0xC1, 0x9B, 0x67, 0x8D, 0xB9, 0x80, /* 0x6B k */ + 0xE6, 0x66, 0x66, 0xF0, /* 0x6C l */ + 0xCD, 0xFF, 0xFE, 0xBC, 0x60, /* 0x6D m */ + 0xFB, 0x3C, 0xF3, 0xCC, /* 0x6E n */ + 0x7B, 0x3C, 0xF3, 0x78, /* 0x6F o */ + 0xDC, 0xCD, 0x9B, 0xE6, 0x1E, 0x00, /* 0x70 p */ + 0x77, 0x9B, 0x33, 0xE0, 0xC3, 0xC0, /* 0x71 q */ + 0xDC, 0xED, 0x9B, 0x0F, 0x00, /* 0x72 r */ + 0x7F, 0x07, 0x83, 0xF8, /* 0x73 s */ + 0x23, 0x3E, 0xC6, 0x34, 0xC0, /* 0x74 t */ + 0xCD, 0x9B, 0x36, 0x67, 0x60, /* 0x75 u */ + 0xCF, 0x3C, 0xDE, 0x30, /* 0x76 v */ + 0xC7, 0xAF, 0xFF, 0xF6, 0xC0, /* 0x77 w */ + 0xC6, 0xD8, 0xE3, 0x6C, 0x60, /* 0x78 x */ + 0xCF, 0x3C, 0xDF, 0x0F, 0xE0, /* 0x79 y */ + 0xFE, 0x63, 0x19, 0xFC, /* 0x7A z */ + 0x1C, 0xC3, 0x38, 0x30, 0xC1, 0xC0, /* 0x7B braceleft */ + 0xFC, 0xFC, /* 0x7C bar */ + 0xE0, 0xC3, 0x07, 0x30, 0xCE, 0x00, /* 0x7D braceright */ + 0x77, 0xB8, /* 0x7E asciitilde */ + 0x10, 0x71, 0xB6, 0x3C, 0x7F, 0xC0 /* 0x7F uni007F */ +}; + +const GFXglyph IBM8x8pxGlyphs[] PROGMEM = { + { 0, 1, 1, 2, 0, -1 }, /* 0x20 space */ + { 1, 4, 7, 5, 0, -7 }, /* 0x21 exclam */ + { 5, 5, 3, 6, 0, -7 }, /* 0x22 quotedbl */ + { 7, 7, 7, 8, 0, -7 }, /* 0x23 numbersign */ + { 14, 6, 7, 7, 0, -7 }, /* 0x24 dollar */ + { 20, 7, 6, 8, 0, -6 }, /* 0x25 percent */ + { 26, 7, 7, 8, 0, -7 }, /* 0x26 ampersand */ + { 33, 3, 3, 4, 0, -7 }, /* 0x27 quotesingle */ + { 35, 4, 7, 5, 0, -7 }, /* 0x28 parenleft */ + { 39, 4, 7, 5, 0, -7 }, /* 0x29 parenright */ + { 43, 8, 5, 9, 0, -6 }, /* 0x2A asterisk */ + { 48, 6, 5, 7, 0, -6 }, /* 0x2B plus */ + { 52, 3, 3, 4, 0, -2 }, /* 0x2C comma */ + { 54, 6, 1, 7, 0, -4 }, /* 0x2D hyphen */ + { 55, 2, 2, 3, 0, -2 }, /* 0x2E period */ + { 56, 7, 7, 8, 0, -7 }, /* 0x2F slash */ + { 63, 7, 7, 8, 0, -7 }, /* 0x30 zero */ + { 70, 6, 7, 7, 0, -7 }, /* 0x31 one */ + { 76, 6, 7, 7, 0, -7 }, /* 0x32 two */ + { 82, 6, 7, 7, 0, -7 }, /* 0x33 three */ + { 88, 7, 7, 8, 0, -7 }, /* 0x34 four */ + { 95, 6, 7, 7, 0, -7 }, /* 0x35 five */ + { 101, 6, 7, 7, 0, -7 }, /* 0x36 six */ + { 107, 6, 7, 7, 0, -7 }, /* 0x37 seven */ + { 113, 6, 7, 7, 0, -7 }, /* 0x38 eight */ + { 119, 6, 7, 7, 0, -7 }, /* 0x39 nine */ + { 125, 2, 6, 3, 0, -6 }, /* 0x3A colon */ + { 127, 3, 6, 4, 0, -6 }, /* 0x3B semicolon */ + { 130, 5, 7, 6, 0, -7 }, /* 0x3C less */ + { 135, 6, 4, 7, 0, -5 }, /* 0x3D equal */ + { 138, 5, 7, 6, 0, -7 }, /* 0x3E greater */ + { 143, 6, 7, 7, 0, -7 }, /* 0x3F question */ + { 149, 7, 7, 8, 0, -7 }, /* 0x40 at */ + { 156, 6, 7, 7, 0, -7 }, /* 0x41 A */ + { 162, 7, 7, 8, 0, -7 }, /* 0x42 B */ + { 169, 7, 7, 8, 0, -7 }, /* 0x43 C */ + { 176, 7, 7, 8, 0, -7 }, /* 0x44 D */ + { 183, 7, 7, 8, 0, -7 }, /* 0x45 E */ + { 190, 7, 7, 8, 0, -7 }, /* 0x46 F */ + { 197, 7, 7, 8, 0, -7 }, /* 0x47 G */ + { 204, 6, 7, 7, 0, -7 }, /* 0x48 H */ + { 210, 4, 7, 5, 0, -7 }, /* 0x49 I */ + { 214, 7, 7, 8, 0, -7 }, /* 0x4A J */ + { 221, 7, 7, 8, 0, -7 }, /* 0x4B K */ + { 228, 7, 7, 8, 0, -7 }, /* 0x4C L */ + { 235, 7, 7, 8, 0, -7 }, /* 0x4D M */ + { 242, 7, 7, 8, 0, -7 }, /* 0x4E N */ + { 249, 7, 7, 8, 0, -7 }, /* 0x4F O */ + { 256, 7, 7, 8, 0, -7 }, /* 0x50 P */ + { 263, 6, 7, 7, 0, -7 }, /* 0x51 Q */ + { 269, 7, 7, 8, 0, -7 }, /* 0x52 R */ + { 276, 6, 7, 7, 0, -7 }, /* 0x53 S */ + { 282, 6, 7, 7, 0, -7 }, /* 0x54 T */ + { 288, 6, 7, 7, 0, -7 }, /* 0x55 U */ + { 294, 6, 7, 7, 0, -7 }, /* 0x56 V */ + { 300, 7, 7, 8, 0, -7 }, /* 0x57 W */ + { 307, 7, 7, 8, 0, -7 }, /* 0x58 X */ + { 314, 6, 7, 7, 0, -7 }, /* 0x59 Y */ + { 320, 7, 7, 8, 0, -7 }, /* 0x5A Z */ + { 327, 4, 7, 5, 0, -7 }, /* 0x5B bracketleft */ + { 331, 7, 7, 8, 0, -7 }, /* 0x5C backslash */ + { 338, 4, 7, 5, 0, -7 }, /* 0x5D bracketright */ + { 342, 7, 4, 8, 0, -7 }, /* 0x5E asciicircum */ + { 346, 8, 1, 9, 0, 0 }, /* 0x5F underscore */ + { 347, 3, 3, 4, 0, -7 }, /* 0x60 grave */ + { 349, 7, 5, 8, 0, -5 }, /* 0x61 a */ + { 354, 7, 7, 8, 0, -7 }, /* 0x62 b */ + { 361, 6, 5, 7, 0, -5 }, /* 0x63 c */ + { 365, 7, 7, 8, 0, -7 }, /* 0x64 d */ + { 372, 6, 5, 7, 0, -5 }, /* 0x65 e */ + { 376, 6, 7, 7, 0, -7 }, /* 0x66 f */ + { 382, 7, 6, 8, 0, -5 }, /* 0x67 g */ + { 388, 7, 7, 8, 0, -7 }, /* 0x68 h */ + { 395, 4, 7, 5, 0, -7 }, /* 0x69 i */ + { 399, 6, 8, 7, 0, -7 }, /* 0x6A j */ + { 405, 7, 7, 8, 0, -7 }, /* 0x6B k */ + { 412, 4, 7, 5, 0, -7 }, /* 0x6C l */ + { 416, 7, 5, 8, 0, -5 }, /* 0x6D m */ + { 421, 6, 5, 7, 0, -5 }, /* 0x6E n */ + { 425, 6, 5, 7, 0, -5 }, /* 0x6F o */ + { 429, 7, 6, 8, 0, -5 }, /* 0x70 p */ + { 435, 7, 6, 8, 0, -5 }, /* 0x71 q */ + { 441, 7, 5, 8, 0, -5 }, /* 0x72 r */ + { 446, 6, 5, 7, 0, -5 }, /* 0x73 s */ + { 450, 5, 7, 6, 0, -7 }, /* 0x74 t */ + { 455, 7, 5, 8, 0, -5 }, /* 0x75 u */ + { 460, 6, 5, 7, 0, -5 }, /* 0x76 v */ + { 464, 7, 5, 8, 0, -5 }, /* 0x77 w */ + { 469, 7, 5, 8, 0, -5 }, /* 0x78 x */ + { 474, 6, 6, 7, 0, -5 }, /* 0x79 y */ + { 479, 6, 5, 7, 0, -5 }, /* 0x7A z */ + { 483, 6, 7, 7, 0, -7 }, /* 0x7B braceleft */ + { 489, 2, 7, 3, 0, -7 }, /* 0x7C bar */ + { 491, 6, 7, 7, 0, -7 }, /* 0x7D braceright */ + { 497, 7, 2, 8, 0, -7 }, /* 0x7E asciitilde */ + { 499, 7, 6, 8, 0, -6 } /* 0x7F uni007F */ +}; + +const GFXfont IBM8x8px PROGMEM = { + (uint8_t *)IBM8x8pxBitmaps, + (GFXglyph *)IBM8x8pxGlyphs, + 0x20, 0x7F, 8 }; diff --git a/lib/obp60task/gen_set.py b/lib/obp60task/gen_set.py index 3e9dbd2..9d1b0ff 100755 --- a/lib/obp60task/gen_set.py +++ b/lib/obp60task/gen_set.py @@ -20,7 +20,7 @@ import getopt import re import json -__version__ = "0.2" +__version__ = "0.3" def detect_pages(filename): # returns a dictionary with page name and the number of gui fields @@ -87,6 +87,11 @@ def create_json(device, no_of_pages, pagedata): output = [] for page_no in range(1, no_of_pages + 1): + + category = f"{device.upper()} Page {page_no}" + capabilities = {device.lower(): "true"} + visiblepages = [str(vp) for vp in range(page_no, no_of_pages + 1)] + page_data = { "name": f"page{page_no}type", "label": "Type", @@ -94,9 +99,11 @@ def create_json(device, no_of_pages, pagedata): "default": get_default_page(page_no), "description": f"Type of page for page {page_no}", "list": pages, - "category": f"{device.upper()} Page {page_no}", + "category": category, "capabilities": {device.lower(): "true"}, - "condition": [{"visiblePages": vp} for vp in range(page_no, no_of_pages + 1)], + "condition": { + "visiblePages": visiblepages + }, #"fields": [], } output.append(page_data) @@ -108,39 +115,59 @@ def create_json(device, no_of_pages, pagedata): "type": "boatData", "default": "", "description": "The display for field {}".format(number_to_text(field_no)), - "category": f"{device.upper()} Page {page_no}", - "capabilities": {device.lower(): "true"}, - "condition": [ - {f"page{page_no}type": page} - for page in pages - if pagedata[page] >= field_no - ], + "category": category, + "capabilities": capabilities, + "condition": { + f"page{page_no}type": [ p for p in pages if pagedata[p] >= field_no ] + ,"visiblePages": visiblepages + } } output.append(field_data) - fluid_data ={ + fluid_data = { "name": f"page{page_no}fluid", "label": "Fluid type", "type": "list", "default": "0", "list": [ - {"l":"Fuel (0)","v":"0"}, - {"l":"Water (1)","v":"1"}, - {"l":"Gray Water (2)","v":"2"}, - {"l":"Live Well (3)","v":"3"}, - {"l":"Oil (4)","v":"4"}, - {"l":"Black Water (5)","v":"5"}, - {"l":"Fuel Gasoline (6)","v":"6"} + {"l":"Fuel (0)","v":"0"}, + {"l":"Water (1)","v":"1"}, + {"l":"Gray Water (2)","v":"2"}, + {"l":"Live Well (3)","v":"3"}, + {"l":"Oil (4)","v":"4"}, + {"l":"Black Water (5)","v":"5"}, + {"l":"Fuel Gasoline (6)","v":"6"} ], "description": "Fluid type in tank", - "category": f"{device.upper()} Page {page_no}", - "capabilities": { - device.lower(): "true" - }, - "condition":[{f"page{page_no}type":"Fluid"}] + "category": category, + "capabilities": capabilities, + "condition": { + f"page{page_no}type": "Fluid", + "visiblePages": visiblepages } + } output.append(fluid_data) + if device.upper() == 'OBP40': + windsource = { + "name": f"page{page_no}wndsrc", + "label": "Wind source", + "type": "list", + "default": "True wind", + "description": f"Wind source for page {page_no}: [true|apparent]", + "list": [ + "True wind", + "Apparant wind" + ], + "category": category, + "capabilities": capabilities, + "condition": { + f"page{page_no}type": "WindPlot", + "visiblePages": visiblepages + } + } + output.append(windsource) + return json.dumps(output, indent=4) def usage():