Update batteryMonitor.cpp

afpineda · afpineda · commit 536b31681f18 · 2025-10-28T09:10:50.000+01:00
diff --git a/src/common/batteryMonitor.cpp b/src/common/batteryMonitor.cpp
@@ -122,12 +122,7 @@ class BatteryServiceProvider : public BatteryService
 public:
     virtual int getLastBatteryLevel() override
     {
-        if (currentStatus.stateOfCharge.has_value())
-        {
-            return (int)currentStatus.stateOfCharge.value();
-        }
-        else
-            return UNKNOWN_BATTERY_LEVEL;
+        return (int)currentStatus.stateOfCharge.value_or(UNKNOWN_BATTERY_LEVEL);
     }
 
     virtual bool hasBattery() override
@@ -138,9 +133,7 @@ class BatteryServiceProvider : public BatteryService
     virtual bool isBatteryPresent() override
     {
         return (batteryMonitorhardware != nullptr) &&
-               (currentStatus.isBatteryPresent.has_value()
-                    ? currentStatus.isBatteryPresent.value()
-                    : false);
+               currentStatus.isBatteryPresent.value_or(false);
     }
 
     virtual void getStatus(BatteryStatus &status) override

Original file line number	Diff line number	Diff line change
`@@ -122,12 +122,7 @@ class BatteryServiceProvider : public BatteryService`
`122`	`122`	`public:`
`123`	`123`	`virtual int getLastBatteryLevel() override`
`124`	`124`	`{`
`125`		`- if (currentStatus.stateOfCharge.has_value())`
`126`		`- {`
`127`		`- return (int)currentStatus.stateOfCharge.value();`
`128`		`- }`
`129`		`- else`
`130`		`- return UNKNOWN_BATTERY_LEVEL;`
	`125`	`+ return (int)currentStatus.stateOfCharge.value_or(UNKNOWN_BATTERY_LEVEL);`
`131`	`126`	`}`
`132`	`127`
`133`	`128`	`virtual bool hasBattery() override`
`@@ -138,9 +133,7 @@ class BatteryServiceProvider : public BatteryService`
`138`	`133`	`virtual bool isBatteryPresent() override`
`139`	`134`	`{`
`140`	`135`	`return (batteryMonitorhardware != nullptr) &&`
`141`		`- (currentStatus.isBatteryPresent.has_value()`
`142`		`- ? currentStatus.isBatteryPresent.value()`
`143`		`- : false);`
	`136`	`+ currentStatus.isBatteryPresent.value_or(false);`
`144`	`137`	`}`
`145`	`138`
`146`	`139`	`virtual void getStatus(BatteryStatus &status) override`