Enhance battery indicator visuals with new SVGs and color coding

ChangeLog.md

@@ -4,11 +4,13 @@ Note: This file only contains high level features or important fixes.
 
 ## 5.0 - Daily Build
 
-* New combined compass and attitude instrument
-* You can select between multiple instruments by clicking on the instrument conntrol on a desktop build or press and hold on mobile builds
-* Support for Fly View and Joystick custom mavlink actions has changed. Both the name and formation of the command file is different now. Go to QGC docs to understand how it works now.
-* Support for setting individual Mavlink message rates in the Mavlink Inspector.
-* Support for Mavlink 2 signing
+* Introduced a new combined compass and attitude instrument for enhanced navigation.
+* Select between multiple instruments by clicking the instrument control on desktop or pressing and holding on mobile.
+* Updated support for Fly View and Joystick custom MAVLink actions; command file names and formats have changed—refer to QGC docs for details.
+* Added functionality for setting individual MAVLink message rates in the MAVLink Inspector.
+* Enabled support for MAVLink 2 signing.
+* Dynamic battery display that reduces the number of bars based on battery percentage, with configurable states (100%, Config 1, Config 2, Low, Critical) for clearer status indication.
+
 
 ## 4.1
 

qgcimages.qrc

@@ -61,6 +61,12 @@
         <file alias="attitudePointer.svg">src/FlightMap/Images/attitudePointer.svg</file>
         <file alias="AwarenessAircraft.svg">src/FlightMap/Images/AwarenessAircraft.svg</file>
         <file alias="Battery.svg">src/UI/toolbar/Images/Battery.svg</file>
+        <file alias="BatteryGreen.svg">src/UI/toolbar/Images/BatteryGreen.svg</file>
+        <file alias="BatteryYellowGreen.svg">src/UI/toolbar/Images/BatteryYellowGreen.svg</file>
+        <file alias="BatteryYellow.svg">src/UI/toolbar/Images/BatteryYellow.svg</file>
+        <file alias="BatteryOrange.svg">src/UI/toolbar/Images/BatteryOrange.svg</file>
+        <file alias="BatteryCritical.svg">src/UI/toolbar/Images/BatteryCritical.svg</file>
+        <file alias="BatteryEMERGENCY.svg">src/UI/toolbar/Images/BatteryEMERGENCY.svg</file>
         <file alias="camera.svg">resources/camera.svg</file>
         <file alias="camera_photo.svg">src/Camera/images/camera_photo.svg</file>
         <file alias="camera_video.svg">src/Camera/images/camera_video.svg</file>

src/QmlControls/QGCPalette.cc

@@ -68,9 +68,11 @@ void QGCPalette::_buildMap()
     DECLARE_QGC_COLOR(mapButtonHighlight,   "#585858", "#be781c", "#585858", "#be781c")
     DECLARE_QGC_COLOR(mapIndicator,         "#585858", "#be781c", "#585858", "#be781c")
     DECLARE_QGC_COLOR(mapIndicatorChild,    "#585858", "#766043", "#585858", "#766043")
-    DECLARE_QGC_COLOR(colorGreen,           "#009431", "#009431", "#00e04b", "#00e04b")
-    DECLARE_QGC_COLOR(colorOrange,          "#b95604", "#b95604", "#de8500", "#de8500")
-    DECLARE_QGC_COLOR(colorRed,             "#ed3939", "#ed3939", "#f32836", "#f32836")
+    DECLARE_QGC_COLOR(colorGreen,           "#008f2d", "#008f2d", "#00e04b", "#00e04b") 
+    DECLARE_QGC_COLOR(colorYellow,          "#a2a200", "#a2a200", "#ffff00", "#ffff00")  
+    DECLARE_QGC_COLOR(colorYellowGreen,     "#799f26", "#799f26", "#9dbe2f", "#9dbe2f")  
+    DECLARE_QGC_COLOR(colorOrange,          "#bf7539", "#bf7539", "#de8500", "#de8500")  
+    DECLARE_QGC_COLOR(colorRed,             "#b52b2b", "#b52b2b", "#f32836", "#f32836")
     DECLARE_QGC_COLOR(colorGrey,            "#808080", "#808080", "#bfbfbf", "#bfbfbf")
     DECLARE_QGC_COLOR(colorBlue,            "#1a72ff", "#1a72ff", "#536dff", "#536dff")
     DECLARE_QGC_COLOR(alertBackground,      "#eecc44", "#eecc44", "#eecc44", "#eecc44")

src/QmlControls/QGCPalette.h

@@ -138,6 +138,8 @@ class QGCPalette : public QObject
     DEFINE_QGC_COLOR(brandingPurple,                setBrandingPurple)
     DEFINE_QGC_COLOR(brandingBlue,                  setBrandingBlue)
     DEFINE_QGC_COLOR(colorGreen,                    setColorGreen)
+    DEFINE_QGC_COLOR(colorYellow,                   setColorYellow)
+    DEFINE_QGC_COLOR(colorYellowGreen,              setColorYellowGreen)
     DEFINE_QGC_COLOR(colorOrange,                   setColorOrange)
     DEFINE_QGC_COLOR(colorRed,                      setColorRed)
     DEFINE_QGC_COLOR(colorGrey,                     setColorGrey)

src/Settings/BatteryIndicator.SettingsGroup.json

@@ -1,15 +1,28 @@
 {
-    "version":      1,
-    "fileType":  "FactMetaData",
-    "QGC.MetaData.Facts":
-[
-{
-    "name":         "display",
-    "shortDesc":    "Select values to display in indicator",
-    "enumStrings":  "Percentage,Voltage,Percentage and Voltage",
-    "enumValues":   "0,1,2",
-    "type":         "uint32",
-    "default":      false
-}
-]
+    "version": 1,
+    "fileType": "FactMetaData",
+    "QGC.MetaData.Facts": [
+        {
+            "name": "display",
+            "shortDesc": "Select values to display in indicator",
+            "enumStrings": "Percentage,Voltage,Percentage and Voltage",
+            "enumValues": "0,1,2",
+            "type": "uint32",
+            "default": false
+        },
+        {
+            "name": "threshold1",
+            "shortDesc": "Battery level threshold 1",
+            "type": "uint32",
+            "default": 80,
+            "units": "%"
+        },
+        {
+            "name": "threshold2",
+            "shortDesc": "Battery level threshold 2",
+            "type": "uint32",
+            "default": 60,
+            "units": "%"
+        }
+    ]
 }

src/Settings/BatteryIndicatorSettings.cc

@@ -9,6 +9,7 @@
 
 #include "BatteryIndicatorSettings.h"
 
+#include <QSettings>
 #include <QtQml/QQmlEngine>
 
 DECLARE_SETTINGGROUP(BatteryIndicator, "BatteryIndicator")
@@ -17,3 +18,50 @@ DECLARE_SETTINGGROUP(BatteryIndicator, "BatteryIndicator")
 }
 
 DECLARE_SETTINGSFACT(BatteryIndicatorSettings, display)
+DECLARE_SETTINGSFACT(BatteryIndicatorSettings, threshold1)
+DECLARE_SETTINGSFACT(BatteryIndicatorSettings, threshold2)
+
+// Set threshold1 with validation
+void BatteryIndicatorSettings::setThreshold1(int value) {
+    // Ensure value is at least 16 and less than 100
+    if (value < 16) {
+        threshold1()->setRawValue(17);
+    } else if (value > 99) {
+        threshold1()->setRawValue(99);
+    } else {
+        // Check if value is greater than threshold2
+        if (value > threshold2()->rawValue().toInt()) {
+            threshold1()->setRawValue(value);
+        } else {
+            // Ensure threshold1 is greater than threshold2
+            threshold1()->setRawValue(threshold2()->rawValue().toInt() + 1);
+        }
+    }
+}
+
+// Set threshold2 with validation
+void BatteryIndicatorSettings::setThreshold2(int value) {
+    // Ensure value is greater than 15
+    if (value <= 15) {
+        threshold2()->setRawValue(16); // Adjust to the minimum valid value
+        return;
+    }
+
+    // Check if value is less than threshold1
+    if (value < threshold1()->rawValue().toInt()) {
+        threshold2()->setRawValue(value);
+    } else {
+        // Ensure threshold2 is less than threshold1
+        threshold2()->setRawValue(threshold1()->rawValue().toInt() - 1);
+    }
+}
+
+bool BatteryIndicatorSettings::visible() const {
+    QSettings settings;
+    return settings.value("ShowBatterySettings", true).toBool();
+}
+
+bool BatteryIndicatorSettings::thresholdEditable() const {
+    QSettings settings;
+    return settings.value("ThresholdEditable", true).toBool();
+}

src/Settings/BatteryIndicatorSettings.h

@@ -19,4 +19,21 @@ class BatteryIndicatorSettings : public SettingsGroup
     DEFINE_SETTING_NAME_GROUP()
 
     DEFINE_SETTINGFACT(display)
-};
+    DEFINE_SETTINGFACT(threshold1)
+    DEFINE_SETTINGFACT(threshold2)
+
+    Q_PROPERTY(bool visible READ visible NOTIFY visibleChanged)
+    Q_PROPERTY(bool thresholdEditable READ thresholdEditable NOTIFY thresholdEditableChanged)
+
+    // Setters for thresholds
+    // Expose setters to QML
+    Q_INVOKABLE void setThreshold1(int value);
+    Q_INVOKABLE void setThreshold2(int value);
+
+    bool visible() const;  // Group visibility
+    bool thresholdEditable() const;  // Single editable property for both thresholds
+
+signals:
+    void visibleChanged();
+    void thresholdEditableChanged();
+};