31,13 → 31,23 |
if (COSD_FLAGS_MODES & COSD_FLAG_HUD) { |
// write icons at init or after menu/mode-switch |
if (!(COSD_FLAGS_RUNTIME & COSD_ICONS_WRITTEN)) { |
if (COSD_FLAGS_CONFIG & COSD_FLAG_FEET) { |
write_char_xy(5, top_line, 0x7D); // mph |
write_char_xy(27, top_line + 1, 0x7E); // small feet ft home |
write_char_xy(27, top_line, 0x7E); // small feet ft height |
} else { |
write_char_xy(5, top_line, 0xCB); // km/h |
write_char_xy(27, top_line + 1, 0xCC); // small meters m home |
write_char_xy(27, top_line, 0xCC); // small meters m height |
} |
|
write_char_xy(10, top_line, 0xCA); // RC-transmitter |
write_char_xy(16, top_line, 0xD0); // degree symbol |
write_char_xy(27, top_line, 0xCC); // small meters m height |
|
write_char_xy(20, top_line + 1, 0xB0); // left circle |
write_char_xy(22, top_line + 1, 0xB2); // right circle |
write_char_xy(27, top_line + 1, 0xCC); // small meters m home |
|
|
write_char_xy(7, bottom_line, 0x9E); // small V |
if ((COSD_FLAGS_RUNTIME & COSD_FLAG_STROMREC) || (COSD_FLAGS_MODES & COSD_FLAG_FCCURRENT)) { |
write_char_xy(7, bottom_line - 1, 0x9F); // small A |
54,7 → 64,12 |
} |
|
// first line |
if (COSD_FLAGS_CONFIG & COSD_FLAG_FEET) { |
// experimental cm/s -> mph |
write_ndigit_number_u(2, top_line, (uint16_t) (((uint32_t) naviData.GroundSpeed * (uint32_t) 279) / (uint32_t) 12500), 3, 0); |
} else { |
write_ndigit_number_u(2, top_line, (uint16_t) (((uint32_t) naviData.GroundSpeed * (uint32_t) 9) / (uint32_t) 250), 3, 0); |
} |
|
write_ndigit_number_u(7, top_line, rc_signal, 3, 0); |
if (rc_signal <= RCLVL_WRN && last_RC_Quality > RCLVL_WRN) { |
79,6 → 94,10 |
draw_variometer(21, top_line, naviData.Variometer); |
|
if (COSD_FLAGS_CONFIG & COSD_FLAG_GPSHEIGHT) { |
if (COSD_FLAGS_CONFIG & COSD_FLAG_FEET) { |
// feet |
write_ndigit_number_s(23, top_line, (int16_t) (naviData.CurrentPosition.Altitude / 1000 - altimeter_offset) * 32 / 10, 4, 0); // GPS |
} else { |
if (naviData.CurrentPosition.Altitude / 1000 - altimeter_offset > 10 || naviData.CurrentPosition.Altitude / 1000 - altimeter_offset < -10) { |
// above 10m only write full meters |
write_ndigit_number_s(23, top_line, (int16_t) (naviData.CurrentPosition.Altitude / 1000 - altimeter_offset), 4, 0); // GPS |
86,7 → 105,11 |
// up to 10m write meters.dm |
write_ndigit_number_s_10th(23, top_line, (int16_t) (naviData.CurrentPosition.Altitude / 100 - altimeter_offset * 10), 3, 0); // GPS |
} |
} |
} else { |
if (COSD_FLAGS_CONFIG & COSD_FLAG_FEET) { |
write_ndigit_number_s(23, top_line, naviData.Altimeter / 10 * 32 / 30, 4, 0); // BARO |
} else { |
//note:lephisto:according to several sources it's /30 |
if (naviData.Altimeter > 300 || naviData.Altimeter < -300) { |
// above 10m only write full meters |
96,6 → 119,7 |
write_ndigit_number_s_10th(23, top_line, naviData.Altimeter / 3, 3, 0); // BARO |
} |
} |
} |
|
// seccond line |
@@ -107,7 +131,12 @@ |
// finer resolution, 0xa0 is first character and we add the index 0 <= index < 16 |
write_char_xy(21, top_line + 1, 0xa0 + heading_fine_conv(heading_home)); |
|
+ if (COSD_FLAGS_CONFIG & COSD_FLAG_FEET) { |
+ // feet |
+ write_ndigit_number_u(24, top_line + 1, naviData.HomePositionDeviation.Distance / 10 * 32 / 10, 3, 0); |
+ } else { |
write_ndigit_number_u(24, top_line + 1, naviData.HomePositionDeviation.Distance / 10, 3, 0); |
+ } |
|
// center |
if (naviData.FCFlags & FLAG_MOTOR_RUN) { // should be engines running |
@@ -138,14 +167,25 @@ |
if ((COSD_FLAGS_RUNTIME & COSD_WASFLYING) && (COSD_FLAGS_MODES & COSD_FLAG_STATS)) { |
uint8_t line = 3; |
write_ascii_string_pgm(1, line, (const char *) (pgm_read_word(&(stats_item_pointers[0])))); // max Altitude |
+ write_ascii_string_pgm(1, ++line, (const char *) (pgm_read_word(&(stats_item_pointers[1])))); // max Speed |
+ write_ascii_string_pgm(1, ++line, (const char *) (pgm_read_word(&(stats_item_pointers[2])))); // max Distance |
+ |
+ if (COSD_FLAGS_CONFIG & COSD_FLAG_FEET) { |
+ write_ndigit_number_s(16, line, max_Altimeter * 32 / 10, 4, 0); |
+ write_char_xy(20, line - 2, 0x7E); // small feet ft |
+ write_ndigit_number_u(17, line, (uint16_t) (((uint32_t) max_GroundSpeed * (uint32_t) 279) / (uint32_t) 12500), 3, 0); |
+ write_char_xy(20, line - 1, 0x7D); // mp/h |
+ write_ndigit_number_u(17, line, max_Distance / 10 * 32 / 10, 3, 0); |
+ write_char_xy(20, line - 0, 0x7E); // small feet ft |
+ } else { |
write_ndigit_number_s(16, line, max_Altimeter, 4, 0); |
- write_char_xy(20, line, 204); // small meters m |
- write_ascii_string_pgm(1, ++line, (const char *) (pgm_read_word(&(stats_item_pointers[1])))); // max Speed |
+ write_char_xy(20, line - 2, 204); // small meters m |
write_ndigit_number_u(17, line, (uint16_t) (((uint32_t) max_GroundSpeed * (uint32_t) 9) / (uint32_t) 250), 3, 0); |
- write_char_xy(20, line, 203); // km/h |
- write_ascii_string_pgm(1, ++line, (const char *) (pgm_read_word(&(stats_item_pointers[2])))); // max Distance |
+ write_char_xy(20, line - 1, 203); // km/h |
write_ndigit_number_u(17, line, max_Distance / 10, 3, 0); |
- write_char_xy(20, line, 204); // small meters m |
+ write_char_xy(20, line - 0, 204); // small meters m |
+ } |
+ |
write_ascii_string_pgm(1, ++line, (const char *) (pgm_read_word(&(stats_item_pointers[3])))); // min voltage |
write_ndigit_number_u_10th(16, line, min_UBat, 3, 0); |
write_char_xy(20, line, 0x9E); // small V |
@@ -172,10 +212,14 @@ |
write_ascii_string_pgm(1, ++line, (const char *) (pgm_read_word(&(stats_item_pointers[6])))); // latitude |
write_gps_pos(14, line, naviData.CurrentPosition.Latitude); |
} else if (COSD_FLAGS_MODES & COSD_FLAG_ARTHORIZON) { // if no stats there is space horizon |
+ uint8_t horizon_bottom = bottom_line - 1; |
if ((COSD_FLAGS_RUNTIME & COSD_FLAG_STROMREC) || (COSD_FLAGS_MODES & COSD_FLAG_FCCURRENT)) { |
- draw_artificial_horizon(top_line + 2, bottom_line - 2, naviData.AngleNick, naviData.AngleRoll); |
+ horizon_bottom--; |
+ } |
+ if (COSD_FLAGS_MODES & COSD_FLAG_AGGRHORIZON) { |
+ draw_agressiva_artificial_horizon(top_line + 2, horizon_bottom, naviData.AngleNick, naviData.AngleRoll); |
} else { |
- draw_artificial_horizon(top_line + 2, bottom_line - 1, naviData.AngleNick, naviData.AngleRoll); |
+ draw_artificial_horizon(top_line + 2, horizon_bottom, naviData.AngleNick, naviData.AngleRoll); |
} |
} |
} |