1
0
mirror of https://github.com/thooge/esp32-nmea2000-obp60.git synced 2026-03-28 18:06:37 +01:00

Integrate changes from master

This commit is contained in:
2025-08-19 09:11:51 +02:00
parent c6df6eac56
commit 318a218470
11 changed files with 609 additions and 209 deletions

View File

@@ -439,21 +439,30 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
//########################################################
else if (value->getFormat() == "formatXte"){
double xte = 0;
if (!usesimudata) {
xte = abs(value->value);
if (usesimudata == false) {
xte = value->value;
rawvalue = value->value;
} else {
rawvalue = 6.0 + float(random(0, 4));
xte = rawvalue;
}
if (xte >= 100) {
snprintf(buffer, bsize, fmt_dec_100, value->value);
} else if (xte >= 10) {
snprintf(buffer, bsize, fmt_dec_10, value->value);
if (distanceFormat == "km") {
xte = xte * 0.001;
result.unit = "km";
} else if (distanceFormat == "nm") {
xte = xte * 0.000539957;
result.unit = "nm";
} else {
snprintf(buffer, bsize, fmt_dec_1, value->value);
result.unit = "m";
}
if (xte < 10) {
snprintf(buffer, bsize, "%3.2f", xte);
} else if (xte < 100) {
snprintf(buffer,bsize,"%3.1f",xte);
}
else {
snprintf(buffer, bsize, "%3.0f", xte);
}
result.unit = "nm";
}
//########################################################
else if (value->getFormat() == "kelvinToC"){