Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_OSD: resolve compiler warnings

This commit is contained in:
Randy Mackay 2018-08-30 15:24:06 +09:00
parent 03e0437c19
commit 305d927dd8
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

@ -825,7 +825,7 @@ void AP_OSD_Screen::draw_hdop(uint8_t x, uint8_t y)
{ {
AP_GPS & gps = AP::gps(); AP_GPS & gps = AP::gps();
float hdp = gps.get_hdop() / 100.0f; float hdp = gps.get_hdop() / 100.0f;
backend->write(x, y, false, "%c%c%3.2f", SYM_HDOP_L, SYM_HDOP_R, hdp); backend->write(x, y, false, "%c%c%3.2f", SYM_HDOP_L, SYM_HDOP_R, (double)hdp);
} }
void AP_OSD_Screen::draw_waypoint(uint8_t x, uint8_t y) void AP_OSD_Screen::draw_waypoint(uint8_t x, uint8_t y)
@ -902,7 +902,7 @@ void AP_OSD_Screen::draw_climbeff(uint8_t x, uint8_t y)
AP_BattMonitor &battery = AP_BattMonitor::battery(); AP_BattMonitor &battery = AP_BattMonitor::battery();
float amps = battery.current_amps(); float amps = battery.current_amps();
if (amps > 0.0) { if (amps > 0.0) {
backend->write(x, y, false,"%c%c%3.1f%c",SYM_PTCHUP,SYM_EFF,(3.6 * u_scale(VSPEED,vspd)/amps),unit_icon); backend->write(x, y, false,"%c%c%3.1f%c",SYM_PTCHUP,SYM_EFF,(double)(3.6f * u_scale(VSPEED,vspd)/amps),unit_icon);
} else { } else {
backend->write(x, y, false,"%c%c---%c",SYM_PTCHUP,SYM_EFF,unit_icon); backend->write(x, y, false,"%c%c---%c",SYM_PTCHUP,SYM_EFF,unit_icon);
} }