26,9 → 26,9 |
#if !(ALLCHARSDEBUG|(WRITECHARS != -1)) |
|
int osd_ncmode_default() { |
if (COSD_FLAGS & COSD_FLAG_HUD) { |
if (COSD_FLAGS_MODES & COSD_FLAG_HUD) { |
// write icons at init or after menu/mode-switch |
if (!(COSD_FLAGS2 & COSD_ICONS_WRITTEN)) { |
if (!(COSD_FLAGS_RUNTIME & COSD_ICONS_WRITTEN)) { |
write_char_xy(5, top_line, 0xCB); // km/h |
write_char_xy(10, top_line, 0xCA); // RC-transmitter |
write_char_xy(16, top_line, 0xD0); // degree symbol |
37,10 → 37,10 |
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_FLAGS2 & COSD_FLAG_STROMREC) { |
if (COSD_FLAGS_RUNTIME & COSD_FLAG_STROMREC) { |
write_char_xy(7, bottom_line - 1, 0x9F); // small A |
write_char_xy(14, bottom_line - 1, 0xB5); // mah |
if (COSD_FLAGS & COSD_FLAG_STROMVOLT) { |
if (COSD_FLAGS_MODES & COSD_FLAG_STROMVOLT) { |
write_char_xy(21, bottom_line - 1, 0x9E); // small V |
} |
} |
48,7 → 48,7 |
write_char_xy(21, bottom_line, 0xD2); // fly clock |
write_char_xy(26, bottom_line, 0xC8); // sat1 |
write_char_xy(27, bottom_line, 0xC9); // sat2 |
COSD_FLAGS2 |= COSD_ICONS_WRITTEN; |
COSD_FLAGS_RUNTIME |= COSD_ICONS_WRITTEN; |
} |
|
// first line |
76,16 → 76,25 |
|
draw_variometer(21, top_line, naviData.Variometer); |
|
//note:lephisto:according to several sources it's /30 |
if (naviData.Altimeter > 300 || naviData.Altimeter < -300) { |
// above 10m only write full meters |
write_ndigit_number_s(23, top_line, naviData.Altimeter / 30, 4, 0); // BARO |
//write_ndigit_number_s(23, top_line, (int16_t) (naviData.CurrentPosition.Altitude / 1000), 4, 0); // GPS |
if (COSD_FLAGS_CONFIG & COSD_FLAG_GPSHEIGHT) { |
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 |
} else { |
// 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 { |
// up to 10m write meters.dm |
write_ndigit_number_s_10th(23, top_line, naviData.Altimeter / 3, 3, 0); // BARO |
//write_ndigit_number_s_10th(23, top_line, (int16_t) (naviData.CurrentPosition.Altitude / 1000), 3, 0); // GPS |
+ //note:lephisto:according to several sources it's /30 |
+ if (naviData.Altimeter > 300 || naviData.Altimeter < -300) { |
+ // above 10m only write full meters |
+ write_ndigit_number_s(23, top_line, naviData.Altimeter / 30, 4, 0); // BARO |
+ } else { |
+ // up to 10m write meters.dm |
+ write_ndigit_number_s_10th(23, top_line, naviData.Altimeter / 3, 3, 0); // BARO |
+ } |
+ } |
|
// seccond line |
draw_compass(11, top_line + 1, naviData.CompassHeading); |
@@ -102,11 +111,13 @@ |
if (naviData.MKFlags & FLAG_MOTOR_RUN) { // should be engines running |
if (!(old_MKFlags & FLAG_MOTOR_RUN)) { // motors just started, clear middle |
clear(); |
+ // remember current heigth for gps offset |
+ altimeter_offset = naviData.CurrentPosition.Altitude / 1000; |
// update flags to paint display again if needed |
- COSD_FLAGS2 &= ~COSD_ICONS_WRITTEN; |
+ COSD_FLAGS_RUNTIME &= ~COSD_ICONS_WRITTEN; |
} |
- if (COSD_FLAGS & COSD_FLAG_ARTHORIZON) { |
- if (COSD_FLAGS2 & COSD_FLAG_STROMREC) { |
+ if (COSD_FLAGS_MODES & COSD_FLAG_ARTHORIZON) { |
+ if (COSD_FLAGS_RUNTIME & COSD_FLAG_STROMREC) { |
draw_artificial_horizon(top_line + 2, bottom_line - 2, naviData.AngleNick, naviData.AngleRoll); |
} else { |
draw_artificial_horizon(top_line + 2, bottom_line - 1, naviData.AngleNick, naviData.AngleRoll); |
@@ -113,13 +124,13 @@ |
} |
} |
// motors are on, assume we were/are flying |
- COSD_FLAGS2 |= COSD_WASFLYING; |
+ COSD_FLAGS_RUNTIME |= COSD_WASFLYING; |
} else { |
// stats |
- if ((COSD_FLAGS2 & COSD_WASFLYING) && (COSD_FLAGS & COSD_FLAG_STATS)) { |
+ if ((COSD_FLAGS_RUNTIME & COSD_WASFLYING) && (COSD_FLAGS_MODES & COSD_FLAG_STATS)) { |
uint8_t line = 3; |
write_ascii_string_pgm(2, line, (const char *) (pgm_read_word(&(stats_item_pointers[0])))); // max Altitude |
- write_ndigit_number_s(18, line, max_Altimeter / 30, 4, 0); |
+ write_ndigit_number_s(18, line, max_Altimeter, 4, 0); |
write_char_xy(22, line, 204); // small meters m |
write_ascii_string_pgm(2, ++line, (const char *) (pgm_read_word(&(stats_item_pointers[1])))); // max Speed |
write_ndigit_number_u(19, line, (uint16_t) (((uint32_t) max_GroundSpeed * (uint32_t) 9) / (uint32_t) 250), 3, 0); |
@@ -130,7 +141,7 @@ |
write_ascii_string_pgm(2, ++line, (const char *) (pgm_read_word(&(stats_item_pointers[3])))); // min voltage |
write_ndigit_number_u_10th(18, line, min_UBat, 3, 0); |
write_char_xy(22, line, 0x9E); // small V |
- if (COSD_FLAGS2 & COSD_FLAG_STROMREC) { |
+ if (COSD_FLAGS_RUNTIME & COSD_FLAG_STROMREC) { |
write_ascii_string_pgm(2, ++line, (const char *) (pgm_read_word(&(stats_item_pointers[7])))); // ampere |
write_ndigit_number_u_10th(18, line, max_ampere / 10, 3, 0); |
write_char_xy(22, line, 0x9F); // small A |
@@ -142,8 +153,8 @@ |
write_gps_pos(15, line, naviData.CurrentPosition.Longitude); |
write_ascii_string_pgm(2, ++line, (const char *) (pgm_read_word(&(stats_item_pointers[6])))); // latitude |
write_gps_pos(15, line, naviData.CurrentPosition.Latitude); |
- } else if (COSD_FLAGS & COSD_FLAG_ARTHORIZON) { // if no stats there is space horizon |
- if (COSD_FLAGS2 & COSD_FLAG_STROMREC) { |
+ } else if (COSD_FLAGS_MODES & COSD_FLAG_ARTHORIZON) { // if no stats there is space horizon |
+ if (COSD_FLAGS_RUNTIME & COSD_FLAG_STROMREC) { |
draw_artificial_horizon(top_line + 2, bottom_line - 2, naviData.AngleNick, naviData.AngleRoll); |
} else { |
draw_artificial_horizon(top_line + 2, bottom_line - 1, naviData.AngleNick, naviData.AngleRoll); |
@@ -150,16 +161,16 @@ |
} |
} |
} |
- if (COSD_FLAGS & COSD_FLAG_BIGVARIO) { |
+ if (COSD_FLAGS_MODES & COSD_FLAG_BIGVARIO) { |
draw_big_variometer(27, 8, naviData.Variometer); |
} |
|
// pre-bottom line |
- if (COSD_FLAGS2 & COSD_FLAG_STROMREC) { |
+ if (COSD_FLAGS_RUNTIME & COSD_FLAG_STROMREC) { |
//write_ndigit_number_s(3, bottom_line - 1, ampere, 4, 0); |
write_ndigit_number_u_10th(3, bottom_line - 1, ampere / 10, 3, 0); |
write_ndigit_number_s(10, bottom_line - 1, ampere_wasted / 10, 4, 0); |
- if (COSD_FLAGS & COSD_FLAG_STROMVOLT) { |
+ if (COSD_FLAGS_MODES & COSD_FLAG_STROMVOLT) { |
write_ndigit_number_u_10th(17, bottom_line - 1, s_volt, 3, 0); |
} |
} |
@@ -200,7 +211,11 @@ |
|
// remember statistics (only when engines running) |
if (naviData.MKFlags & FLAG_MOTOR_RUN) { |
- if (naviData.Altimeter > max_Altimeter) max_Altimeter = naviData.Altimeter; |
+ if (COSD_FLAGS_CONFIG & COSD_FLAG_GPSHEIGHT) { |
+ if (naviData.CurrentPosition.Altitude / 1000 - altimeter_offset > max_Altimeter) max_Altimeter = naviData.CurrentPosition.Altitude / 1000; |
+ } else { |
+ if (naviData.Altimeter / 30 > max_Altimeter) max_Altimeter = naviData.Altimeter / 30; |
+ } |
if (naviData.GroundSpeed > max_GroundSpeed) max_GroundSpeed = naviData.GroundSpeed; |
if (naviData.HomePositionDeviation.Distance > max_Distance) { |
max_Distance = naviData.HomePositionDeviation.Distance; |