From 467b6cc9f70190f2d4e28daf4fa79898af7d183b Mon Sep 17 00:00:00 2001
From: Mark Haslinghuis <mark@numloq.nl>
Date: Thu, 24 Oct 2024 17:43:54 +0200
Subject: [PATCH] Fix sensors and battery cellcount (#4221)

---
 src/components/quad-status/BatteryIcon.vue   | 13 ++---
 src/components/quad-status/BatteryLegend.vue | 12 ++---
 src/index.html                               |  2 -
 src/js/serial_backend.js                     | 56 ++++++++++++--------
 src/tabs/presets/presets.js                  |  4 ++
 5 files changed, 51 insertions(+), 36 deletions(-)

diff --git a/src/components/quad-status/BatteryIcon.vue b/src/components/quad-status/BatteryIcon.vue
index 26250bf9ef..65f190f045 100644
--- a/src/components/quad-status/BatteryIcon.vue
+++ b/src/components/quad-status/BatteryIcon.vue
@@ -10,6 +10,7 @@
   </div>
 </template>
 <script>
+const NO_BATTERY_VOLTAGE_MAXIMUM = 1.8;
 export default {
   props: {
     voltage: {
@@ -28,14 +29,14 @@ export default {
       type: Number,
       default: 1,
     },
-    vbatcellcount: {
-      type: Number,
-      default: 1,
-    },
   },
   computed: {
     nbCells() {
-      return this.voltage === 0 || this.vbatcellcount === 0 ? 1 : this.vbatcellcount;
+      let nbCells = Math.floor(this.voltage / this.vbatmaxcellvoltage) + 1;
+      if (this.voltage === 0) {
+        nbCells = 1;
+      }
+      return nbCells;
     },
     min() {
       return this.vbatmincellvoltage * this.nbCells;
@@ -47,7 +48,7 @@ export default {
       return this.vbatwarningcellvoltage * this.nbCells;
     },
     isEmpty() {
-      return this.voltage < this.min && !this.voltage.vbatcellcount;
+      return this.voltage < this.min && this.voltage > NO_BATTERY_VOLTAGE_MAXIMUM;
     },
     classes() {
       if (this.batteryState) {
diff --git a/src/components/quad-status/BatteryLegend.vue b/src/components/quad-status/BatteryLegend.vue
index 8b7ab81709..8fc9b25b53 100644
--- a/src/components/quad-status/BatteryLegend.vue
+++ b/src/components/quad-status/BatteryLegend.vue
@@ -4,6 +4,7 @@
   </div>
 </template>
 <script>
+const NO_BATTERY_VOLTAGE_MAXIMUM = 1.8;
 export default {
   props: {
     voltage: {
@@ -14,15 +15,14 @@ export default {
       type: Number,
       default: 1,
     },
-    vbatcellcount: {
-      type: Number,
-      default: 1,
-    },
   },
   computed: {
     reading() {
-      const nbCells = this.voltage === 0 || this.vbatcellcount === 0 ? 1 : this.vbatcellcount;
-      const cellsText = this.voltage && this.vbatcellcount ? `${nbCells}S` : "USB";
+      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";
       return `${this.voltage.toFixed(2)}V (${cellsText})`;
     },
   },
diff --git a/src/index.html b/src/index.html
index 3739037b5e..58d41effdd 100644
--- a/src/index.html
+++ b/src/index.html
@@ -42,13 +42,11 @@
                     :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
index b76746ea06..d7f5d25dae 100644
--- a/src/js/serial_backend.js
+++ b/src/js/serial_backend.js
@@ -704,14 +704,19 @@ export function read_serial(info) {
     }
 }
 
-async function update_live_status() {
+export async function update_sensor_status() {
     const statuswrapper = $('#quad-status_wrapper');
 
-    if (GUI.active_tab !== 'cli' && GUI.active_tab !== 'presets') {
-        await MSP.promise(MSPCodes.MSP_ANALOG);
-        await MSP.promise(MSPCodes.MSP_BATTERY_STATE);
+    await MSP.promise(MSPCodes.MSP_ANALOG);
+    await MSP.promise(MSPCodes.MSP_BATTERY_STATE);
+
+    if (FC.ANALOG !== undefined) {
+        let nbCells = Math.floor(FC.ANALOG.voltage / FC.BATTERY_CONFIG.vbatmaxcellvoltage) + 1;
+
+        if (FC.ANALOG.voltage == 0) {
+            nbCells = 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;
@@ -729,29 +734,36 @@ async function update_live_status() {
                 $(".battery-status").addClass('state-ok').removeClass('state-warning').removeClass('state-empty');
             }
         }
+    }
 
-        await MSP.promise(MSPCodes.MSP_BOXNAMES);
-        await MSP.promise(MSPCodes.MSP_STATUS_EX);
+    await MSP.promise(MSPCodes.MSP_BOXNAMES);
+    await MSP.promise(MSPCodes.MSP_STATUS_EX);
 
-        const active = (performance.now() - FC.ANALOG.last_received_timestamp) < 300;
-        $(".linkicon").toggleClass('active', active);
+    const active = (performance.now() - FC.ANALOG.last_received_timestamp) < 300;
+    $(".linkicon").toggleClass('active', active);
 
-        for (let i = 0; i < FC.AUX_CONFIG.length; i++) {
-            if (FC.AUX_CONFIG[i] === 'ARM') {
-                $(".armedicon").toggleClass('active', bit_check(FC.CONFIG.mode, i));
-            }
-            if (FC.AUX_CONFIG[i] === 'FAILSAFE') {
-                $(".failsafeicon").toggleClass('active', bit_check(FC.CONFIG.mode, i));
-            }
+    for (let i = 0; i < FC.AUX_CONFIG.length; i++) {
+        if (FC.AUX_CONFIG[i] === 'ARM') {
+            $(".armedicon").toggleClass('active', bit_check(FC.CONFIG.mode, i));
         }
-
-        if (have_sensor(FC.CONFIG.activeSensors, 'gps')) {
-            await MSP.promise(MSPCodes.MSP_RAW_GPS);
+        if (FC.AUX_CONFIG[i] === 'FAILSAFE') {
+            $(".failsafeicon").toggleClass('active', bit_check(FC.CONFIG.mode, i));
         }
+    }
+
+    if (have_sensor(FC.CONFIG.activeSensors, 'gps')) {
+        await MSP.promise(MSPCodes.MSP_RAW_GPS);
+    }
 
-        sensor_status(FC.CONFIG.activeSensors, FC.GPS_DATA.fix);
+    sensor_status(FC.CONFIG.activeSensors, FC.GPS_DATA.fix);
 
-        statuswrapper.show();
+    statuswrapper.show();
+}
+
+async function update_live_status() {
+    // cli or presets tab do not use MSP connection
+    if (GUI.active_tab !== 'cli' && GUI.active_tab !== 'presets') {
+        await update_sensor_status();
     }
 }
 
@@ -792,7 +804,7 @@ export function reinitializeConnection(callback) {
         gui_log(i18n.getMessage('deviceReady'));
     }, 2000);
 
-    if (callback) {
+    if (callback && typeof callback === 'function') {
         callback();
     }
 }
diff --git a/src/tabs/presets/presets.js b/src/tabs/presets/presets.js
index 8ee4581788..5d950aa10b 100644
--- a/src/tabs/presets/presets.js
+++ b/src/tabs/presets/presets.js
@@ -7,6 +7,7 @@ import FC from '../../js/fc';
 import CONFIGURATOR from '../../js/data_storage';
 import $ from 'jquery';
 import FileSystem from '../../js/FileSystem';
+import { update_sensor_status } from '../../js/serial_backend';
 
 import { favoritePresets } from './FavoritePresets';
 import CliEngine from './CliEngine';
@@ -37,6 +38,9 @@ presets.initialize = function (callback) {
     if (GUI.active_tab !== 'presets') {
         GUI.active_tab = 'presets';
     }
+
+    // after applying presets, update sensor status
+    update_sensor_status();
 };
 
 presets.readDom = function() {