Rev 1866 | Rev 2039 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 1866 | Rev 1951 | ||
|---|---|---|---|
| Line 152... | Line 152... | ||
| 152 | 152 | ||
| 153 | // show coords only when configure AND stats are off OR stats are on and motors are off |
153 | // show coords only when configure AND stats are off OR stats are on and motors are off |
| 154 | if ((COSD_FLAGS_CONFIG & COSD_FLAG_SHOW_COORDS) |
154 | if ((COSD_FLAGS_CONFIG & COSD_FLAG_SHOW_COORDS) |
| 155 | && ((naviData.FCFlags & FCFLAG_MOTOR_RUN) |
155 | && ((naviData.FCFlags & FCFLAG_MOTOR_RUN) |
| - | 156 | || !((COSD_FLAGS_RUNTIME & COSD_WASFLYING) && (COSD_FLAGS_MODES & COSD_FLAG_STATS)))) { |
|
| - | 157 | uint8_t gps_start_line = bottom_line - 2; |
|
| - | 158 | if ((COSD_FLAGS_RUNTIME & COSD_FLAG_STROMREC) && COSD_FLAGS_MODES & COSD_FLAG_STROMVOLT) { |
|
| - | 159 | gps_start_line--; |
|
| 156 | || !((COSD_FLAGS_RUNTIME & COSD_WASFLYING) && (COSD_FLAGS_MODES & COSD_FLAG_STATS)))) { |
160 | } |
| 157 | write_gps_pos(15, bottom_line - 2, naviData.CurrentPosition.Longitude); |
161 | write_gps_pos(15, gps_start_line, naviData.CurrentPosition.Longitude); |
| 158 | write_gps_pos(15, bottom_line - 1, naviData.CurrentPosition.Latitude); |
162 | write_gps_pos(15, gps_start_line+1, naviData.CurrentPosition.Latitude); |
| Line 159... | Line 163... | ||
| 159 | } |
163 | } |
| 160 | 164 | ||
| 161 | // center |
165 | // center |
| Line 227... | Line 231... | ||
| 227 | 231 | ||
| 228 | // pre-bottom line |
232 | // pre-bottom line |
| 229 | if ((COSD_FLAGS_RUNTIME & COSD_FLAG_STROMREC) && !(COSD_FLAGS_MODES & COSD_FLAG_FCCURRENT)) { |
233 | if ((COSD_FLAGS_RUNTIME & COSD_FLAG_STROMREC) && !(COSD_FLAGS_MODES & COSD_FLAG_FCCURRENT)) { |
| 230 | //write_ndigit_number_s(3, bottom_line - 1, ampere, 4, 0); |
234 | //write_ndigit_number_s(3, bottom_line - 1, ampere, 4, 0); |
| 231 | write_ndigit_number_u_10th(2, bottom_line - 1, ampere / 10, 4, 0); |
235 | write_ndigit_number_u_10th(2, bottom_line - 1, ampere / 10, 4, 0); |
| 232 | write_ndigit_number_s(9, bottom_line - 1, ampere_wasted / 10, 5, 0); |
236 | write_ndigit_number_u(9, bottom_line - 1, ampere_wasted / 10, 5, 0); |
| 233 | } else if (COSD_FLAGS_MODES & COSD_FLAG_FCCURRENT) { |
237 | } else if (COSD_FLAGS_MODES & COSD_FLAG_FCCURRENT) { |
| 234 | write_ndigit_number_u_10th(2, bottom_line - 1, naviData.Current, 4, 0); |
238 | write_ndigit_number_u_10th(2, bottom_line - 1, naviData.Current, 4, 0); |
| 235 | write_ndigit_number_u(9, bottom_line - 1, naviData.UsedCapacity, 5, 0); |
239 | write_ndigit_number_u(9, bottom_line - 1, naviData.UsedCapacity, 5, 0); |
| 236 | } |
240 | } |