From 8d6c2e7b5ea58f2092abcc64c0614a4e8c9a0ae5 Mon Sep 17 00:00:00 2001 From: breadoven <56191411+breadoven@users.noreply.github.com> Date: Mon, 14 Oct 2024 19:53:05 +0100 Subject: [PATCH 1/2] Update settings.yaml --- src/main/fc/settings.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/fc/settings.yaml b/src/main/fc/settings.yaml index e43ad233b0c..2f5ef09d77d 100644 --- a/src/main/fc/settings.yaml +++ b/src/main/fc/settings.yaml @@ -202,7 +202,7 @@ tables: values: ["GENERIC", "ELRS", "SIK"] enum: mavlinkRadio_e - name: default_altitude_source - values: ["GPS", "BARO", "GPS ONLY", "BARO ONLY"] + values: ["GPS", "BARO", "GPS_ONLY", "BARO_ONLY"] enum: navDefaultAltitudeSensor_e constants: From a1cd050f00d2c9924b6b6447152192819b89b601 Mon Sep 17 00:00:00 2001 From: Mr D - RC Date: Tue, 15 Oct 2024 12:31:16 +0100 Subject: [PATCH 2/2] Fix lockup on disarm when wh used in post-flight stats - Fixed issue - Tidied up formatting --- src/main/io/osd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/io/osd.c b/src/main/io/osd.c index 1b88226b9cb..cdda88521b2 100644 --- a/src/main/io/osd.c +++ b/src/main/io/osd.c @@ -4789,7 +4789,7 @@ uint8_t drawStat_UsedEnergy(uint8_t col, uint8_t row, uint8_t statValX) strcat(buff, "/"); osdFormatCentiNumber(preBuff, getMWhDrawn() / 10, 0, 2, 0, 3, false); strcat(buff, osdFormatTrimWhiteSpace(preBuff)); - tfp_sprintf(buff + strlen(buff), "%s%c", buff, SYM_WH); + tfp_sprintf(buff + strlen(buff), "%c", SYM_WH); } displayWrite(osdDisplayPort, statValX, row++, buff); @@ -4851,7 +4851,7 @@ uint8_t drawStat_AverageEfficiency(uint8_t col, uint8_t row, uint8_t statValX, b osdFormatCentiNumber(buff, (int32_t)((getMWhDrawn() - stats.flightStartMWh) * 10.0f * METERS_PER_MILE / totalDistance), 0, 2, 0, digits, false); strcat(outBuff, osdFormatTrimWhiteSpace(buff)); strcat(outBuff, "/"); - osdFormatCentiNumber(buff + strlen(buff), (int32_t)(getMWhDrawn() * 10.0f * METERS_PER_MILE / totalDistance), 0, 2, 0, digits, false); + osdFormatCentiNumber(buff, (int32_t)(getMWhDrawn() * 10.0f * METERS_PER_MILE / totalDistance), 0, 2, 0, digits, false); strcat(outBuff, osdFormatTrimWhiteSpace(buff)); } else { strcat(outBuff, "---/---");