Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-26 01:35:41 +03:00
Code Issues Wiki Activity

Merge pull request #5253 from etracer65/crash_flip_osd_warning_fix

Browse source 
Change crash-flip OSD message to track actual state rather than switch
This commit is contained in:
Michael Keller 2018-02-22 23:36:43 +13:00 • committed by GitHub
commit 93111cf440
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/io/osd.c
View file

@ -57,6 +57,7 @@
#include "drivers/time.h" #include "drivers/time.h"
#include "fc/config.h" #include "fc/config.h"
#include "fc/fc_core.h"
#include "fc/rc_adjustments.h" #include "fc/rc_adjustments.h"
#include "fc/rc_controls.h" #include "fc/rc_controls.h"
#include "fc/runtime_config.h" #include "fc/runtime_config.h"
@ -655,8 +656,7 @@ static bool osdDrawSingleElement(uint8_t item)
// Warn when in flip over after crash mode // Warn when in flip over after crash mode
if ((enabledWarnings & OSD_WARNING_CRASH_FLIP) if ((enabledWarnings & OSD_WARNING_CRASH_FLIP)
&& (isModeActivationConditionPresent(BOXFLIPOVERAFTERCRASH)) && (isFlipOverAfterCrashMode())) {
&& IS_RC_MODE_ACTIVE(BOXFLIPOVERAFTERCRASH)) {
osdFormatMessage(buff, sizeof(buff), "CRASH FLIP"); osdFormatMessage(buff, sizeof(buff), "CRASH FLIP");
break; break;
} }

5
src/test/unit/osd_unittest.cc
View file

@ -35,6 +35,7 @@ extern "C" {
#include "drivers/serial.h" #include "drivers/serial.h"
#include "fc/config.h" #include "fc/config.h"
#include "fc/fc_core.h"
#include "fc/rc_controls.h" #include "fc/rc_controls.h"
#include "fc/rc_modes.h" #include "fc/rc_modes.h"
#include "fc/runtime_config.h" #include "fc/runtime_config.h"
@ -1015,4 +1016,8 @@ extern "C" {
uint16_t getRssi(void) { return rssi; } uint16_t getRssi(void) { return rssi; }
uint16_t getCoreTemperatureCelsius(void) { return simulationCoreTemperature; } uint16_t getCoreTemperatureCelsius(void) { return simulationCoreTemperature; }
bool isFlipOverAfterCrashMode(void) {
return false;
}
} }