no message
This commit is contained in:
+80
-155
@@ -55,100 +55,98 @@ class Bat_EV_SDL_V3_Beta extends IPSModule
|
||||
{
|
||||
// Reentranzschutz – verhindert parallele Update()-Läufe
|
||||
$semKey = 'BatEVSDL_Update_' . $this->InstanceID;
|
||||
|
||||
if (!IPS_SemaphoreEnter($semKey, 5000)) {
|
||||
$this->SendDebug("Update", "SKIP (Semaphore locked)", 0);
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
|
||||
if (!GetValue($this->GetIDForIdent("State"))) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Cache nur neu bauen, wenn nötig
|
||||
$this->BuildBatteryCache(false);
|
||||
|
||||
$cache = json_decode($this->GetBufferSafe("BatCacheJSON"), true);
|
||||
if (!is_array($cache) || empty($cache["bats"])) {
|
||||
$this->WriteAllZero("cache empty/invalid");
|
||||
return;
|
||||
}
|
||||
// =====================
|
||||
// Integrator: State laden
|
||||
// =====================
|
||||
// Optional für 2s besser: microtime(true) statt time() verwenden
|
||||
$now = time();
|
||||
$lastTs = (int)$this->GetBufferSafe("Int_LastTs");
|
||||
$lastPEV = (float)$this->GetBufferSafe("Int_LastP_EV_W"); // W (+ laden, - entladen)
|
||||
$lastPSDL = (float)$this->GetBufferSafe("Int_LastP_SDL_W"); // W (+ laden, - entladen)
|
||||
$Eev = (float)$this->GetBufferSafe("Int_E_EV_kWh"); // kWh-Konto EV
|
||||
$Esdl = (float)$this->GetBufferSafe("Int_E_SDL_kWh"); // kWh-Konto SDL
|
||||
if ($lastTs <= 0) {
|
||||
$lastTs = $now;
|
||||
$lastPEV = 0.0;
|
||||
$lastPSDL = 0.0;
|
||||
$Eev = 0.0;
|
||||
$Esdl = 0.0;
|
||||
}
|
||||
$dtH = ($now - $lastTs) / 3600.0; // Stunden
|
||||
if ($dtH < 0) $dtH = 0.0;
|
||||
if ($dtH > 1.0) $dtH = 1.0; // Sicherheitskappe
|
||||
|
||||
$calc = [
|
||||
"inputs" => $cache["inputs"] ?? [],
|
||||
"batteries" => [],
|
||||
"total" => []
|
||||
];
|
||||
// =====================
|
||||
|
||||
// Summen
|
||||
// =====================
|
||||
$sdlDisKW_ges = 0.0;
|
||||
$evDisKW_ges = 0.0;
|
||||
$sdlChKW_ges = 0.0;
|
||||
$evChKW_ges = 0.0;
|
||||
|
||||
$real_kWh_ev_ges = 0.0;
|
||||
$real_kWh_sdl_ges = 0.0;
|
||||
|
||||
$SDL_kWh_ges = 0.0;
|
||||
$EV_kWh_ges = 0.0;
|
||||
$totalCapKWh = 0.0;
|
||||
// Für Reset bei SoC=50% (mehrere Batterien): kapazitätsgewichteter Durchschnitt
|
||||
$socCapSum = 0.0;
|
||||
$socWeighted = 0.0;
|
||||
|
||||
foreach ($cache["bats"] as $i => $c) {
|
||||
|
||||
$capKWh = (float)($c["capKWh"] ?? 0.0);
|
||||
if ($capKWh <= 0.0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// dynamisch: SoC lesen
|
||||
$socVarId = (int)($c["socVarId"] ?? 0);
|
||||
$socPct = $this->ReadSocPercent($socVarId);
|
||||
|
||||
$real_kWh = $capKWh / 100.0 * $socPct;
|
||||
// SoC für Reset mitteln (gewichtet)
|
||||
$socWeighted += $socPct * $capKWh;
|
||||
$socCapSum += $capKWh;
|
||||
|
||||
// vorkalkuliert:
|
||||
$typ = (string)($c["typ"] ?? ("Bat " . ($i + 1)));
|
||||
$underKWh = (float)($c["underKWh"] ?? 0.0);
|
||||
$upKWh = (float)($c["upKWh"] ?? 0.0);
|
||||
$SDL_kWh = (float)($c["SDL_kWh_total"] ?? 0.0);
|
||||
$EV_kWh = (float)($c["EV_kWh_total"] ?? 0.0);
|
||||
$sdlShareKW_laden = (float)($c["sdlShareKW_laden"] ?? 0.0);
|
||||
$sdlShareKW_entladen = (float)($c["sdlShareKW_entladen"] ?? 0.0);
|
||||
$evShareKW_laden = (float)($c["evShareKW_laden"] ?? 0.0);
|
||||
$evShareKW_entladen = (float)($c["evShareKW_entladen"] ?? 0.0);
|
||||
|
||||
$sdlShareKW_laden = (float)($c["sdlShareKW_laden"] ?? 0.0);
|
||||
$sdlShareKW_entladen = (float)($c["sdlShareKW_entladen"] ?? 0.0);
|
||||
$evShareKW_laden = (float)($c["evShareKW_laden"] ?? 0.0);
|
||||
$evShareKW_entladen = (float)($c["evShareKW_entladen"] ?? 0.0);
|
||||
|
||||
// Defaults
|
||||
$EV_SOC = 0.0;
|
||||
$SDL_SOC = 0.0;
|
||||
|
||||
$sdlDisKW = 0.0; $evDisKW = 0.0;
|
||||
$sdlChKW = 0.0; $evChKW = 0.0;
|
||||
|
||||
$real_kWh_ev = 0.0;
|
||||
$real_kWh_sdl = 0.0;
|
||||
// --- 3 Fälle ---
|
||||
|
||||
// ============================
|
||||
// NEU: SDL_SOC als Fenster-Position (abhängig von under/up)
|
||||
// -> unter under: 0%
|
||||
// -> über up: 100%
|
||||
// -> dazwischen linear 0..100
|
||||
// ============================
|
||||
$win = ($upKWh - $underKWh);
|
||||
if ($win > 0.0) {
|
||||
$SDL_SOC = 100.0 * ($real_kWh - $underKWh) / $win;
|
||||
} else {
|
||||
$SDL_SOC = 0.0;
|
||||
}
|
||||
$SDL_SOC = is_finite($SDL_SOC) ? max(0.0, min(100.0, $SDL_SOC)) : 0.0;
|
||||
|
||||
// --- Deine 3 Fälle ---
|
||||
if ($underKWh <= $real_kWh && $upKWh >= $real_kWh) {
|
||||
// SDL_SOC im Fenster dynamisch (0..100)
|
||||
$win = ($upKWh - $underKWh);
|
||||
if ($win > 0.0) {
|
||||
$SDL_SOC = 100.0 * ($real_kWh - $underKWh) / $win;
|
||||
} else {
|
||||
$SDL_SOC = 0.0;
|
||||
}
|
||||
$SDL_SOC = is_finite($SDL_SOC) ? max(0.0, min(100.0, $SDL_SOC)) : 0.0;
|
||||
|
||||
// EV_SOC im Fenster dynamisch
|
||||
if ($EV_kWh > 0.0) {
|
||||
$EV_SOC = 100.0 * ($real_kWh - $underKWh) / $EV_kWh;
|
||||
@@ -156,41 +154,43 @@ class Bat_EV_SDL_V3_Beta extends IPSModule
|
||||
$EV_SOC = 0.0;
|
||||
}
|
||||
$EV_SOC = is_finite($EV_SOC) ? max(0.0, min(100.0, $EV_SOC)) : 0.0;
|
||||
|
||||
$sdlDisKW = $sdlShareKW_entladen;
|
||||
$evDisKW = $evShareKW_entladen;
|
||||
$sdlChKW = $sdlShareKW_laden;
|
||||
$evChKW = $evShareKW_laden;
|
||||
|
||||
$real_kWh_ev = $real_kWh - $underKWh;
|
||||
$real_kWh_sdl = $underKWh;
|
||||
|
||||
} elseif ($upKWh < $real_kWh) {
|
||||
|
||||
// obere Grenze => EV = 100%
|
||||
$EV_SOC = 100.0;
|
||||
$den1 = ($capKWh - $real_kWh + $underKWh);
|
||||
$den2 = (2.0 * $underKWh);
|
||||
if ($den1 > 0.0 && $den2 > 0.0) {
|
||||
$SDL_SOC = min(100.0, ($den1 / $den2) * 100.0);
|
||||
} else {
|
||||
$SDL_SOC = 0.0;
|
||||
}
|
||||
$SDL_SOC = is_finite($SDL_SOC) ? max(0.0, min(100.0, $SDL_SOC)) : 0.0;
|
||||
|
||||
$sdlDisKW = $sdlShareKW_entladen;
|
||||
$evDisKW = $evShareKW_entladen;
|
||||
$sdlChKW = $sdlShareKW_laden;
|
||||
$evChKW = 0.0;
|
||||
|
||||
$real_kWh_ev = $capKWh - ($capKWh - $upKWh + $underKWh);
|
||||
$real_kWh_sdl = ($capKWh - $upKWh + $underKWh) - ($capKWh - $real_kWh);
|
||||
|
||||
} elseif ($underKWh > $real_kWh) {
|
||||
|
||||
// untere Grenze => EV = 0%
|
||||
$EV_SOC = 0.0;
|
||||
$den = $upKWh + $underKWh;
|
||||
$SDL_SOC = ($den > 0.0) ? ($real_kWh * 100.0 / $den) : 0.0;
|
||||
$SDL_SOC = is_finite($SDL_SOC) ? max(0.0, min(100.0, $SDL_SOC)) : 0.0;
|
||||
|
||||
$sdlDisKW = $sdlShareKW_entladen;
|
||||
$evDisKW = 0.0;
|
||||
$sdlChKW = $sdlShareKW_laden;
|
||||
$evChKW = $evShareKW_laden;
|
||||
|
||||
$real_kWh_ev = 0.0;
|
||||
$real_kWh_sdl = $real_kWh;
|
||||
}
|
||||
// Null/Full
|
||||
|
||||
// Null/Full (wie gehabt)
|
||||
if ($real_kWh <= 0.0) {
|
||||
$sdlDisKW = 0.0;
|
||||
$real_kWh_ev = 0.0;
|
||||
@@ -200,154 +200,79 @@ class Bat_EV_SDL_V3_Beta extends IPSModule
|
||||
$real_kWh_ev = $EV_kWh;
|
||||
$real_kWh_sdl = $SDL_kWh;
|
||||
}
|
||||
|
||||
$real_kWh_ev = max(0.0, $real_kWh_ev);
|
||||
$real_kWh_sdl = max(0.0, $real_kWh_sdl);
|
||||
|
||||
// Summen
|
||||
$totalCapKWh += $capKWh;
|
||||
|
||||
$sdlDisKW_ges += $sdlDisKW;
|
||||
$evDisKW_ges += $evDisKW;
|
||||
$sdlChKW_ges += $sdlChKW;
|
||||
$evChKW_ges += $evChKW;
|
||||
|
||||
$real_kWh_ev_ges += $real_kWh_ev;
|
||||
$real_kWh_sdl_ges += $real_kWh_sdl;
|
||||
|
||||
$SDL_kWh_ges += $SDL_kWh;
|
||||
$EV_kWh_ges += $EV_kWh;
|
||||
|
||||
$calc["batteries"][] = [
|
||||
"idx" => $c["idx"] ?? $i,
|
||||
"typ" => $typ,
|
||||
"SoC_varId" => $socVarId,
|
||||
"SoC_pct" => round($socPct, 3),
|
||||
"Effektive kWh" => round($real_kWh, 3),
|
||||
|
||||
"EV_SOC" => round($EV_SOC, 3),
|
||||
"SDL_SOC" => round($SDL_SOC, 3),
|
||||
|
||||
"EV_kWh" => round($real_kWh_ev, 3),
|
||||
"SDL_kWh" => round($real_kWh_sdl, 3),
|
||||
|
||||
"under_grenze_kWh" => round($underKWh, 3),
|
||||
"up_grenze_kWh" => round($upKWh, 3),
|
||||
|
||||
"SDL_Charge_kW" => round($sdlChKW, 3),
|
||||
"SDL_Discharge_kW" => round($sdlDisKW, 3),
|
||||
"EV_Charge_kW" => round($evChKW, 3),
|
||||
"EV_Discharge_kW" => round($evDisKW, 3),
|
||||
];
|
||||
}
|
||||
// =====================
|
||||
// Nach foreach: Durchschnitts-SoC + Reset-Logik
|
||||
// =====================
|
||||
$socAvg = ($socCapSum > 0.0) ? ($socWeighted / $socCapSum) : 0.0;
|
||||
$resetTarget = 50.0;
|
||||
$resetTol = 0.5; // bei 2s Update: 0.2..0.5 je nach SoC-Auflösung
|
||||
$inWindow = (abs($socAvg - $resetTarget) <= $resetTol);
|
||||
$armedStr = $this->GetBufferSafe("Int_ResetArmed");
|
||||
$armed = ($armedStr === "") ? true : ($armedStr === "1");
|
||||
$doReset = false;
|
||||
if ($armed && $inWindow) {
|
||||
$doReset = true;
|
||||
$armed = false;
|
||||
}
|
||||
if (!$inWindow) {
|
||||
$armed = true;
|
||||
}
|
||||
$this->SetBuffer("Int_ResetArmed", $armed ? "1" : "0");
|
||||
// =====================
|
||||
// EV-Zone (oben/unten) erkennen und EV-Konto beim Zonenwechsel hart setzen
|
||||
// Ziel: Wenn obere Grenze erreicht -> SoC_EV = 100% (Eev = EV_total)
|
||||
// Wenn untere Grenze erreicht -> SoC_EV = 0% (Eev = 0)
|
||||
// =====================
|
||||
$epsKWh = 0.001;
|
||||
// ZoneNow aus EV-Referenz ableiten:
|
||||
// -1 = EV leer (untere Zone), 0 = Fenster, +1 = EV voll (obere Zone)
|
||||
$zoneNow = 0;
|
||||
if ($real_kWh_ev_ges <= $epsKWh) {
|
||||
$zoneNow = -1;
|
||||
} elseif ($EV_kWh_ges > 0.0 && $real_kWh_ev_ges >= ($EV_kWh_ges - $epsKWh)) {
|
||||
$zoneNow = 1;
|
||||
}
|
||||
// Vorherige Zone aus Buffer
|
||||
$zonePrevStr = $this->GetBufferSafe("EV_Zone");
|
||||
$zonePrev = ($zonePrevStr === "") ? $zoneNow : (int)$zonePrevStr;
|
||||
// Nur beim Zonenwechsel hart setzen (Edge-Trigger)
|
||||
if ($zoneNow !== $zonePrev) {
|
||||
if ($zoneNow === 1) {
|
||||
// Übergang in obere Zone -> EV "voll"
|
||||
$Eev = $EV_kWh_ges;
|
||||
} elseif ($zoneNow === -1) {
|
||||
// Übergang in untere Zone -> EV "leer"
|
||||
$Eev = 0.0;
|
||||
}
|
||||
}
|
||||
// Zone speichern
|
||||
$this->SetBuffer("EV_Zone", (string)$zoneNow);
|
||||
// ===================================================
|
||||
// Integrator: NUR integrieren wenn Soll != 0W
|
||||
// Angleichen ist raus: wir setzen bei Soll=0 hart auf Referenz
|
||||
// ===================================================
|
||||
$pEvSoll = (float)GetValue($this->GetIDForIdent("Nennleistung_Soll_EV"));
|
||||
$pSdlSoll = (float)GetValue($this->GetIDForIdent("Nennleistung_Soll_SDL"));
|
||||
$eps = 1.0;
|
||||
$evActive = (abs($pEvSoll) > $eps);
|
||||
$sdlActive = (abs($pSdlSoll) > $eps);
|
||||
// Initialisierung beim ersten Mal
|
||||
if ($this->GetBufferSafe("Int_Init") !== "1") {
|
||||
$Eev = $real_kWh_ev_ges;
|
||||
$Esdl = $real_kWh_sdl_ges;
|
||||
$this->SetBuffer("Int_Init", "1");
|
||||
}
|
||||
// Reset bei SoC~50%: hart auf Referenz (du akzeptierst Sprung)
|
||||
if ($doReset) {
|
||||
$Eev = $real_kWh_ev_ges;
|
||||
$Esdl = $real_kWh_sdl_ges;
|
||||
}
|
||||
// Integration nur wenn aktiv, sonst hart auf Referenz
|
||||
if ($evActive) {
|
||||
$Eev += (($lastPEV / 1000.0) * $dtH);
|
||||
} else {
|
||||
$Eev = $real_kWh_ev_ges;
|
||||
}
|
||||
if ($sdlActive) {
|
||||
$Esdl += (($lastPSDL / 1000.0) * $dtH);
|
||||
} else {
|
||||
$Esdl = $real_kWh_sdl_ges;
|
||||
}
|
||||
// Clamp: Grenzen strikt einhalten (SDL reserviert!)
|
||||
$Eev = ($EV_kWh_ges > 0.0) ? max(0.0, min($EV_kWh_ges, $Eev)) : 0.0;
|
||||
$Esdl = ($SDL_kWh_ges > 0.0) ? max(0.0, min($SDL_kWh_ges, $Esdl)) : 0.0;
|
||||
// Prozentwerte aus den Konten
|
||||
$evPosPct = ($EV_kWh_ges > 0.0) ? ($Eev / $EV_kWh_ges * 100.0) : 0.0;
|
||||
$sdlPosPct = ($SDL_kWh_ges > 0.0) ? ($Esdl / $SDL_kWh_ges * 100.0) : 0.0;
|
||||
// Output setzen
|
||||
|
||||
// Physikalische Gesamt-Positionen (wie in deinem ursprünglichen Code)
|
||||
$evPosPct = ($EV_kWh_ges > 0.0) ? ($real_kWh_ev_ges / $EV_kWh_ges * 100.0) : 0.0;
|
||||
$sdlPosPct = ($SDL_kWh_ges > 0.0) ? ($real_kWh_sdl_ges / $SDL_kWh_ges * 100.0) : 0.0;
|
||||
|
||||
$this->SetIdentValue("SDL_Pos", round($sdlPosPct, 3));
|
||||
$this->SetIdentValue("SoC_EV", round($evPosPct, 3));
|
||||
// Maximalleistungen setzen (wie gehabt)
|
||||
|
||||
$this->SetIdentValue("P_SDL_laden", round($sdlChKW_ges * 1000.0, 0));
|
||||
$this->SetIdentValue("P_SDL_entladen", round($sdlDisKW_ges * 1000.0, 0));
|
||||
$this->SetIdentValue("P_EV_laden", round($evChKW_ges * 1000, 0));
|
||||
$this->SetIdentValue("P_EV_entladen", round($evDisKW_ges * 1000, 0));
|
||||
$this->SetIdentValue("P_EV_laden", round($evChKW_ges * 1000.0, 0));
|
||||
$this->SetIdentValue("P_EV_entladen", round($evDisKW_ges * 1000.0, 0));
|
||||
|
||||
$calc["total"] = [
|
||||
"SDL_SoC_pct" => round($sdlPosPct, 3),
|
||||
"EV_SoC_pct" => round($evPosPct, 3),
|
||||
|
||||
"SDL_kWh_total" => round($SDL_kWh_ges, 3),
|
||||
"EV_kWh_total" => round($EV_kWh_ges, 3),
|
||||
|
||||
"SDL_Charge_kW" => round($sdlChKW_ges, 3),
|
||||
"SDL_Discharge_kW" => round($sdlDisKW_ges, 3),
|
||||
"EV_Charge_kW" => round($evChKW_ges, 3),
|
||||
"EV_Discharge_kW" => round($evDisKW_ges, 3),
|
||||
"totalCap_kWh" => round($totalCapKWh, 3),
|
||||
"socAvg" => round($socAvg, 3),
|
||||
"doReset" => $doReset ? 1 : 0
|
||||
|
||||
"totalCap_kWh" => round($totalCapKWh, 3)
|
||||
];
|
||||
|
||||
$this->SetIdentValue("CalcJSON", json_encode($calc, JSON_PRETTY_PRINT));
|
||||
// Setpoints schreiben
|
||||
|
||||
// Setpoints wie gehabt
|
||||
$this->ApplySetpoints();
|
||||
// ==================================
|
||||
// Integrator: neue LastP für nächstes Intervall speichern
|
||||
// ==================================
|
||||
$aktEV = (float)GetValue($this->GetIDForIdent("Aktuelle_Leistung_EV"));
|
||||
$aktSDL = (float)GetValue($this->GetIDForIdent("Aktuelle_Leistung_SDL"));
|
||||
$this->SetBuffer("Int_LastP_EV_W", (string)$aktEV);
|
||||
$this->SetBuffer("Int_LastP_SDL_W", (string)$aktSDL);
|
||||
$this->SetBuffer("Int_LastTs", (string)$now);
|
||||
$this->SetBuffer("Int_E_EV_kWh", (string)$Eev);
|
||||
$this->SetBuffer("Int_E_SDL_kWh", (string)$Esdl);
|
||||
|
||||
} catch (Throwable $e) {
|
||||
$this->SendDebug("Update ERROR", $e->getMessage() . " @ " . $e->getFile() . ":" . $e->getLine(), 0);
|
||||
$this->WriteAllZero("Exception: " . $e->getMessage());
|
||||
|
||||
Reference in New Issue
Block a user