1,5 → 1,5 |
/**************************************************************************** |
* Copyright (C) 2009-2013 by Claas Anders "CaScAdE" Rathje * |
* Copyright (C) 2009-2014 by Claas Anders "CaScAdE" Rathje * |
* admiralcascade@gmail.com * |
* Project-URL: http://www.mylifesucks.de/oss/c-osd/ * |
* * |
70,7 → 70,7 |
|
// draw big speed-meter only if configure AND not flying OR stats off and not flying |
if ((COSD_FLAGS_CONFIG & COSD_FLAG_BIGSPEED) |
&& ((naviData.FCFlags & FCFLAG_MOTOR_RUN) |
&& ((naviData.FCStatusFlags & FCFLAG_MOTOR_RUN) |
|| !((COSD_FLAGS_RUNTIME & COSD_WASFLYING) && (COSD_FLAGS_MODES & COSD_FLAG_STATS)))) { |
|
draw_big_variometer(2, 8, (uint16_t)((uint32_t)naviData.GroundSpeed / (uint32_t)125)); |
152,7 → 152,7 |
|
// 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) |
&& ((naviData.FCStatusFlags & FCFLAG_MOTOR_RUN) |
|| !((COSD_FLAGS_RUNTIME & COSD_WASFLYING) && (COSD_FLAGS_MODES & COSD_FLAG_STATS)))) { |
uint8_t gps_start_line = bottom_line - 2; |
if ((COSD_FLAGS_RUNTIME & COSD_FLAG_STROMREC) && COSD_FLAGS_MODES & COSD_FLAG_STROMVOLT) { |
163,7 → 163,7 |
} |
|
// center |
if (naviData.FCFlags & FCFLAG_MOTOR_RUN) { // should be engines running |
if (naviData.FCStatusFlags & FCFLAG_MOTOR_RUN) { // should be engines running |
if (!(old_MKFlags & FCFLAG_MOTOR_RUN)) { // motors just started, clear middle |
clear(); |
// remember current heigth for offsets |
283,7 → 283,7 |
|
// after all, draw scope WHEN configured AND flying OR Stats are off |
if ((COSD_FLAGS_CONFIG & COSD_FLAG_SHOW_SCOPE) |
&& ((naviData.FCFlags & FCFLAG_MOTOR_RUN) |
&& ((naviData.FCStatusFlags & FCFLAG_MOTOR_RUN) |
|| !((COSD_FLAGS_RUNTIME & COSD_WASFLYING) && (COSD_FLAGS_MODES & COSD_FLAG_STATS)))) { |
draw_scope(); |
} |
293,7 → 293,7 |
//write_number_s(16, 5, setsReceived++); |
|
// remember statistics (only when engines running) |
if (naviData.FCFlags & FCFLAG_MOTOR_RUN) { |
if (naviData.FCStatusFlags & FCFLAG_MOTOR_RUN) { |
if (COSD_FLAGS_CONFIG & COSD_FLAG_GPSHEIGHT) { |
if (naviData.CurrentPosition.Altitude / 1000 - altimeter_offset > max_Altimeter) max_Altimeter = naviData.CurrentPosition.Altitude / 1000; |
} else { |
315,7 → 315,7 |
// remember last values |
last_RC_Quality = naviData.RC_Quality; |
last_UBat = naviData.UBat; |
old_MKFlags = naviData.FCFlags; |
old_MKFlags = naviData.FCStatusFlags; |
old_NCFlags = naviData.NCFlags; |
seconds_since_last_data = 0; |
|