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/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():