From 4117a0ceb8cc362970f6a50c4f85c56ef7b8e090 Mon Sep 17 00:00:00 2001
From: "belevo\\mh" <mh@belevo.ch>
Date: Wed, 26 Feb 2025 15:50:54 +0100
Subject: [PATCH] peak verbessert

---
 Batterie/module.php | 23 ++++++++++-------------
 library.json        |  2 +-
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/Batterie/module.php b/Batterie/module.php
index b827033..bc6a376 100644
--- a/Batterie/module.php
+++ b/Batterie/module.php
@@ -181,15 +181,6 @@ public function RequestAction($Ident, $Value)
 
             if($batterieladezustand >= $aufdasnachladen){
                 $this->SetValue("Hysterese_peak", false);  
-                $netzbezug = GetValue($this->ReadPropertyInteger("Netzbezug"));
-                if (abs($netzbezug)>$maxleistung){
-                    $dummy_array[] = $maxleistung*(-1);
-                } else{
-                    $dummy_array[] = $netzbezug;
-                }
-                $this->SetValue("PowerSteps", json_encode($dummy_array));
-                $this->SetValue("Hysterese_peak", 0);  
-                IPS_LogMessage("Batterie", "Peak: netzbezug" );
                 }
 
             if ($batterieladezustand <= $minimumentladen) {
@@ -201,7 +192,7 @@ public function RequestAction($Ident, $Value)
                 $this->SetValue("Hysterese_peak", true);
                 IPS_LogMessage("Batterie", "Peak: unter minimum" );
 
-            } elseif ($batterieladezustand <  $aufdasnachladen) {
+            } elseif ($batterieladezustand  > $minimumentladen) {
                 
                 if ($inhystere_peak == true){
                     $filtered_powersteps = array_filter($array_powersteps, function ($value) use ($maxleistung) {
@@ -211,8 +202,14 @@ public function RequestAction($Ident, $Value)
                     $this->SetValue("PowerSteps", json_encode($filtered_powersteps_laden));
                     IPS_LogMessage("Batterie", ": peak:  Hysterese " );
                 }else{ 
-                    $this->SetValue("PowerSteps", json_encode($array_powersteps));
-                    IPS_LogMessage("Batterie", ": peak:  keine Hysterese " );
+                    $netzbezug = GetValue($this->ReadPropertyInteger("Netzbezug"));
+                    if (abs($netzbezug)>$maxleistung){
+                        $dummy_array[] = $maxleistung*(-1);
+                    } else{
+                        $dummy_array[] = $netzbezug;
+                    }
+                    $this->SetValue("PowerSteps", json_encode($dummy_array));
+                    IPS_LogMessage("Batterie", "Peak: netzbezug, keine hysterese" );
                  } 
             }
             
@@ -244,7 +241,7 @@ public function RequestAction($Ident, $Value)
                         return $value >= 0; 
                     });
                     $filtered_powersteps_laden = array_values($filtered_powersteps);
-                    $this->SetValue("PowerSteps", json_encode($filtered_powersteps));
+                    $this->SetValue("PowerSteps", json_encode($filtered_powersteps_laden));
                     IPS_LogMessage("Batterie", ": solar:  Hysterese " );
                 }else{ 
                     $this->SetValue("PowerSteps", json_encode($array_powersteps));
diff --git a/library.json b/library.json
index 418f77f..b2fdf1f 100644
--- a/library.json
+++ b/library.json
@@ -6,7 +6,7 @@
     "compatibility": {
         "version": "7.1"
     },
-    "version": "1.097",
+    "version": "1.098",
     "build": 0,
     "date": 0
 }
\ No newline at end of file