Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 06:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_OSD: resolve compiler warning

Browse Source
This commit is contained in:
Randy Mackay 2018-09-28 13:53:43 +09:00
parent 925d4035a4
commit 8d3b093bbf
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/AP_OSD/AP_OSD_Screen.cpp
View File

@ -953,7 +953,7 @@ void AP_OSD_Screen::draw_bat2_vlt(uint8_t x, uint8_t y)
uint8_t pct2 = battery.capacity_remaining_pct(1); uint8_t pct2 = battery.capacity_remaining_pct(1);
uint8_t p2 = (100 - pct2) / 16.6; uint8_t p2 = (100 - pct2) / 16.6;
float v2 = battery.voltage(1); float v2 = battery.voltage(1);
backend->write(x,y, v2 < osd->warn_bat2volt, "%c%2.1f%c", SYM_BATT_FULL + p2, v2, SYM_VOLT); backend->write(x,y, v2 < osd->warn_bat2volt, "%c%2.1f%c", SYM_BATT_FULL + p2, (double)v2, SYM_VOLT);
} }
void AP_OSD_Screen::draw_bat2used(uint8_t x, uint8_t y) void AP_OSD_Screen::draw_bat2used(uint8_t x, uint8_t y)
@ -963,7 +963,7 @@ void AP_OSD_Screen::draw_bat2used(uint8_t x, uint8_t y)
if (battery.consumed_mah(1) <= 9999) { if (battery.consumed_mah(1) <= 9999) {
backend->write(x,y, false, "%4d%c", (int)battery.consumed_mah(1), SYM_MAH); backend->write(x,y, false, "%4d%c", (int)battery.consumed_mah(1), SYM_MAH);
} else { } else {
backend->write(x,y, false, "%2.2f%c", ah, SYM_AH); backend->write(x,y, false, "%2.2f%c", (double)ah, SYM_AH);
} }
} }