From 9ab756bb22fea83394adfd4c07d5c88912a1c4d4 Mon Sep 17 00:00:00 2001
From: "belevo\\mh" <mh@belevo.ch>
Date: Wed, 26 Feb 2025 10:09:36 +0100
Subject: [PATCH] verbessert netzbezug

---
 Batterie/module.php | 10 +++++++---
 library.json        |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Batterie/module.php b/Batterie/module.php
index b7ff109..9bc41bd 100644
--- a/Batterie/module.php
+++ b/Batterie/module.php
@@ -185,7 +185,7 @@ public function RequestAction($Ident, $Value)
                 $this->SetValue("In_Hystere", 1);
                 IPS_LogMessage("Batterie", "Peak: unter minimum" );
 
-            } elseif ($batterieladezustand < $aufdasnachladen && $batterieladezustand > $minimumentladen && $inhystere == true) {
+            } elseif ($batterieladezustand < $aufdasnachladen && $batterieladezustand >= $minimumentladen && $inhystere == true) {
                 $filtered_powersteps = array_filter($array_powersteps, function ($value) use ($maxleistung) {
                     return $value >= 0; // Hochpass filtern
                 });
@@ -194,14 +194,18 @@ public function RequestAction($Ident, $Value)
                 $this->SetValue("In_Hystere", 1);   
                 IPS_LogMessage("Batterie", "Peak: hysterese" );
 
-            } elseif ($batterieladezustand < $aufdasnachladen && $batterieladezustand > $minimumentladen == false) {
+            } elseif ($batterieladezustand <= $aufdasnachladen && $batterieladezustand > $minimumentladen == false) {
                 $this->SetValue("PowerSteps", json_encode($array_powersteps));
                 $this->SetValue("In_Hystere", 0);  
                 IPS_LogMessage("Batterie", "Peak: normal" );
 
             } elseif ($batterieladezustand >= $aufdasnachladen) {
                 $netzbezug = GetValue($this->ReadPropertyInteger("Netzbezug"));
-                $dummy_array[] = $netzbezug*(-1);
+                if (abs($netzbezug)>$maxleistung){
+                    $dummy_array[] = $maxleistung;
+                } else{
+                    $dummy_array[] = $netzbezug*(-1);
+                }
                 $this->SetValue("PowerSteps", json_encode($dummy_array));
                 $this->SetValue("In_Hystere", 0);  
                 IPS_LogMessage("Batterie", "Peak: netzbezug" );
diff --git a/library.json b/library.json
index 99b50e5..69e70cc 100644
--- a/library.json
+++ b/library.json
@@ -6,7 +6,7 @@
     "compatibility": {
         "version": "7.1"
     },
-    "version": "1.090",
+    "version": "1.091",
     "build": 0,
     "date": 0
 }
\ No newline at end of file