no message

This commit is contained in:
belevo\mh
2026-01-26 14:56:00 +01:00
parent ef49957d7f
commit 9f22ae0aa7
2 changed files with 19 additions and 14 deletions

View File

@@ -102,14 +102,8 @@
}, },
{ {
"type": "NumberSpinner", "type": "NumberSpinner",
"name": "SDL_Lade_Leistung", "name": "SDL_Leistung",
"caption": "SDL_Lade_Leistung", "caption": "SDL_Leistung",
"suffix": "W"
},
{
"type": "NumberSpinner",
"name": "SDL_Entlade_Leistung",
"caption": "SDL_Entlade_Leistung",
"suffix": "W" "suffix": "W"
}, },
{ {

View File

@@ -8,8 +8,7 @@ class Bat_EV_SDL extends IPSModule
// Properties // Properties
$this->RegisterPropertyString("Batteries", "[]"); $this->RegisterPropertyString("Batteries", "[]");
$this->RegisterPropertyInteger("SDL_Lade_Leistung", 0); $this->RegisterPropertyInteger("SDL_Leistung", 0); // W
$this->RegisterPropertyInteger("SDL_Entlade_Leistung", 0); // W
$this->RegisterPropertyInteger("UpdateInterval", 5); // Minuten $this->RegisterPropertyInteger("UpdateInterval", 5); // Minuten
// Status // Status
@@ -70,13 +69,17 @@ 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
""" """
*/ */
@@ -108,6 +111,8 @@ class Bat_EV_SDL extends IPSModule
} }
//--------------------------------------------- //---------------------------------------------
=======
>>>>>>> parent of 2eab6b6 (no message)
// 30 Minuten Fenster // 30 Minuten Fenster
$hours = 0.5; $hours = 0.5;
@@ -128,8 +133,7 @@ class Bat_EV_SDL extends IPSModule
$calc = [ $calc = [
"inputs" => [ "inputs" => [
"SDL_Entlade_Leistung_W" => round($sdlTotalEntladeW, 0), "SDL_Leistung_W" => round($sdlTotalW, 0),
"SDL_Lade_Leistung_W" => round($sdlTotalLadeW, 0),
"SumBatPower_W" => round($sumBatPowerW, 0), "SumBatPower_W" => round($sumBatPowerW, 0),
"hours" => $hours "hours" => $hours
], ],
@@ -187,13 +191,15 @@ class Bat_EV_SDL extends IPSModule
continue; continue;
} }
// Deine Logik: SDL/EV Aufteilung über Leistungsanteil // Deine Logik: SDL/EV Aufteilung über Leistungsanteil
$sdlShareKW = ($sumBatPowerkW > 0.0) ? ($sdlTotalkW / $sumBatPowerkW * $pBatkW) : 0.0; $sdlShareKW = ($sumBatPowerkW > 0.0) ? ($sdlTotalkW / $sumBatPowerkW * $pBatkW) : 0.0;
$evShareKW = $pBatkW - $sdlShareKW; $evShareKW = $pBatkW - $sdlShareKW;
// untere Grenze für SDL (wichtig: zuerst setzen, dann clamp)
$underKWh = $sdlShareKW * $hours;
$underKWh = max(0.0, min($underKWh, $capKWh / 2.0));
<<<<<<< HEAD
if ($mode == 'charge') { if ($mode == 'charge') {
$ver = $sdlTotalLadekW / $sdlTotalEntladekW; $ver = $sdlTotalLadekW / $sdlTotalEntladekW;
$underKWh = ($sdlShareKW * $hours) / $ver; $underKWh = ($sdlShareKW * $hours) / $ver;
@@ -221,6 +227,11 @@ class Bat_EV_SDL extends IPSModule
=======
$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;