From 7b5b5290804de8c46b9edb862d3f7ada62a94432 Mon Sep 17 00:00:00 2001
From: atef <sarraj@innov.energy>
Date: Wed, 20 Mar 2024 13:52:00 +0100
Subject: [PATCH] reformatting must do calibration charge

---
 csharp/App/SaliMax/src/Ess/Controller.cs | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/csharp/App/SaliMax/src/Ess/Controller.cs b/csharp/App/SaliMax/src/Ess/Controller.cs
index 273456d8f..93213d6eb 100644
--- a/csharp/App/SaliMax/src/Ess/Controller.cs
+++ b/csharp/App/SaliMax/src/Ess/Controller.cs
@@ -188,13 +188,13 @@ public static class Controller
     private static Boolean MustDoCalibrationCharge(this StatusRecord statusRecord)
     {       
         var calibrationChargeForced           = statusRecord.Config.ForceCalibrationChargeState;
-        var batteryCalibrationChargeRequested = statusRecord.Battery is { CalibrationChargeRequested: true };//BatteryCalibrationChargeRequested(statusRecord.Battery?.CalibrationChargeRequested?? false) ;
+        var additionalCalibrationRequired     = CalibrationDateHasBeenPassed(statusRecord.Config.DayAndTimeForAdditionalCalibration);
+        var repetitiveCalibrationRequired     = CalibrationDateHasBeenPassed(statusRecord.Config.DayAndTimeForRepetitiveCalibration);
+        //var batteryCalibrationChargeRequested = statusRecord.Battery is { CalibrationChargeRequested: true };
 
-        var mustDoCalibrationCharge           =  calibrationChargeForced == CalibrationChargeType.ChargePermanently || 
-                                                 (calibrationChargeForced == CalibrationChargeType.AdditionallyOnce 
-                                                     && CalibrationDateHasBeenPassed(statusRecord.Config.DayAndTimeForAdditionalCalibration)) || 
-                                                     (calibrationChargeForced == CalibrationChargeType.RepetitivelyEvery &&
-                                                      CalibrationDateHasBeenPassed(statusRecord.Config.DayAndTimeForRepetitiveCalibration));
+        var mustDoCalibrationCharge           =  calibrationChargeForced  == CalibrationChargeType.ChargePermanently || 
+                                                 (calibrationChargeForced == CalibrationChargeType.AdditionallyOnce  && additionalCalibrationRequired) || 
+                                                 (calibrationChargeForced == CalibrationChargeType.RepetitivelyEvery && repetitiveCalibrationRequired);
 
         if (statusRecord.Battery is not null)
         {
@@ -215,7 +215,6 @@ public static class Controller
 
     private static Boolean CalibrationDateHasBeenPassed(DateTime calibrationChargeDate)
     {
-
         if (!_hasCalibrationChargeChecked)
         {
             if (DateTime.Now >= calibrationChargeDate )
@@ -223,8 +222,7 @@ public static class Controller
                 _hasCalibrationChargeChecked = true;
                 return true;
             }
-            return false;
-            
+            return false;   
         }
         return true;