zrzk
/
ardupilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

AP_OSD: Add autoranging to current and speed displays

mission-4.1.18
Henry Wurzburg 5 years ago committed by Andrew Tridgell
parent
0e4366d540
commit
57dc253be8
1 changed files with 11 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      libraries/AP_OSD/AP_OSD_Screen.cpp

14
libraries/AP_OSD/AP_OSD_Screen.cpp
Unescape View File

@ -937,7 +937,12 @@ void AP_OSD_Screen::draw_current(uint8_t x, uint8_t y) @@ -937,7 +937,12 @@ void AP_OSD_Screen::draw_current(uint8_t x, uint8_t y)
if (!battery.current_amps(amps)) {
amps = 0;
}
backend->write(x, y, false, "%2.1f%c", (double)amps, SYM_AMP);
if (amps < 10.0) {
backend->write(x, y, false, "%2.2f%c", amps, SYM_AMP);
}
else {
backend->write(x, y, false, "%2.1f%c", amps, SYM_AMP);
}
}
void AP_OSD_Screen::draw_fltmode(uint8_t x, uint8_t y)
@ -1044,8 +1049,11 @@ void AP_OSD_Screen::draw_speed_vector(uint8_t x, uint8_t y,Vector2f v, int32_t y @@ -1044,8 +1049,11 @@ void AP_OSD_Screen::draw_speed_vector(uint8_t x, uint8_t y,Vector2f v, int32_t y
int32_t interval = 36000 / SYM_ARROW_COUNT;
arrow = SYM_ARROW_START + ((angle + interval / 2) / interval) % SYM_ARROW_COUNT;
}
backend->write(x, y, false, "%c%3d%c", arrow, (int)u_scale(SPEED, v_length), u_icon(SPEED));
if (u_scale(SPEED, v_length) < 10.0) {
backend->write(x, y, false, "%c%3.1f%c", arrow, u_scale(SPEED, v_length), u_icon(SPEED));
} else {
backend->write(x, y, false, "%c%3d%c", arrow, (int)u_scale(SPEED, v_length), u_icon(SPEED));
}
}
void AP_OSD_Screen::draw_gspeed(uint8_t x, uint8_t y)

Write Preview
Loading…
Cancel
Save