From 4648c5e4041f0a197698f65fc20128a332e8d7ee Mon Sep 17 00:00:00 2001
From: "belevo\\mh" <mh@belevo.ch>
Date: Mon, 26 Jan 2026 15:05:45 +0100
Subject: [PATCH] no message

---
 Bat_EV_SDL/module.php | 67 ++-----------------------------------------
 1 file changed, 2 insertions(+), 65 deletions(-)

diff --git a/Bat_EV_SDL/module.php b/Bat_EV_SDL/module.php
index d05beeb..788fe5a 100644
--- a/Bat_EV_SDL/module.php
+++ b/Bat_EV_SDL/module.php
@@ -69,51 +69,13 @@ class Bat_EV_SDL extends IPSModule
                 $batteries = [];
             }
 
-<<<<<<< HEAD
 
-            //--------------------------------------------------
-            /*
-=======
->>>>>>> parent of 2eab6b6 (no message)
             $sdlTotalW = (float)$this->ReadPropertyInteger("SDL_Leistung"); // W
             if ($sdlTotalW < 0) $sdlTotalW = 0;
 
             $sdlTotalkW = $sdlTotalW / 1000.0;
-<<<<<<< HEAD
-            """
-            */
 
 
-            //---------------------------------------------
-
-            $sdlTotalLadeW = (float)$this->ReadPropertyInteger("SDL_Lade_Leistung"); // W
-            if ($sdlTotalLadeW < 0) $sdlTotalLadeW = 0;
-
-            $sdlTotalLadekW = $sdlTotalLadeW / 1000.0;
-
-
-            $sdlTotalEntladeW = (float)$this->ReadPropertyInteger("SDL_Entlade_Leistung"); // W
-            if ($sdlTotalEntladeW < 0) $sdlTotalEntladeW = 0;
-
-            $sdlTotalEntladekW = $sdlTotalEntladeW / 1000.0;
-
-
-
-            if ($sdlTotalLadekW > $sdlTotalEntladekW) {
-                    $sdlTotalkW = $sdlTotalLadekW;
-                    $mode = 'charge';
-                } elseif ($sdlTotalLadekW < $sdlTotalEntladekW) {
-                    $sdlTotalkW = $sdlTotalEntladekW;
-                    $mode = 'discharge';
-                } else {
-                    $sdlTotalkW = $sdlTotalEntladekW;
-                    $mode = 'equal';
-                }
-
-            //---------------------------------------------
-=======
->>>>>>> parent of 2eab6b6 (no message)
-
             // 30 Minuten Fenster
             $hours = 0.5;
 
@@ -199,39 +161,14 @@ class Bat_EV_SDL extends IPSModule
                 $underKWh = $sdlShareKW * $hours;
                 $underKWh = max(0.0, min($underKWh, $capKWh / 2.0));
 
-<<<<<<< HEAD
-                if ($mode == 'charge') {
-                    $ver = $sdlTotalLadekW / $sdlTotalEntladekW;
-                    $underKWh = ($sdlShareKW * $hours) / $ver;
-                    $upKWh   = $capKWh - ($sdlShareKW * $hours);
-                    
-                    $SDL_kWh = $underKWh + $upKWh;
-                    $EV_kWH  = max(0.0, $capKWh - $SDL_kWh);
-                } elseif ($mode == 'discharge' ) {
-
-                    $ver = $sdlTotalEntladekW / $sdlTotalLadekW;
-                    $underKWh   = ($sdlShareKW * $hours) ;
-                    $upKWh   = $capKWh - ($sdlShareKW * $hours) / $ver;
-
-                    $SDL_kWh = $underKWh + $upKWh;
-                    $EV_kWH  = max(0.0, $capKWh - $SDL_kWh);
-                }else {                  
-                    // untere Grenze für SDL (wichtig: zuerst setzen, dann clamp)
-                    $underKWh = $sdlShareKW * $hours;
-                    $underKWh = max(0.0, min($underKWh, $capKWh / 2.0));
-
-                    $upKWh   = $capKWh - $underKWh;
-                    $SDL_kWh = 2.0 * $underKWh;
-                    $EV_kWH  = max(0.0, $capKWh - $SDL_kWh);
-                }   
 
 
 
-=======
+
                 $upKWh   = $capKWh - $underKWh;
                 $SDL_kWh = 2.0 * $underKWh;
                 $EV_kWH  = max(0.0, $capKWh - $SDL_kWh);
->>>>>>> parent of 2eab6b6 (no message)
+
 
                 $real_kWh = $capKWh / 100.0 * $socPct;