no message

This commit is contained in:
mh
2026-01-26 15:05:45 +01:00
parent 0b9d53fff9
commit 4648c5e404
-63
View File
@@ -69,51 +69,13 @@ class Bat_EV_SDL extends IPSModule
$batteries = []; $batteries = [];
} }
<<<<<<< HEAD
//--------------------------------------------------
/*
=======
>>>>>>> parent of 2eab6b6 (no message)
$sdlTotalW = (float)$this->ReadPropertyInteger("SDL_Leistung"); // W $sdlTotalW = (float)$this->ReadPropertyInteger("SDL_Leistung"); // W
if ($sdlTotalW < 0) $sdlTotalW = 0; if ($sdlTotalW < 0) $sdlTotalW = 0;
$sdlTotalkW = $sdlTotalW / 1000.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 // 30 Minuten Fenster
$hours = 0.5; $hours = 0.5;
@@ -199,40 +161,15 @@ class Bat_EV_SDL extends IPSModule
$underKWh = $sdlShareKW * $hours; $underKWh = $sdlShareKW * $hours;
$underKWh = max(0.0, min($underKWh, $capKWh / 2.0)); $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; $upKWh = $capKWh - $underKWh;
$SDL_kWh = 2.0 * $underKWh; $SDL_kWh = 2.0 * $underKWh;
$EV_kWH = max(0.0, $capKWh - $SDL_kWh); $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; $real_kWh = $capKWh / 100.0 * $socPct;
// --- Deine 3 Fälle (minimal abgesichert, keine Änderung der Grundfunktion) --- // --- Deine 3 Fälle (minimal abgesichert, keine Änderung der Grundfunktion) ---