| 26,9 → 26,9 |
|---|
| #if !(ALLCHARSDEBUG|(WRITECHARS != -1)) |
| |
| int osd_ncmode_minimal() { |
| 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(4, top_line, 0xCB); // km/h |
| write_char_xy(15, top_line, 0xCC); // small meters m height |
| write_char_xy(26, top_line, 0xCC); // small meters m height |
| 38,7 → 38,7 |
|---|
| write_char_xy(17, 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 |
| 65,10 → 65,10 |
|---|
| if (!(old_MKFlags & FLAG_MOTOR_RUN)) { // motors just started, clear middle |
| clear(); |
| // 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); |
| 75,10 → 75,10 |
|---|
| } |
| } |
| // 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); |
| 92,7 → 92,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 |
| 104,8 → 104,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); |
| 112,12 → 112,12 |
|---|
| } |
| } |
| } |
| 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); |