1
0
mirror of https://github.com/thooge/esp32-nmea2000-obp60.git synced 2025-12-15 06:53:07 +01:00

Merge branch 'norbert-walter:master' into PageWindPlot

This commit is contained in:
Scorgan01
2025-07-12 01:49:20 +02:00
committed by GitHub
71 changed files with 6713 additions and 3505 deletions

View File

@@ -16,7 +16,7 @@
"description": "NTP time server. Use only one hostname or IP address",
"category": "wifi client",
"capabilities": {
"obp40": "true"
"obp60": "true"
}
},
{
@@ -696,10 +696,12 @@
"---",
"AWA",
"AWS",
"COG",
"DBT",
"HDM",
"PRPOS",
"RPOS",
"SOG",
"STW",
"TWA",
"TWS",
@@ -720,7 +722,21 @@
"category": "OBP60 Calibrations",
"capabilities": {
"obp60":"true"
}
},
"condition": [
{ "calInstance1": "AWA" },
{ "calInstance1": "AWS" },
{ "calInstance2": "COG" },
{ "calInstance1": "DBT" },
{ "calInstance1": "HDM" },
{ "calInstance1": "PRPOS" },
{ "calInstance1": "RPOS" },
{ "calInstance1": "SOG" },
{ "calInstance1": "STW" },
{ "calInstance1": "TWA" },
{ "calInstance1": "TWS" },
{ "calInstance1": "TWD" },
{ "calInstance1": "WTemp" } ]
},
{
"name": "calSlope1",
@@ -731,7 +747,21 @@
"category": "OBP60 Calibrations",
"capabilities": {
"obp60":"true"
}
},
"condition": [
{ "calInstance1": "AWA" },
{ "calInstance1": "AWS" },
{ "calInstance2": "COG" },
{ "calInstance1": "DBT" },
{ "calInstance1": "HDM" },
{ "calInstance1": "PRPOS" },
{ "calInstance1": "RPOS" },
{ "calInstance1": "SOG" },
{ "calInstance1": "STW" },
{ "calInstance1": "TWA" },
{ "calInstance1": "TWS" },
{ "calInstance1": "TWD" },
{ "calInstance1": "WTemp" } ]
},
{
"name": "calSmooth1",
@@ -741,11 +771,25 @@
"check": "checkMinMax",
"min": 0,
"max": 10,
"description": "Smoothing factor for data instance 1",
"description": "Smoothing factor [0..10]; 0 = no smoothing",
"category": "OBP60 Calibrations",
"capabilities": {
"obp60":"true"
}
},
"condition": [
{ "calInstance1": "AWA" },
{ "calInstance1": "AWS" },
{ "calInstance2": "COG" },
{ "calInstance1": "DBT" },
{ "calInstance1": "HDM" },
{ "calInstance1": "PRPOS" },
{ "calInstance1": "RPOS" },
{ "calInstance1": "SOG" },
{ "calInstance1": "STW" },
{ "calInstance1": "TWA" },
{ "calInstance1": "TWS" },
{ "calInstance1": "TWD" },
{ "calInstance1": "WTemp" } ]
},
{
"name": "calInstance2",
@@ -757,10 +801,12 @@
"---",
"AWA",
"AWS",
"COG",
"DBT",
"HDM",
"PRPOS",
"RPOS",
"SOG",
"STW",
"TWA",
"TWS",
@@ -781,7 +827,21 @@
"category": "OBP60 Calibrations",
"capabilities": {
"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" } ]
},
{
"name": "calSlope2",
@@ -792,7 +852,21 @@
"category": "OBP60 Calibrations",
"capabilities": {
"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" } ]
},
{
"name": "calSmooth2",
@@ -802,11 +876,25 @@
"check": "checkMinMax",
"min": 0,
"max": 10,
"description": "Smoothing factor for data instance 2",
"description": "Smoothing factor [0..10]; 0 = no smoothing",
"category": "OBP60 Calibrations",
"capabilities": {
"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" } ]
},
{
"name": "calInstance3",
@@ -818,10 +906,12 @@
"---",
"AWA",
"AWS",
"COG",
"DBT",
"HDM",
"PRPOS",
"RPOS",
"SOG",
"STW",
"TWA",
"TWS",
@@ -842,7 +932,21 @@
"category": "OBP60 Calibrations",
"capabilities": {
"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" } ]
},
{
"name": "calSlope3",
@@ -853,7 +957,21 @@
"category": "OBP60 Calibrations",
"capabilities": {
"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" } ]
},
{
"name": "calSmooth3",
@@ -863,11 +981,25 @@
"check": "checkMinMax",
"min": 0,
"max": 10,
"description": "Smoothing factor for data instance 3",
"description": "Smoothing factor [0..10]; 0 = no smoothing",
"category": "OBP60 Calibrations",
"capabilities": {
"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" } ]
},
{
"name": "display",
@@ -1117,6 +1249,7 @@
"min": 1,
"max": 10,
"default":"10",
"description": "Number of visible data pages [1...10]",
"category":"OBP60 Pages",
"capabilities": {
"obp60":"true"
@@ -1130,6 +1263,7 @@
"min": 1,
"max": 10,
"default":"1",
"description": "First page number to display after device startup",
"category":"OBP60 Pages",
"capabilities": {
"obp60":"true"
@@ -1152,6 +1286,7 @@
}
},
{
"name": "page1type",
"label": "Type",
@@ -1163,6 +1298,7 @@
"Battery",
"Battery2",
"Clock",
"Compass",
"DST810",
"Fluid",
"FourValues",
@@ -1443,6 +1579,7 @@
"Battery",
"Battery2",
"Clock",
"Compass",
"DST810",
"Fluid",
"FourValues",
@@ -1720,6 +1857,7 @@
"Battery",
"Battery2",
"Clock",
"Compass",
"DST810",
"Fluid",
"FourValues",
@@ -1994,6 +2132,7 @@
"Battery",
"Battery2",
"Clock",
"Compass",
"DST810",
"Fluid",
"FourValues",
@@ -2265,6 +2404,7 @@
"Battery",
"Battery2",
"Clock",
"Compass",
"DST810",
"Fluid",
"FourValues",
@@ -2533,6 +2673,7 @@
"Battery",
"Battery2",
"Clock",
"Compass",
"DST810",
"Fluid",
"FourValues",
@@ -2798,6 +2939,7 @@
"Battery",
"Battery2",
"Clock",
"Compass",
"DST810",
"Fluid",
"FourValues",
@@ -3060,6 +3202,7 @@
"Battery",
"Battery2",
"Clock",
"Compass",
"DST810",
"Fluid",
"FourValues",
@@ -3319,6 +3462,7 @@
"Battery",
"Battery2",
"Clock",
"Compass",
"DST810",
"Fluid",
"FourValues",
@@ -3575,6 +3719,7 @@
"Battery",
"Battery2",
"Clock",
"Compass",
"DST810",
"Fluid",
"FourValues",