From 3b56427552ce01a7276436324e6045275c6ad574 Mon Sep 17 00:00:00 2001
From: legop3 <minecratfd8@gmail.com>
Date: Sat, 22 Nov 2025 03:06:52 -0500
Subject: [PATCH] fixupx

---
 server/src/services/batteryManager.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/server/src/services/batteryManager.js b/server/src/services/batteryManager.js
index d5ed2017..610106cd 100644
--- a/server/src/services/batteryManager.js
+++ b/server/src/services/batteryManager.js
@@ -80,10 +80,11 @@ function handleSensorEvent({ roverId, sensors, batteryState }) {
       payload: { roverId, batteryState },
     });
   }
-  const currentMa = sensors?.currentMa;
-  const chargingByCurrent = typeof currentMa === 'number' && currentMa > 50;
-  const chargingByState = chargingState === 1 || chargingState === 2 || chargingState === 3;
-  const isCharging = chargingByState || chargingByCurrent;
+  const chargingLabel = sensors?.chargingState?.label?.toLowerCase();
+  const chargingByLabel =
+    chargingLabel === 'waiting' || chargingLabel === 'full charging' || chargingLabel === 'trickle charging';
+  const chargingByCode = chargingState === 2 || chargingState === 3 || chargingState === 4;
+  const isCharging = chargingByLabel || chargingByCode;
   if (isCharging && !state.charging) {
     state.charging = true;
     publishEvent({