CR151

Author: breadoven

src/main/fc/settings.yaml

@@ -3934,6 +3934,14 @@ groups:
         field: osd_switch_indicators_align_left
         type: bool
         default_value: ON
+        # CR151
+      - name: multifunction_warning_cycle_time
+        description: "Cycle time for display of full multifunction warning messages [s]. Full messages will be displayed for 5s every cycle period. Set to 0 to constantly display full warnings."
+        field: multifunction_warning_cycle_time
+        min: 0
+        max: 60
+        default_value: 30
+        # CR151
   - name: PG_OSD_COMMON_CONFIG
     type: osdCommonConfig_t
     headers: ["io/osd_common.h"]

src/main/io/osd.c

@@ -4368,6 +4368,7 @@ PG_RESET_TEMPLATE(osdConfig_t, osdConfig,
     .use_pilot_logo = SETTING_OSD_USE_PILOT_LOGO_DEFAULT,
     .inav_to_pilot_logo_spacing = SETTING_OSD_INAV_TO_PILOT_LOGO_SPACING_DEFAULT,
     .arm_screen_display_time = SETTING_OSD_ARM_SCREEN_DISPLAY_TIME_DEFAULT,
+    .multifunction_warning_cycle_time = SETTING_MULTIFUNCTION_WARNING_CYCLE_TIME_DEFAULT,  // CR151
 
 #ifdef USE_WIND_ESTIMATOR
     .estimations_wind_compensation = SETTING_OSD_ESTIMATIONS_WIND_COMPENSATION_DEFAULT,
@@ -6471,7 +6472,8 @@ static bool osdCheckWarning(bool condition, uint8_t warningFlag, uint8_t *warnin
         if (currentTimeMs > redisplayStartTimeMs) {
             warningDisplayStartTime = currentTimeMs;
             osdWarningTimerDuration = newWarningFlags ? 10000 : WARNING_REDISPLAY_DURATION;
-            redisplayStartTimeMs = currentTimeMs + osdWarningTimerDuration + 30000;
+            // redisplayStartTimeMs = currentTimeMs + osdWarningTimerDuration + 30000;
+            redisplayStartTimeMs = currentTimeMs + osdWarningTimerDuration + S2MS(osdConfig()->multifunction_warning_cycle_time);  // CR151
         }
 
         if (currentTimeMs - warningDisplayStartTime < osdWarningTimerDuration) {
@@ -6568,15 +6570,15 @@ static textAttributes_t osdGetMultiFunctionMessage(char *buff)
     const batteryState_e batteryVoltageState = checkBatteryVoltageState();
     warningCondition = batteryVoltageState == BATTERY_CRITICAL || batteryVoltageState == BATTERY_WARNING;
     if (osdCheckWarning(warningCondition, warningFlagID, &warningsCount)) {
-        messages[messageCount++] = batteryVoltageState == BATTERY_CRITICAL ? "VBATT CRIT" : "VBATT LOW ";
+        messages[messageCount++] = batteryVoltageState == BATTERY_CRITICAL ? "VBATT LAND" : "VBATT LOW ";
     }
 
     // Low Battery Capacity
     if (batteryUsesCapacityThresholds()) {
         const batteryState_e batteryState = getBatteryState();
-        warningCondition = batteryState == BATTERY_CRITICAL || batteryVoltageState == BATTERY_WARNING;
+        warningCondition = batteryState == BATTERY_CRITICAL || batteryState == BATTERY_WARNING;
         if (osdCheckWarning(warningCondition, warningFlagID <<= 1, &warningsCount)) {
-            messages[messageCount++] = batteryState == BATTERY_CRITICAL ? "BATT EMPTY" : "BATT LOW  ";
+            messages[messageCount++] = batteryState == BATTERY_CRITICAL ? "BATT EMPTY" : "BATT DYING";
         }
     }
 #if defined(USE_GPS)
@@ -6642,7 +6644,6 @@ static textAttributes_t osdGetMultiFunctionMessage(char *buff)
     if (messageCount) {
         message = messages[OSD_ALTERNATING_CHOICES(1000, messageCount)];    // display each warning on 1s cycle
         strcpy(buff, message);
-        TEXT_ATTRIBUTES_ADD_BLINK(elemAttr);
     } else if (warningsCount) {
         buff[0] = SYM_ALERT;
         tfp_sprintf(buff + 1, "%u        ", warningsCount);

src/main/io/osd.h

@@ -529,6 +529,7 @@ typedef struct osdConfig_s {
     bool            use_pilot_logo;                     // If enabled, the pilot logo (last 40 characters of page 2 font) will be used with the INAV logo.
     uint8_t         inav_to_pilot_logo_spacing;         // The space between the INAV and pilot logos, if pilot logo is used. This number may be adjusted so that it fits the odd/even col width.
     uint16_t        arm_screen_display_time;            // Length of time the arm screen is displayed
+    uint8_t         multifunction_warning_cycle_time;   // Cycle time for display of full multifunction warning messages (s)  CR151
 #ifndef DISABLE_MSP_DJI_COMPAT
     bool            highlight_djis_missing_characters;  // If enabled, show question marks where there is no character in DJI's font to represent an OSD element symbol
 #endif

src/main/sensors/battery.c

@@ -324,34 +324,36 @@ static void updateBatteryVoltage(timeUs_t timeDelta, bool justConnected)
         vbat = pt1FilterApply4(&vbatFilterState, vbat, VBATT_LPF_FREQ, US2S(timeDelta));
     }
 }
-
+// CR151
 batteryState_e checkBatteryVoltageState(void)
 {
     uint16_t stateVoltage = getBatteryVoltage();
-    switch (batteryState)
+    static batteryState_e currentBatteryVoltageState = BATTERY_OK;  // CR151
+
+    switch (currentBatteryVoltageState)  // CR151
     {
         case BATTERY_OK:
             if (stateVoltage <= (batteryWarningVoltage - VBATT_HYSTERESIS)) {
-                return BATTERY_WARNING;
+                currentBatteryVoltageState = BATTERY_WARNING;   // CR151
             }
             break;
         case BATTERY_WARNING:
             if (stateVoltage <= (batteryCriticalVoltage - VBATT_HYSTERESIS)) {
-                return BATTERY_CRITICAL;
+                currentBatteryVoltageState = BATTERY_CRITICAL;   // CR151
             } else if (stateVoltage > (batteryWarningVoltage + VBATT_HYSTERESIS)){
-                return BATTERY_OK;
+                currentBatteryVoltageState = BATTERY_OK;   // CR151
             }
             break;
         case BATTERY_CRITICAL:
             if (stateVoltage > (batteryCriticalVoltage + VBATT_HYSTERESIS)) {
-                return BATTERY_WARNING;
+                currentBatteryVoltageState = BATTERY_WARNING;   // CR151
             }
             break;
         default:
             break;
     }
 
-    return batteryState;
+    return currentBatteryVoltageState;  // CR151
 }
 
 static void checkBatteryCapacityState(void)