diff --git a/Bat_EV_SDL/module.php b/Bat_EV_SDL/module.php index 68e25a9..a93178b 100644 --- a/Bat_EV_SDL/module.php +++ b/Bat_EV_SDL/module.php @@ -70,7 +70,7 @@ class Bat_EV_SDL extends IPSModule $sdlTotalW = (float)$this->ReadPropertyInteger("SDL_Leistung"); // W if ($sdlTotalW < 0) $sdlTotalW = 0; - + $sdlTotalkW = $sdlTotalW/1000; // 30 Minuten Fenster $hours = 0.5; @@ -85,9 +85,9 @@ class Bat_EV_SDL extends IPSModule $this->WriteAllZero("sumBatPowerW=0"); return; } + $sumBatPowerkW = $sumBatPowerW/1000; + - // SDL nicht größer als Summe Batterieleistung - if ($sdlTotalW > $sumBatPowerW) $sdlTotalW = $sumBatPowerW; // Totals $totalCapKWh = 0.0; @@ -105,6 +105,12 @@ class Bat_EV_SDL extends IPSModule $sumSdlDisKW = 0.0; $sumEvDisKW = 0.0; + + //-------------------------------------------- + $real_kWh = 0.0; + + //------------------------------- + $calc = [ "inputs" => [ "SDL_Leistung_W" => round($sdlTotalW, 0), @@ -115,60 +121,120 @@ class Bat_EV_SDL extends IPSModule "total" => [] ]; + // Meine initalisierte Variablen + $EV_SOC = 0.0; + $SDL_SOC =0.0; + $sdlDisKW = 0.0; // SDL- + $evDisKW = 0.0; // EV- + $sdlChKW = 0.0; // SDL+ + $evChKW = 0.0; //EV+ + + $sdlDisKW_ges = 0.0; // SDL- gesamt + $evDisKW_ges = 0.0; // EV- gesamt + $sdlChKW_ges = 0.0; // SDL+ gesamt + $evChKW_ges = 0.0; //EV+ gesamt + + $real_kWh_ev_ges = 0.0; + $real_kWh_sdl_ges = 0.0; + $SDL_kWh_ges = 0.0; + $EV_kWh_ges = 0.0; + + $real_kWh_ev = 0.0; + $real_kWh_sdl = 0.0; + $EV_SOC = 0.0; + $SDL_SOC = 0.0; + $sdlDisKW = 0.0; + $evDisKW = 0.0; + $sdlChKW = 0.0; + $evChKW = 0.0; + foreach ($batteries as $idx => $b) { $pBatW = max(0.0, (float)($b["powerbat"] ?? 0)); + $pBatkW = $pBatW/1000; $capKWh = max(0.0, (float)($b["capazity"] ?? 0)); // soc ist SelectVariable -> Variable-ID $socVarId = (int)($b["soc"] ?? 0); $socPct = $this->ReadSocPercent($socVarId); - $totalCapKWh += $capKWh; - // gespeicherte Energie - $storedKWh = $capKWh * ($socPct / 100.0); - $totalStoredKWh += $storedKWh; + + //--------------Meine Berechnung, so wie ich es möchte------------------------ - // SDL-Leistung anteilig verteilen - $sdlShareW = 0.0; - if ($pBatW > 0 && $sdlTotalW > 0) { - $sdlShareW = $sdlTotalW * ($pBatW / $sumBatPowerW); + + $sdlShareKW = $sdlTotalkW/$sumBatPowerkW*$pBatkW; // SDL Power + $evShareKW = $pBatkW - $sdlShareKW ; // EV Power + $underKWh = $sdlShareKW * $hours;// untere GRenze für SDL + $upKWh = $capKWh - $underKWh ; // obere Grenze für SDL + $SDL_kWh = 2*$underKWh; //SDL kWh + $EV_KwH = $capKWh - 2*$underKWh; // EV kWh + $real_kWh = $capKWh/100 * $socPct;// Jetziger Füllstand in kWh + + + if ($underKWh < $real_kWh && $upKWh > $real_kWh ){ + $SDL_SOC = 50; + $EV_SOC = ($real_kWh - $underKWh) * 100 / $capKWh; + $sdlDisKW = $sdlShareKW; // SDL- + $evDisKW = $evShareKW; // EV- + $sdlChKW = $sdlShareKW; // SDL+ + $evChKW = $evShareKW; //EV+ + // Reale kWh für EV und SDl + $real_kWh_ev = $real_kWh - $underKWh; + $real_kWh_sdl = $underKWh; + + } elseif ($upKWh < $real_kWh) { + $EV_SOC = 100; + $SDL_SOC = ($capKWh - $EV_KwH) / (2*$underKWh) * 100; + $sdlDisKW = $sdlShareKW; // SDL- + $evDisKW = $evShareKW; // EV- + $sdlChKW = $sdlShareKW; // SDL+ + $evChKW = 0; //EV+ + // Reale kWh für EV und SDl + $real_kWh_ev = $real_kWh - 2*$underKWh; + $real_kWh_sdl = (2 * $underKWh) - ($capKWh - $real_kWh); + + } elseif ($underKWh > $real_kWh) { + $EV_SOC = 0; + $den = 2 * $underKWh; + $SDL_SOC = ($den > 0) ? ($real_kWh * 100 / $den) : 0.0; + $sdlDisKW = $sdlShareKW; // SDL- + $evDisKW = 0; // EV- + $sdlChKW = $sdlShareKW; // SDL+ + $evChKW = $evShareKW; //EV+ + // Reale kWh für EV und SDl + $real_kWh_ev = 0; + $real_kWh_sdl = $real_kWh; + } + + // Null SoC für sdl Power abdecken + if ($real_kWh =< 0) { + $sdlDisKW = 0; + // Reale kWh für EV und SDl + $real_kWh_ev = 0; + $real_kWh_sdl = 0; + } elseif ($real_kWh >= 100) { + $sdlChKW = 0; + // Reale kWh für EV und SDl + $real_kWh_ev = $capKWh - 2* $underKWh; + $real_kWh_sdl = 2 * $underKWh ; } - if ($sdlShareW > $pBatW) $sdlShareW = $pBatW; - $evShareW = max(0.0, $pBatW - $sdlShareW); + $totalCapKWh += $capKWh; + // Berechnungen für Leistungen laden und entladen gesamt haft + $sdlDisKW_ges += $sdlDisKW; + $evDisKW_ges += $evDisKW; + $sdlChKW_ges += $sdlChKW; + $evChKW_ges += $evChKW; - // in kW - $sdlShareKW = $sdlShareW / 1000.0; - $evShareKW = $evShareW / 1000.0; + $real_kWh_ev_ges += $real_kWh_ev; + $real_kWh_sdl_ges += $real_kWh_sdl ; - // under_grenze_kWh = SDL Energiebedarf in 30min - $underKWh = $sdlShareKW * $hours; - - // tatsächlich für SDL verfügbare Energie (energiebegrenzt) - $sdlAvailKWh = min($storedKWh, $underKWh); - - // up_grenze_kWh = EV Energie (Restenergie nach SDL) - $upKWh = max(0.0, $storedKWh - $sdlAvailKWh); - - // Runterregeln Discharge anhand Energie im Zeitfenster - // Pmax(kW) = E(kWh) / hours - $sdlDisKW = ($hours > 0) ? min($sdlShareKW, $sdlAvailKWh / $hours) : 0.0; - $evDisKW = ($hours > 0) ? min($evShareKW, $upKWh / $hours) : 0.0; - - // Charge = reservierte Leistungsanteile - $sdlChKW = $sdlShareKW; - $evChKW = $evShareKW; - - // Totals - $sumSdlAvailKWh += $sdlAvailKWh; - $sumEvKWh += $upKWh; - - $sumSdlChargeKW += $sdlChKW; - $sumEvChargeKW += $evChKW; - $sumSdlDisKW += $sdlDisKW; - $sumEvDisKW += $evDisKW; + // gesamte kWh über alle Batterien für EV und SDL berechnet + $SDL_kWh_ges += $SDL_kWh; //SDL kWh geamt + $EV_kWH_ges += $EV_KwH; // EV kWh + //-------------------------------------------------------------------------------- + // von mir angepasst $calc["batteries"][] = [ "idx" => $idx, "typ" => (string)($b["typ"] ?? ("Bat " . ($idx + 1))), @@ -178,7 +244,13 @@ class Bat_EV_SDL extends IPSModule "SoC_varId" => $socVarId, "SoC_pct" => round($socPct, 3), - "Stored_kWh"=> round($storedKWh, 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), "SDL_Power_kW" => round($sdlShareKW, 3), "EV_Power_kW" => round($evShareKW, 3), @@ -194,50 +266,38 @@ class Bat_EV_SDL extends IPSModule ]; } - // SDL% = lieferbare SDL Energie / benötigte SDL Energie - $sdlPosPct = 0.0; - if ($sdlNeedTotalKWh > 0.000001) { - $sdlPosPct = ($sumSdlAvailKWh / $sdlNeedTotalKWh) * 100.0; - } - // EV%: Anteil der EV-Restenergie bezogen auf "max EV Energie" im gespeicherten Zustand. - // Max EV Energie (im Speicher) = totalStored - SDL_needTotal (aber nicht <0) - $evMaxKWh = max(0.0, $totalStoredKWh - $sdlNeedTotalKWh); - $evPosPct = 0.0; - if ($evMaxKWh > 0.000001) { - $evPosPct = ($sumEvKWh / $evMaxKWh) * 100.0; - } + $evPosPct = $real_kWh_ev_ges/ $EV_kWh_ges *100 ; + $sdlPosPct = $real_kWh_sdl_ges/ $SDL_kWh_ges *100 ; // Variablen setzen $this->SetIdentValue("SDL_Pos", round($sdlPosPct, 3)); $this->SetIdentValue("SoC_EV", round($evPosPct, 3)); // W-Variablen - $this->SetIdentValue("P_SDL_max", round($sumSdlChargeKW * 1000.0, 0)); - $this->SetIdentValue("P_SDL_laden", round($sumSdlChargeKW * 1000.0, 0)); - $this->SetIdentValue("P_SDL_entladen", round($sumSdlDisKW * 1000.0, 0)); + + $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_max", round($sumEvChargeKW * 1000.0, 0)); - $this->SetIdentValue("P_EV_laden", round($sumEvChargeKW * 1000.0, 0)); - $this->SetIdentValue("P_EV_entladen", round($sumEvDisKW * 1000.0, 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_Charge_kW" => round($sumSdlChargeKW, 3), - "SDL_Discharge_kW" => round($sumSdlDisKW, 3), + "SDL_kWh_pct" => round($SDL_kWh_ges, 3), + "EV_kWh_pct" => round($EV_kWh_ges, 3), - "EV_Charge_kW" => round($sumEvChargeKW, 3), - "EV_Discharge_kW" => round($sumEvDisKW, 3), + "SDL_Charge_kW" => round($sdlChKW_ges, 3), + "SDL_Discharge_kW" => round($sdlDisKW_ges, 3), - "SDL_needTotal_kWh" => round($sdlNeedTotalKWh, 3), - "SDL_availTotal_kWh" => round($sumSdlAvailKWh, 3), - "EV_total_kWh" => round($sumEvKWh, 3), + "EV_Charge_kW" => round($evChKW_ges, 3), + "EV_Discharge_kW" => round($evDisKW_ges, 3), + + "totalCap_kWh" => round($totalCapKWh, 3) - "totalCap_kWh" => round($totalCapKWh, 3), - "totalStored_kWh" => round($totalStoredKWh, 3), - "EV_max_kWh" => round($evMaxKWh, 3) ]; $this->SetIdentValue("CalcJSON", json_encode($calc, JSON_PRETTY_PRINT));