Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 932 → Rev 931

/C-OSD/trunk/osd_ncmode_default.c
146,14 → 146,6
write_ndigit_number_u(23, top_line + 1, naviData.HomePositionDeviation.Distance / 10, 4, 0);
}
 
// show coords only when configure AND stats are off OR stats are on and motors are off
if ((COSD_FLAGS_CONFIG & COSD_FLAG_SHOW_COORDS)
&& ((naviData.FCFlags & FCFLAG_MOTOR_RUN)
|| !((COSD_FLAGS_RUNTIME & COSD_WASFLYING) && (COSD_FLAGS_MODES & COSD_FLAG_STATS)))) {
write_gps_pos(15, bottom_line - 2, naviData.CurrentPosition.Longitude);
write_gps_pos(15, bottom_line - 1, naviData.CurrentPosition.Latitude);
}
 
// center
if (naviData.FCFlags & FCFLAG_MOTOR_RUN) { // should be engines running
if (!(old_MKFlags & FCFLAG_MOTOR_RUN)) { // motors just started, clear middle
178,10 → 170,6
if ((COSD_FLAGS_RUNTIME & COSD_FLAG_STROMREC) || (COSD_FLAGS_MODES & COSD_FLAG_FCCURRENT)) {
horizon_bottom--;
}
if (COSD_FLAGS_CONFIG & COSD_FLAG_SHOW_COORDS) {
horizon_bottom--;
}
 
if (COSD_FLAGS_MODES & COSD_FLAG_AGGRHORIZON) {
draw_agressiva_artificial_horizon(top_line + 2, horizon_bottom, naviData.AngleNick, naviData.AngleRoll);
} else {
212,8 → 200,14
}
}
 
// show coords only when configure AND stats are off OR stats are on and motors are off
if ((COSD_FLAGS_CONFIG & COSD_FLAG_SHOW_COORDS)
&& ((naviData.FCFlags & FCFLAG_MOTOR_RUN)
|| !((COSD_FLAGS_RUNTIME & COSD_WASFLYING) && (COSD_FLAGS_MODES & COSD_FLAG_STATS)))) {
write_gps_pos(15, bottom_line - 2, naviData.CurrentPosition.Longitude);
write_gps_pos(15, bottom_line - 1, naviData.CurrentPosition.Latitude);
}
 
 
if (COSD_FLAGS_MODES & COSD_FLAG_BIGVARIO) {
draw_big_variometer(27, 8, naviData.Variometer);
}