feat(battery): track pending state of lynx parallel bms

victronenergy · Aug 15, 2024 · 9350ad3 · 9350ad3
1 parent 1cfc16d
commit 9350ad3
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/src/app/Marine2/components/boxes/Battery/Battery.tsx b/src/app/Marine2/components/boxes/Battery/Battery.tsx
@@ -63,7 +63,7 @@ const Battery = ({ battery, unit }: Props) => {
             <span className="pl-0.5 opacity-70">%</span>
           </div>
           <div className={classNames("text-victron-gray-300 dark:text-victron-gray-500", activeStyles.valueSubtitle)}>
-            <p>{batteryStateFor(battery.state, battery.timetogo ?? null)}</p>
+            <p>{batteryStateFor(battery.state, battery.bmsstate, battery.timetogo ?? null)}</p>
             {battery.temperature && (
               <p>
                 {temperatureValueFor(battery.temperature, temperatureUnit)}

diff --git a/src/app/Marine2/components/ui/BatterySummary/BatteryValues/BatteryValues.tsx b/src/app/Marine2/components/ui/BatterySummary/BatteryValues/BatteryValues.tsx
@@ -36,7 +36,7 @@ export const BatteryValues: FC<Props> = ({ battery, boxSize }) => {
         )}
       </div>
       <div className={classNames("text-victron-gray dark:text-victron-gray-dark", activeStyles.state)}>
-        {batteryStateFor(battery.state, battery.timetogo ?? null)}
+        {batteryStateFor(battery.state, battery.bmsstate, battery.timetogo ?? null)}
       </div>
     </div>
   )

diff --git a/src/app/Marine2/utils/constants/devices/batteries.ts b/src/app/Marine2/utils/constants/devices/batteries.ts
@@ -3,3 +3,7 @@ export const BATTERY = {
   CHARGING: 1,
   DISCHARGING: 2,
 }
+
+export const BMS = {
+  PENDING: 18,
+}
diff --git a/src/app/Marine2/utils/formatters/devices/battery/battery-state-for.ts b/src/app/Marine2/utils/formatters/devices/battery/battery-state-for.ts
@@ -1,8 +1,11 @@
 import { translate } from "react-i18nify"
-import { BATTERY } from "../../../constants/devices/batteries"
+import { BATTERY, BMS } from "../../../constants/devices/batteries"
 import { timeAsStringFormatter } from "../../generic"
 
-export const batteryStateFor = (state: number, timetogo?: number): string | null => {
+export const batteryStateFor = (state: number, bmsstate: number, timetogo?: number): string | null => {
+  if (bmsstate === BMS.PENDING) {
+    return translate("common.pending")
+  }
   switch (state) {
     case BATTERY.CHARGING:
       return translate("common.charging")

diff --git a/src/app/locales/languages/en.json b/src/app/locales/languages/en.json
@@ -87,6 +87,7 @@
         "off": "Off",
         "on": "On",
         "passthru": "Passthru",
+        "pending": "Pending",
         "powerSupplyMode": "Power supply mode",
         "remainingTime": "Remaining time",
         "running": "Running",
-Original file line number
+Diff line change
@@ Expand Up @@
             )}
           </div>
           <div className={classNames("text-victron-gray dark:text-victron-gray-dark", activeStyles.state)}>
-            {batteryStateFor(battery.state, battery.timetogo ?? null)}
+            {batteryStateFor(battery.state, battery.bmsstate, battery.timetogo ?? null)}
           </div>
         </div>
       )
@@ Expand Down @@