From 0b1c8b753937f48be7ffa831675b93cdd5de3867 Mon Sep 17 00:00:00 2001
From: Alejandro Parcet <alex@dygma.com>
Date: Fri, 7 Jul 2023 12:42:44 +0200
Subject: [PATCH] fix: solved battery saving mode state retrieval issues

Data nature changed, in the previous FW the data was "true"/"false" strings, but now is 0:1
integers, that change breaks data treatment and needs to be compensated.
---
 src/renderer/modules/BatteryStatus/BatteryStatus.js |  2 +-
 src/renderer/modules/Settings/BatterySettings.js    |  8 ++++----
 src/renderer/views/Wireless.js                      | 12 ++++++------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/renderer/modules/BatteryStatus/BatteryStatus.js b/src/renderer/modules/BatteryStatus/BatteryStatus.js
index 927424345..1b836fd1f 100644
--- a/src/renderer/modules/BatteryStatus/BatteryStatus.js
+++ b/src/renderer/modules/BatteryStatus/BatteryStatus.js
@@ -125,7 +125,7 @@ const BatteryStatus = props => {
     setbRight(parseInt(right, 10));
     setsLeft(leftStatus.includes("0x") ? 255 : parseInt(leftStatus, 10));
     setsRight(rightStatus.includes("0x") ? 255 : parseInt(rightStatus, 10));
-    setIsSavingMode(savingMode);
+    setIsSavingMode(parseInt(savingMode, 10) > 0);
   }
 
   useEffect(() => {
diff --git a/src/renderer/modules/Settings/BatterySettings.js b/src/renderer/modules/Settings/BatterySettings.js
index ce6e62950..ee622fca1 100644
--- a/src/renderer/modules/Settings/BatterySettings.js
+++ b/src/renderer/modules/Settings/BatterySettings.js
@@ -57,25 +57,25 @@ function BatterySettings({ wireless, toggleSavingMode, changeWireless, isChargin
             <BatteryStatusSide
               side="left"
               batteryLevel={wireless.battery ? wireless.battery.LeftLevel : 100}
-              isSavingMode={wireless.battery ? String(wireless.battery.savingMode).includes("true") : false}
+              isSavingMode={wireless.battery ? wireless.battery.savingMode : false}
               batteryStatus={wireless.battery ? wireless.battery.LeftState : 0}
               size="lg"
             />
             <BatteryStatusSide
               side="right"
               batteryLevel={wireless.battery ? wireless.battery.RightLevel : 100}
-              isSavingMode={wireless.battery ? String(wireless.battery.savingMode).includes("true") : false}
+              isSavingMode={wireless.battery ? wireless.battery.savingMode : false}
               batteryStatus={wireless.battery ? wireless.battery.RightState : 0}
               size="lg"
             />
-            <SavingModeIndicator isSavingMode={wireless.battery ? String(wireless.battery.savingMode).includes("true") : false} />
+            <SavingModeIndicator isSavingMode={wireless.battery ? wireless.battery.savingMode : false} />
           </div>
           <Form className="batterySettingItem batterySetSavingMode">
             <div className="batterySettingLabel">Saving Mode</div>
             <Form.Check
               type="switch"
               id="settingSavingMode"
-              checked={wireless.battery ? String(wireless.battery.savingMode).includes("true") : false}
+              checked={wireless.battery ? wireless.battery.savingMode : false}
               onChange={toggleSavingMode}
             />
           </Form>
diff --git a/src/renderer/views/Wireless.js b/src/renderer/views/Wireless.js
index ac5f25b20..ae8bdf85b 100644
--- a/src/renderer/views/Wireless.js
+++ b/src/renderer/views/Wireless.js
@@ -1,13 +1,13 @@
 // General imports
 import React, { useState, useEffect } from "react";
-import i18n from "../i18n";
-import Focus from "../../api/focus";
 
 // Bootstrap components imports
 import Styled from "styled-components";
 import Container from "react-bootstrap/Container";
 import Row from "react-bootstrap/Row";
 import Col from "react-bootstrap/Col";
+import Focus from "../../api/focus";
+import i18n from "../i18n";
 
 // Custom component imports
 import PageHeader from "../modules/PageHeader";
@@ -52,7 +52,7 @@ const Wireless = ({ inContext, connected, allowBeta, updateAllowBeta, cancelCont
       wireless.battery.RightState = state ? parseInt(state, 10) : 0;
     });
     await focus.command("wireless.battery.savingMode").then(batteryMode => {
-      wireless.battery.savingMode = batteryMode;
+      wireless.battery.savingMode = parseInt(batteryMode, 10) > 0;
     });
 
     // Energy commands
@@ -107,9 +107,9 @@ const Wireless = ({ inContext, connected, allowBeta, updateAllowBeta, cancelCont
 
   async function toggleSavingMode() {
     const focus = new Focus();
-    await focus.command("wireless.battery.savingMode", !String(wireless.battery.savingMode).includes("true"));
+    await focus.command("wireless.battery.savingMode", !wireless.battery.savingMode ? 1 : 0);
     const newWireless = { ...wireless };
-    newWireless.battery.savingMode = !String(wireless.battery.savingMode).includes("true");
+    newWireless.battery.savingMode = !wireless.battery.savingMode;
     setWireless(newWireless);
   }
 
@@ -132,7 +132,7 @@ const Wireless = ({ inContext, connected, allowBeta, updateAllowBeta, cancelCont
     const focus = new Focus();
 
     // Commands to be sent to the keyboard
-    await focus.command("wireless.battery.savingMode", wireless.battery.savingMode);
+    await focus.command("wireless.battery.savingMode", wireless.battery.savingMode ? 1 : 0);
     await focus.command("wireless.energy.modes", wireless.energy.modes);
     await focus.command("wireless.energy.currentMode", wireless.energy.currentMode);
     await focus.command("wireless.energy.disable", wireless.energy.disable);