diff --git a/lib/boatData/GwBoatData.cpp b/lib/boatData/GwBoatData.cpp index 617d040..162e528 100644 --- a/lib/boatData/GwBoatData.cpp +++ b/lib/boatData/GwBoatData.cpp @@ -254,6 +254,10 @@ static void writeToString(GwTextWriter *writer, const int16_t &value) { writer->writeInteger(value); } +static void writeToString(GwTextWriter *writer, String value) +{ + writer->writeString(value.c_str()); +} static void writeToString(GwTextWriter *writer, GwSatInfoList &value) { writer->writeInteger(value.getNumSats()); diff --git a/lib/boatData/GwBoatData.h b/lib/boatData/GwBoatData.h index 02bb8d7..bfcda60 100644 --- a/lib/boatData/GwBoatData.h +++ b/lib/boatData/GwBoatData.h @@ -121,7 +121,13 @@ template class GwBoatItem : public GwBoatItemBase{ if (! isValid(millis())) return defaultv; return data; } - virtual double getDoubleValue(){return (double)data;} + virtual double getDoubleValue(){ + if constexpr (std::is_same::value) { + return 0.0; // TODO any better ideas? + } else { + return (double)data; + } + } virtual void fillString(); virtual void toJsonDoc(GwJsonDocument *doc, unsigned long minTime); virtual int getLastSource(){return lastUpdateSource;} diff --git a/lib/obp60task/config.json b/lib/obp60task/config.json index f4ce02a..eb94427 100644 --- a/lib/obp60task/config.json +++ b/lib/obp60task/config.json @@ -1423,35 +1423,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", @@ -1463,29 +1459,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", @@ -1497,23 +1493,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", @@ -1525,20 +1525,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", @@ -1550,14 +1556,24 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page1type": "SixValues" - }, - { - "page1type": "WindRoseFlex" - } - ] + "condition": { + "page1type": [ + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10 + ] + } }, { "name": "page1value6", @@ -1569,14 +1585,24 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page1type": "SixValues" - }, - { - "page1type": "WindRoseFlex" - } - ] + "condition": { + "page1type": [ + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10 + ] + } }, { "name": "page1fluid", @@ -1704,35 +1730,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", @@ -1744,29 +1765,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", @@ -1778,23 +1798,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", @@ -1806,20 +1829,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", @@ -1831,14 +1859,23 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page2type": "SixValues" - }, - { - "page2type": "WindRoseFlex" - } - ] + "condition": { + "page2type": [ + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10 + ] + } }, { "name": "page2value6", @@ -1850,14 +1887,23 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page2type": "SixValues" - }, - { - "page2type": "WindRoseFlex" - } - ] + "condition": { + "page2type": [ + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10 + ] + } }, { "name": "page2fluid", @@ -1982,35 +2028,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", @@ -2022,29 +2062,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", @@ -2056,23 +2094,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", @@ -2084,20 +2124,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", @@ -2109,14 +2153,22 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page3type": "SixValues" - }, - { - "page3type": "WindRoseFlex" - } - ] + "condition": { + "page3type": [ + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10 + ] + } }, { "name": "page3value6", @@ -2128,14 +2180,22 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page3type": "SixValues" - }, - { - "page3type": "WindRoseFlex" - } - ] + "condition": { + "page3type": [ + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10 + ] + } }, { "name": "page3fluid", @@ -2257,35 +2317,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", @@ -2297,29 +2350,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", @@ -2331,23 +2381,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", @@ -2359,20 +2410,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", @@ -2384,14 +2438,21 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page4type": "SixValues" - }, - { - "page4type": "WindRoseFlex" - } - ] + "condition": { + "page4type": [ + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + 4, + 5, + 6, + 7, + 8, + 9, + 10 + ] + } }, { "name": "page4value6", @@ -2403,14 +2464,21 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page4type": "SixValues" - }, - { - "page4type": "WindRoseFlex" - } - ] + "condition": { + "page4type": [ + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + 4, + 5, + 6, + 7, + 8, + 9, + 10 + ] + } }, { "name": "page4fluid", @@ -2529,35 +2597,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", @@ -2569,29 +2629,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", @@ -2603,23 +2659,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", @@ -2631,20 +2687,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", @@ -2656,14 +2714,20 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page5type": "SixValues" - }, - { - "page5type": "WindRoseFlex" - } - ] + "condition": { + "page5type": [ + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + 5, + 6, + 7, + 8, + 9, + 10 + ] + } }, { "name": "page5value6", @@ -2675,14 +2739,20 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page5type": "SixValues" - }, - { - "page5type": "WindRoseFlex" - } - ] + "condition": { + "page5type": [ + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + 5, + 6, + 7, + 8, + 9, + 10 + ] + } }, { "name": "page5fluid", @@ -2798,35 +2868,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", @@ -2838,29 +2899,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", @@ -2872,23 +2928,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", @@ -2900,20 +2955,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", @@ -2925,14 +2981,19 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page6type": "SixValues" - }, - { - "page6type": "WindRoseFlex" - } - ] + "condition": { + "page6type": [ + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + 6, + 7, + 8, + 9, + 10 + ] + } }, { "name": "page6value6", @@ -2944,14 +3005,19 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page6type": "SixValues" - }, - { - "page6type": "WindRoseFlex" - } - ] + "condition": { + "page6type": [ + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + 6, + 7, + 8, + 9, + 10 + ] + } }, { "name": "page6fluid", @@ -3064,35 +3130,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", @@ -3104,29 +3160,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", @@ -3138,23 +3188,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", @@ -3166,20 +3214,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", @@ -3191,14 +3239,18 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page7type": "SixValues" - }, - { - "page7type": "WindRoseFlex" - } - ] + "condition": { + "page7type": [ + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + 7, + 8, + 9, + 10 + ] + } }, { "name": "page7value6", @@ -3210,14 +3262,18 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page7type": "SixValues" - }, - { - "page7type": "WindRoseFlex" - } - ] + "condition": { + "page7type": [ + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + 7, + 8, + 9, + 10 + ] + } }, { "name": "page7fluid", @@ -3327,35 +3383,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", @@ -3367,29 +3412,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", @@ -3401,23 +3439,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", @@ -3429,20 +3464,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", @@ -3454,14 +3488,17 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page8type": "SixValues" - }, - { - "page8type": "WindRoseFlex" - } - ] + "condition": { + "page8type": [ + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + 8, + 9, + 10 + ] + } }, { "name": "page8value6", @@ -3473,14 +3510,17 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page8type": "SixValues" - }, - { - "page8type": "WindRoseFlex" - } - ] + "condition": { + "page8type": [ + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + 8, + 9, + 10 + ] + } }, { "name": "page8fluid", @@ -3587,35 +3627,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", @@ -3627,29 +3655,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", @@ -3661,23 +3681,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", @@ -3689,20 +3705,18 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page9type": "FourValues" - }, - { - "page9type": "FourValues2" - }, - { - "page9type": "SixValues" - }, - { - "page9type": "WindRoseFlex" - } - ] + "condition": { + "page9type": [ + "FourValues", + "FourValues2", + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + 9, + 10 + ] + } }, { "name": "page9value5", @@ -3714,14 +3728,16 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page9type": "SixValues" - }, - { - "page9type": "WindRoseFlex" - } - ] + "condition": { + "page9type": [ + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + 9, + 10 + ] + } }, { "name": "page9value6", @@ -3733,14 +3749,16 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page9type": "SixValues" - }, - { - "page9type": "WindRoseFlex" - } - ] + "condition": { + "page9type": [ + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + 9, + 10 + ] + } }, { "name": "page9fluid", @@ -3844,35 +3862,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", @@ -3884,29 +3889,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", @@ -3918,23 +3914,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", @@ -3946,20 +3937,17 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page10type": "FourValues" - }, - { - "page10type": "FourValues2" - }, - { - "page10type": "SixValues" - }, - { - "page10type": "WindRoseFlex" - } - ] + "condition": { + "page10type": [ + "FourValues", + "FourValues2", + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + 10 + ] + } }, { "name": "page10value5", @@ -3971,14 +3959,15 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page10type": "SixValues" - }, - { - "page10type": "WindRoseFlex" - } - ] + "condition": { + "page10type": [ + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + 10 + ] + } }, { "name": "page10value6", @@ -3990,14 +3979,15 @@ "capabilities": { "obp60": "true" }, - "condition": [ - { - "page10type": "SixValues" - }, - { - "page10type": "WindRoseFlex" - } - ] + "condition": { + "page10type": [ + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + 10 + ] + } }, { "name": "page10fluid", @@ -4046,4 +4036,3 @@ ] } ] - diff --git a/lib/obp60task/config_obp40.json b/lib/obp60task/config_obp40.json index 638445c..8a0d691 100644 --- a/lib/obp60task/config_obp40.json +++ b/lib/obp60task/config_obp40.json @@ -1367,7 +1367,7 @@ "name": "page1type", "label": "Type", "type": "list", - "default": "Clock", + "default": "Voltage", "description": "Type of page for page 1", "list": [ "AIS", @@ -1446,35 +1446,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", @@ -1486,29 +1482,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", @@ -1520,23 +1516,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", @@ -1548,20 +1548,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", @@ -1573,14 +1579,24 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page1type": "SixValues" - }, - { - "page1type": "WindRoseFlex" - } - ] + "condition": { + "page1type": [ + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10 + ] + } }, { "name": "page1value6", @@ -1592,14 +1608,24 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page1type": "SixValues" - }, - { - "page1type": "WindRoseFlex" - } - ] + "condition": { + "page1type": [ + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10 + ] + } }, { "name": "page1fluid", @@ -1651,7 +1677,7 @@ "name": "page2type", "label": "Type", "type": "list", - "default": "Wind", + "default": "WindRose", "description": "Type of page for page 2", "list": [ "AIS", @@ -1727,35 +1753,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", @@ -1767,29 +1788,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", @@ -1801,23 +1821,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", @@ -1829,20 +1852,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", @@ -1854,14 +1882,23 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page2type": "SixValues" - }, - { - "page2type": "WindRoseFlex" - } - ] + "condition": { + "page2type": [ + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10 + ] + } }, { "name": "page2value6", @@ -1873,14 +1910,23 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page2type": "SixValues" - }, - { - "page2type": "WindRoseFlex" - } - ] + "condition": { + "page2type": [ + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10 + ] + } }, { "name": "page2fluid", @@ -2005,35 +2051,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", @@ -2045,29 +2085,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", @@ -2079,23 +2117,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", @@ -2107,20 +2147,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", @@ -2132,14 +2176,22 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page3type": "SixValues" - }, - { - "page3type": "WindRoseFlex" - } - ] + "condition": { + "page3type": [ + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10 + ] + } }, { "name": "page3value6", @@ -2151,14 +2203,22 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page3type": "SixValues" - }, - { - "page3type": "WindRoseFlex" - } - ] + "condition": { + "page3type": [ + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10 + ] + } }, { "name": "page3fluid", @@ -2280,35 +2340,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", @@ -2320,29 +2373,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", @@ -2354,23 +2404,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", @@ -2382,20 +2433,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", @@ -2407,14 +2461,21 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page4type": "SixValues" - }, - { - "page4type": "WindRoseFlex" - } - ] + "condition": { + "page4type": [ + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + 4, + 5, + 6, + 7, + 8, + 9, + 10 + ] + } }, { "name": "page4value6", @@ -2426,14 +2487,21 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page4type": "SixValues" - }, - { - "page4type": "WindRoseFlex" - } - ] + "condition": { + "page4type": [ + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + 4, + 5, + 6, + 7, + 8, + 9, + 10 + ] + } }, { "name": "page4fluid", @@ -2552,35 +2620,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", @@ -2592,29 +2652,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", @@ -2626,23 +2682,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", @@ -2654,20 +2710,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", @@ -2679,14 +2737,20 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page5type": "SixValues" - }, - { - "page5type": "WindRoseFlex" - } - ] + "condition": { + "page5type": [ + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + 5, + 6, + 7, + 8, + 9, + 10 + ] + } }, { "name": "page5value6", @@ -2698,14 +2762,20 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page5type": "SixValues" - }, - { - "page5type": "WindRoseFlex" - } - ] + "condition": { + "page5type": [ + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + 5, + 6, + 7, + 8, + 9, + 10 + ] + } }, { "name": "page5fluid", @@ -2821,35 +2891,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", @@ -2861,29 +2922,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", @@ -2895,23 +2951,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", @@ -2923,20 +2978,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", @@ -2948,14 +3004,19 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page6type": "SixValues" - }, - { - "page6type": "WindRoseFlex" - } - ] + "condition": { + "page6type": [ + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + 6, + 7, + 8, + 9, + 10 + ] + } }, { "name": "page6value6", @@ -2967,14 +3028,19 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page6type": "SixValues" - }, - { - "page6type": "WindRoseFlex" - } - ] + "condition": { + "page6type": [ + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + 6, + 7, + 8, + 9, + 10 + ] + } }, { "name": "page6fluid", @@ -3087,35 +3153,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", @@ -3127,29 +3183,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", @@ -3161,23 +3211,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", @@ -3189,20 +3237,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", @@ -3214,14 +3262,18 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page7type": "SixValues" - }, - { - "page7type": "WindRoseFlex" - } - ] + "condition": { + "page7type": [ + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + 7, + 8, + 9, + 10 + ] + } }, { "name": "page7value6", @@ -3233,14 +3285,18 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page7type": "SixValues" - }, - { - "page7type": "WindRoseFlex" - } - ] + "condition": { + "page7type": [ + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + 7, + 8, + 9, + 10 + ] + } }, { "name": "page7fluid", @@ -3292,7 +3348,7 @@ "name": "page8type", "label": "Type", "type": "list", - "default": "Fluid", + "default": "Clock", "description": "Type of page for page 8", "list": [ "AIS", @@ -3350,35 +3406,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", @@ -3390,29 +3435,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", @@ -3424,23 +3462,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", @@ -3452,20 +3487,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", @@ -3477,14 +3511,17 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page8type": "SixValues" - }, - { - "page8type": "WindRoseFlex" - } - ] + "condition": { + "page8type": [ + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + 8, + 9, + 10 + ] + } }, { "name": "page8value6", @@ -3496,14 +3533,17 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page8type": "SixValues" - }, - { - "page8type": "WindRoseFlex" - } - ] + "condition": { + "page8type": [ + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + 8, + 9, + 10 + ] + } }, { "name": "page8fluid", @@ -3610,35 +3650,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", @@ -3650,29 +3678,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", @@ -3684,23 +3704,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", @@ -3712,20 +3728,18 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page9type": "FourValues" - }, - { - "page9type": "FourValues2" - }, - { - "page9type": "SixValues" - }, - { - "page9type": "WindRoseFlex" - } - ] + "condition": { + "page9type": [ + "FourValues", + "FourValues2", + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + 9, + 10 + ] + } }, { "name": "page9value5", @@ -3737,14 +3751,16 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page9type": "SixValues" - }, - { - "page9type": "WindRoseFlex" - } - ] + "condition": { + "page9type": [ + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + 9, + 10 + ] + } }, { "name": "page9value6", @@ -3756,14 +3772,16 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page9type": "SixValues" - }, - { - "page9type": "WindRoseFlex" - } - ] + "condition": { + "page9type": [ + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + 9, + 10 + ] + } }, { "name": "page9fluid", @@ -3867,35 +3885,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", @@ -3907,29 +3912,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", @@ -3941,23 +3937,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", @@ -3969,20 +3960,17 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page10type": "FourValues" - }, - { - "page10type": "FourValues2" - }, - { - "page10type": "SixValues" - }, - { - "page10type": "WindRoseFlex" - } - ] + "condition": { + "page10type": [ + "FourValues", + "FourValues2", + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + 10 + ] + } }, { "name": "page10value5", @@ -3994,14 +3982,15 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page10type": "SixValues" - }, - { - "page10type": "WindRoseFlex" - } - ] + "condition": { + "page10type": [ + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + 10 + ] + } }, { "name": "page10value6", @@ -4013,14 +4002,15 @@ "capabilities": { "obp40": "true" }, - "condition": [ - { - "page10type": "SixValues" - }, - { - "page10type": "WindRoseFlex" - } - ] + "condition": { + "page10type": [ + "SixValues", + "WindRoseFlex" + ], + "visiblePages": [ + 10 + ] + } }, { "name": "page10fluid", @@ -4069,4 +4059,3 @@ ] } ] - diff --git a/lib/obp60task/gen_set.py b/lib/obp60task/gen_set.py index 8cd43f0..311929e 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__ = "1.2" def detect_pages(filename): # returns a dictionary with page name and the number of gui fields @@ -110,11 +110,10 @@ def create_json(device, no_of_pages, pagedata): "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 - ], + "condition": { + f"page{page_no}type": [page for page in pages if pagedata[page] >= field_no], + "visiblePages": [vp for vp in range(page_no, no_of_pages + 1)] + }, } output.append(field_data) diff --git a/lib/obp60task/platformio.ini b/lib/obp60task/platformio.ini index 77bd525..10b9512 100644 --- a/lib/obp60task/platformio.ini +++ b/lib/obp60task/platformio.ini @@ -8,7 +8,6 @@ default_envs = obp40_s3 [env:obp60_s3] -platform = espressif32@6.8.1 board_build.variants_dir = variants #board = obp60_s3_n8 #ESP32-S3 N8, 8MB flash, no PSRAM #board = obp60_s3_n16 #ESP32-S3 N16,16MB flash, no PSRAM, zero series @@ -63,7 +62,6 @@ upload_speed = 230400 monitor_speed = 115200 [env:obp40_s3] -platform = espressif32@6.8.1 board_build.variants_dir = variants board = obp40_s3_n8r8 #ESP32-S3 N8R8, 8MB flash, 8MB PSRAM, OBP60 clone (CrowPanel 4.2) board_build.partitions = default_8MB.csv #ESP32-S3 N8, 8MB flash diff --git a/platformio.ini b/platformio.ini index df144b8..927eb9e 100644 --- a/platformio.ini +++ b/platformio.ini @@ -30,7 +30,7 @@ lib_deps = Update [env] -platform = espressif32 @ 6.8.1 +platform = espressif32 @ 6.9.0 framework = arduino ;platform_packages= ; framework-arduinoespressif32 @ 3.20017.0 @@ -56,6 +56,9 @@ lib_ldf_mode = off monitor_speed = 115200 build_flags = -D PIO_ENV_BUILD=$PIOENV + -std=gnu++17 +build_unflags = + -std=gnu++11 [sensors] ; collect the libraries for sensors here