Skip to content

Commit

Permalink
Merge branch 'iNavFlight:master' into lulu_fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
pjpei authored Oct 16, 2024
2 parents eeea8f8 + 07b8bf9 commit b451388
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/main/fc/settings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions src/main/io/osd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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, "---/---");
Expand Down

0 comments on commit b451388

Please sign in to comment.