Use BATTERY_STATE for cellCount (#3964)

* Use BATTERY_STATE for cellCount * Remove outdated comments * Use vbatcellcount instead of 1.8V condition
betaflight · May 20, 2024 · c3cb9ce · c3cb9ce
1 parent 874e1ac
commit c3cb9ce
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 21 deletions.
diff --git a/src/components/quad-status/BatteryIcon.vue b/src/components/quad-status/BatteryIcon.vue
@@ -10,8 +10,6 @@
   </div>
 </template>
 <script>
-const NO_BATTERY_VOLTAGE_MAXIMUM = 1.8; // Maybe is better to add a call to MSP_BATTERY_STATE but is not available for all versions
-
 export default {
   props: {
     voltage: {
@@ -30,14 +28,14 @@ export default {
       type: Number,
       default: 1,
     },
+    vbatcellcount: {
+      type: Number,
+      default: 1,
+    },
   },
   computed: {
     nbCells() {
-      let nbCells = Math.floor(this.voltage / this.vbatmaxcellvoltage) + 1;
-      if (this.voltage === 0) {
-        nbCells = 1;
-      }
-      return nbCells;
+      return this.voltage === 0 || this.vbatcellcount === 0 ? 1 : this.vbatcellcount;
     },
     min() {
       return this.vbatmincellvoltage * this.nbCells;
@@ -49,9 +47,7 @@ export default {
       return this.vbatwarningcellvoltage * this.nbCells;
     },
     isEmpty() {
-      return (
-        this.voltage < this.min && this.voltage > NO_BATTERY_VOLTAGE_MAXIMUM
-      );
+      return this.voltage < this.min && !this.voltage.vbatcellcount;
     },
     classes() {
       if (this.batteryState) {

diff --git a/src/components/quad-status/BatteryLegend.vue b/src/components/quad-status/BatteryLegend.vue
@@ -4,8 +4,6 @@
   </div>
 </template>
 <script>
-const NO_BATTERY_VOLTAGE_MAXIMUM = 1.8; // Maybe is better to add a call to MSP_BATTERY_STATE but is not available for all versions
-
 export default {
   props: {
     voltage: {
@@ -16,17 +14,15 @@ export default {
       type: Number,
       default: 1,
     },
+    vbatcellcount: {
+      type: Number,
+      default: 1,
+    },
   },
   computed: {
     reading() {
-      let nbCells = Math.floor(this.voltage / this.vbatmaxcellvoltage) + 1;
-
-      if (this.voltage === 0) {
-        nbCells = 1;
-      }
-
-      const cellsText =
-        this.voltage > NO_BATTERY_VOLTAGE_MAXIMUM ? `${nbCells}S` : "USB";
+      const nbCells = this.voltage === 0 || this.vbatcellcount === 0 ? 1 : this.vbatcellcount;
+      const cellsText = this.voltage && this.vbatcellcount ? `${nbCells}S` : "USB";
       return `${this.voltage.toFixed(2)}V (${cellsText})`;
     },
   },

diff --git a/src/index.html b/src/index.html
@@ -39,11 +39,13 @@
                     :vbatmaxcellvoltage="FC.BATTERY_CONFIG.vbatmaxcellvoltage"
                     :vbatwarningcellvoltage="FC.BATTERY_CONFIG.vbatwarningcellvoltage"
                     :batteryState="FC.BATTERY_STATE?.batteryState"
+                    :vbatcellcount="FC.BATTERY_STATE?.cellCount"
                 >
                 </battery-icon>
                 <battery-legend
                     :voltage="FC.ANALOG.voltage"
                     :vbatmaxcellvoltage="FC.BATTERY_CONFIG.vbatmaxcellvoltage"
+                    :vbatcellcount="FC.BATTERY_STATE?.cellCount"
                 ></battery-legend>
                 <div class="bottomStatusIcons">
                     <div class="armedicon cf_tip" i18n_title="mainHelpArmed"></div>

diff --git a/src/js/serial_backend.js b/src/js/serial_backend.js
@@ -740,8 +740,9 @@ async function update_live_status() {
 
     if (GUI.active_tab !== 'cli' && GUI.active_tab !== 'presets') {
         await MSP.promise(MSPCodes.MSP_ANALOG);
+        await MSP.promise(MSPCodes.MSP_BATTERY_STATE);
 
-        const nbCells = FC.ANALOG.voltage === 0 ? 1 : Math.floor(FC.ANALOG.voltage / FC.BATTERY_CONFIG.vbatmaxcellvoltage) + 1;
+        const nbCells = FC.ANALOG.voltage === 0 || FC.BATTERY_STATE.cellCount === 0 ? 1 : FC.BATTERY_STATE.cellCount;
         const min = FC.BATTERY_CONFIG.vbatmincellvoltage * nbCells;
         const max = FC.BATTERY_CONFIG.vbatmaxcellvoltage * nbCells;
         const warn = FC.BATTERY_CONFIG.vbatwarningcellvoltage * nbCells;

diff --git a/src/main.html b/src/main.html
@@ -132,11 +132,13 @@
                     :vbatmaxcellvoltage="FC.BATTERY_CONFIG.vbatmaxcellvoltage"
                     :vbatwarningcellvoltage="FC.BATTERY_CONFIG.vbatwarningcellvoltage"
                     :batteryState="FC.BATTERY_STATE?.batteryState"
+                    :vbatcellcount="FC.BATTERY_STATE?.cellCount"
                 >
                 </battery-icon>
                 <battery-legend
                     :voltage="FC.ANALOG.voltage"
                     :vbatmaxcellvoltage="FC.BATTERY_CONFIG.vbatmaxcellvoltage"
+                    :vbatcellcount="FC.BATTERY_STATE?.cellCount"
                 ></battery-legend>
                 <div class="bottomStatusIcons">
                     <div class="armedicon cf_tip" i18n_title="mainHelpArmed"></div>