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

Adjust info/warning status (#14088)

Browse source
This commit is contained in:
Steve Evans 2024-12-16 19:55:23 +00:00 • committed by GitHub
parent aab21384f6
commit 5dc5a8e973
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/main/osd/osd_elements.c
View file

@ -887,6 +887,7 @@ static void osdElementCrashFlipArrow(osdElementParms_t *element)
} }
if ((isCrashFlipModeActive() || (!ARMING_FLAG(ARMED) && !isUpright())) && !((imuConfig()->small_angle < 180 && isUpright()) || (rollAngle == 0 && pitchAngle == 0))) { if ((isCrashFlipModeActive() || (!ARMING_FLAG(ARMED) && !isUpright())) && !((imuConfig()->small_angle < 180 && isUpright()) || (rollAngle == 0 && pitchAngle == 0))) {
element->attr = DISPLAYPORT_SEVERITY_INFO;
if (abs(pitchAngle) < 2 * abs(rollAngle) && abs(rollAngle) < 2 * abs(pitchAngle)) { if (abs(pitchAngle) < 2 * abs(rollAngle) && abs(rollAngle) < 2 * abs(pitchAngle)) {
if (pitchAngle > 0) { if (pitchAngle > 0) {
if (rollAngle > 0) { if (rollAngle > 0) {
@ -1167,7 +1168,7 @@ static void osdElementGpsSats(osdElementParms_t *element)
} }
#endif #endif
else { else {
element->attr = DISPLAYPORT_SEVERITY_INFO; element->attr = DISPLAYPORT_SEVERITY_NORMAL;
} }
if (!gpsIsHealthy()) { if (!gpsIsHealthy()) {

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

@ -139,7 +139,7 @@ void renderOsdWarning(char *warningText, bool *blinking, uint8_t *displayAttr)
if (osdWarnGetState(OSD_WARNING_CRASHFLIP) && IS_RC_MODE_ACTIVE(BOXCRASHFLIP)) { if (osdWarnGetState(OSD_WARNING_CRASHFLIP) && IS_RC_MODE_ACTIVE(BOXCRASHFLIP)) {
if (isCrashFlipModeActive()) { // if was armed in crashflip mode if (isCrashFlipModeActive()) { // if was armed in crashflip mode
tfp_sprintf(warningText, CRASHFLIP_WARNING); tfp_sprintf(warningText, CRASHFLIP_WARNING);
*displayAttr = DISPLAYPORT_SEVERITY_INFO; *displayAttr = DISPLAYPORT_SEVERITY_WARNING;
return; return;
} else if (!ARMING_FLAG(ARMED)) { // if disarmed, but crashflip mode is activated (not allowed / can't happen) } else if (!ARMING_FLAG(ARMED)) { // if disarmed, but crashflip mode is activated (not allowed / can't happen)
tfp_sprintf(warningText, "CRASHFLIP SW"); tfp_sprintf(warningText, "CRASHFLIP SW");
@ -420,7 +420,7 @@ void renderOsdWarning(char *warningText, bool *blinking, uint8_t *displayAttr)
if (osdWarnGetState(OSD_WARNING_BATTERY_NOT_FULL) && !(ARMING_FLAG(ARMED) || ARMING_FLAG(WAS_EVER_ARMED)) && (getBatteryState() == BATTERY_OK) if (osdWarnGetState(OSD_WARNING_BATTERY_NOT_FULL) && !(ARMING_FLAG(ARMED) || ARMING_FLAG(WAS_EVER_ARMED)) && (getBatteryState() == BATTERY_OK)
&& getBatteryAverageCellVoltage() < batteryConfig()->vbatfullcellvoltage) { && getBatteryAverageCellVoltage() < batteryConfig()->vbatfullcellvoltage) {
tfp_sprintf(warningText, "BATT < FULL"); tfp_sprintf(warningText, "BATT < FULL");
*displayAttr = DISPLAYPORT_SEVERITY_INFO; *displayAttr = DISPLAYPORT_SEVERITY_WARNING;
return; return;
} }