From c2c0b34bad44b5ebc2518b60691d423709ccd5df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20H=C3=A4fliger?= Date: Wed, 22 Jan 2025 08:40:12 +0100 Subject: [PATCH] Auf Asynchron umgebaut --- Batterie/module.php | 43 +++++++++++------ Boiler_2_Stufig_Mit_Fueler/module.php | 66 +++++++++++++++++++-------- Ladestation_Universal/module.php | 21 +++++++-- Manager/module.php | 18 +++++--- Verbraucher_1_Stufig/module.php | 21 +++++++-- WP_Steuerung/module.php | 21 +++++++-- library.json | 2 +- 7 files changed, 143 insertions(+), 49 deletions(-) diff --git a/Batterie/module.php b/Batterie/module.php index 37cfb49..97f94d6 100644 --- a/Batterie/module.php +++ b/Batterie/module.php @@ -21,7 +21,11 @@ class Batterie extends IPSModule $this->RegisterVariableString("PowerSteps", "PowerSteps"); $this->RegisterVariableBoolean("Idle", "Idle", "", 0); $this->RegisterVariableInteger("Sperre_Prio", "Sperre_Prio"); - $this->RegisterVariableInteger("PV_Prio", "PV_Prio"); + $this->RegisterVariableInteger("PV_Prio", "PV_Prio"); + $this->RegisterVariableInteger("Power", "Power"); + $this->RegisterVariableBoolean("Is_Peak_Shaving", "Is_Peak_Shaving"); + + $this->RegisterVariableFloat("Bezogene_Energie", "Bezogene_Energie", "", 0); // Hilfsvariabeln für Idle zustand @@ -31,6 +35,10 @@ class Batterie extends IPSModule // Initialisiere Idle $this->SetValue("Idle", true); + + $this->RegisterTimer("Timer_Do_UserCalc",5000,"IPS_RequestAction(" .$this->InstanceID .', "Do_UserCalc", "");'); + + } public function ApplyChanges() @@ -56,19 +64,28 @@ class Batterie extends IPSModule - public function RequestAction($Ident, $Value) - { - - switch ($Ident) { - case "SetAktuelle_Leistung": - $this->SetAktuelle_Leistung($Value); - break; - case "GetCurrentData": - return $this->GetCurrentData($Value); - default: - throw new Exception("Invalid Ident"); - } +public function RequestAction($Ident, $Value) +{ + switch ($Ident) { + + case "SetAktuelle_Leistung": + SetValue("Power", $Value); + break; + + case "GetCurrentData": + SetValue("Is_Peak_Shaving", $Value); + break; + + case "Do_UserCalc": + + $this->SetAktuelle_Leistung(GetValue("Power")); + $this->GetCurrentData(GetValue("Is_Peak_Shaving")); + break; + + default: + throw new Exception("Invalid Ident"); } +} public function SetAktuelle_Leistung(int $power) { diff --git a/Boiler_2_Stufig_Mit_Fueler/module.php b/Boiler_2_Stufig_Mit_Fueler/module.php index b55b17e..52f321c 100644 --- a/Boiler_2_Stufig_Mit_Fueler/module.php +++ b/Boiler_2_Stufig_Mit_Fueler/module.php @@ -15,15 +15,15 @@ class Boiler_2_Stufig_Mit_Fueler extends IPSModule $this->RegisterPropertyInteger("Kontakt_Volllast", 0); $this->RegisterPropertyBoolean("Boilertemperatur_glätten", false); - - // Boiler spezifische Variablen + $this->RegisterVariableInteger("Mindesttemperatur","Mindesttemperatur","",45); $this->RegisterVariableInteger("Maximaltemperatur","Maximaltemperatur","",60); $this->RegisterVariableInteger("Legionellentemperatur","Legionellentemperatur","",65); $this->RegisterVariableInteger("LegioCounter", "LegioCounter", "", 0); + //$this->RegisterVariableInteger("Boilertemperatur", "Boilertemperatur", "", 0); $this->RegisterVariableInteger("Boilertemperatur", "Boilertemperatur", "", 0); - + // Variabeln für Kommunkation mit Manager $this->RegisterVariableInteger("Sperre_Prio", "Sperre_Prio"); @@ -32,6 +32,8 @@ class Boiler_2_Stufig_Mit_Fueler extends IPSModule $this->RegisterVariableInteger("Aktuelle_Leistung", "Aktuelle_Leistung", "", 0); $this->RegisterVariableFloat("Bezogene_Energie", "Bezogene_Energie", "", 0); $this->RegisterVariableString("PowerSteps", "PowerSteps"); + $this->RegisterVariableInteger("Power", "Power"); + $this->RegisterVariableBoolean("Is_Peak_Shaving", "Is_Peak_Shaving"); // Hilfsvariabeln für Idle zustand $this->RegisterPropertyInteger("IdleCounterMax", 2); @@ -40,30 +42,37 @@ class Boiler_2_Stufig_Mit_Fueler extends IPSModule // Initialisiere Idle $this->SetValue("Idle", true); + + $this->RegisterTimer("Timer_Do_UserCalc",5000,"IPS_RequestAction(" .$this->InstanceID .', "Do_UserCalc", "");'); + } public function ApplyChanges() { parent::ApplyChanges(); + + } public function RequestAction($Ident, $Value) { - - switch ($Ident) { case "SetAktuelle_Leistung": - - $this->SetAktuelle_Leistung($Value); + SetValue("Power", $Value); break; case "GetCurrentData": - - $result = $this->GetCurrentData($Value); - return $result; - + SetValue("Is_Peak_Shaving", $Value); + break; + + case "Do_UserCalc": + + $this->SetAktuelle_Leistung(GetValue("Power")); + $this->GetCurrentData(GetValue("Is_Peak_Shaving")); + break; + default: throw new Exception("Invalid Ident"); } @@ -112,27 +121,46 @@ class Boiler_2_Stufig_Mit_Fueler extends IPSModule $boilertemperatur_glätten = $this->ReadPropertyBoolean("Boilertemperatur_glätten"); if ($boilertemperatur_glätten) { + // Wenn Glättung aktiviert ist, führe das Glätten durch $boilerFuehlerPT1ID = $this->ReadPropertyInteger("Boilerfuehler_PT1"); - $boilerPT1 = IPS_VariableExists($boilerFuehlerPT1ID) ? GetValue($boilerFuehlerPT1ID) : 0.0; - $boilerTemp_test = $this->GetValue("Boilertemperatur"); + if (IPS_VariableExists($boilerFuehlerPT1ID)) { + $boilerPT1 = GetValue($boilerFuehlerPT1ID); + } else { + $boilerPT1 = 0.0; // Standardwert + } - $time_constant = $this->ReadPropertyInteger("ZeitKonstante"); - $delta_t = 30; + $boilerTempID = $this->GetIDForIdent("Boilertemperatur"); + if (IPS_VariableExists($boilerTempID)) { + $boilerTemp = $this->GetValue("Boilertemperatur"); + } else { + $boilerTemp = 0.0; // Standardwert + } + + // PT + $time_constant= $this->ReadPropertyInteger("ZeitKonstante"); + $delta_t = 30; // Zeitdifferenz zwischen den Messungen (30 Sekunden) $alpha = $delta_t / ($time_constant + $delta_t); - - $newBoilerTemp = $boilerTemp_test + $alpha * ($boilerPT1 - $boilerTemp_test); + $newBoilerTemp = $boilerTemp + $alpha * ($boilerPT1 - $boilerTemp); $this->SetValue("Boilertemperatur", $newBoilerTemp); } else { + // Wenn Glättung nicht aktiviert ist, setze die Boilertemperatur direkt auf den Wert des Boilerfühlers $boilerFuehlerPT1ID = $this->ReadPropertyInteger("Boilerfuehler_PT1"); - $boilerPT1 = IPS_VariableExists($boilerFuehlerPT1ID) ? GetValue($boilerFuehlerPT1ID) : 0.0; + if (IPS_VariableExists($boilerFuehlerPT1ID)) { + $boilerPT1 = GetValue($boilerFuehlerPT1ID); + } else { + $boilerPT1 = 0.0; // Standardwert + } + + // Setze Boilertemperatur direkt auf den Wert des Boilerfühlers $this->SetValue("Boilertemperatur", $boilerPT1); } + + - $boilerTemp = $this->GetValue("Boilertemperatur"); $minTemp = $this->GetValue("Mindesttemperatur"); $maxTemp = $this->GetValue("Maximaltemperatur"); $LegioTemp = $this->GetValue("Legionellentemperatur"); diff --git a/Ladestation_Universal/module.php b/Ladestation_Universal/module.php index 2f1edb3..8c07397 100644 --- a/Ladestation_Universal/module.php +++ b/Ladestation_Universal/module.php @@ -36,6 +36,8 @@ class Ladestation_Universal extends IPSModule $this->RegisterVariableInteger("Aktuelle_Leistung", "Aktuelle_Leistung", "", 0); $this->RegisterVariableFloat("Bezogene_Energie", "Bezogene_Energie", "", 0); $this->RegisterVariableString("PowerSteps", "PowerSteps"); + $this->RegisterVariableInteger("Power", "Power"); + $this->RegisterVariableBoolean("Is_Peak_Shaving", "Is_Peak_Shaving"); // Hilfsvariabeln für Idle zustand $this->RegisterPropertyInteger("IdleCounterMax", 2); @@ -44,6 +46,9 @@ class Ladestation_Universal extends IPSModule // Initialisiere Idle $this->SetValue("Idle", true); + + $this->RegisterTimer("Timer_Do_UserCalc",5000,"IPS_RequestAction(" .$this->InstanceID .', "Do_UserCalc", "");'); + } public function ApplyChanges() @@ -52,16 +57,24 @@ class Ladestation_Universal extends IPSModule // Zusätzliche Anpassungen nach Bedarf } - // Aktionen verarbeiten public function RequestAction($Ident, $Value) { switch ($Ident) { + case "SetAktuelle_Leistung": - $this->SetAktuelle_Leistung($Value); + SetValue("Power", $Value); break; + case "GetCurrentData": - $powerSteps = $this->GetCurrentData($Value); - return $powerSteps; + SetValue("Is_Peak_Shaving", $Value); + break; + + case "Do_UserCalc": + + $this->SetAktuelle_Leistung(GetValue("Power")); + $this->GetCurrentData(GetValue("Is_Peak_Shaving")); + break; + default: throw new Exception("Invalid Ident"); } diff --git a/Manager/module.php b/Manager/module.php index 053d582..451c4dd 100644 --- a/Manager/module.php +++ b/Manager/module.php @@ -64,13 +64,7 @@ class Manager extends IPSModule } // Frage alle Energieverbraucher ab, was sie für Leistungen benötigen könnten - foreach ($Verbraucher_Liste as $user) { - if (IPS_InstanceExists($user["Verbraucher"])) { - IPS_RequestAction($user["Verbraucher"],"GetCurrentData", $Is_Peak_Shaving); - IPS_LogMessage("Manager", "aufgerufen getcurrentdata"); - } - } $filteredVerbraucher = []; // Array das später mit allen Verbrauchsdaten der Energieverbraucher gefüllt wird $allIdle = true; // Variable zur Überprüfung, ob alle Benutzer Idle = true sind @@ -254,6 +248,18 @@ class Manager extends IPSModule } } } + + + // Frage alle Energieverbraucher ab, was sie für Leistungen benötigen könnten + foreach ($Verbraucher_Liste as $user) { + if (IPS_InstanceExists($user["Verbraucher"])) { + IPS_RequestAction($user["Verbraucher"],"GetCurrentData", $Is_Peak_Shaving); + IPS_LogMessage("Manager", "aufgerufen getcurrentdata"); + + } + } + + } } ?> diff --git a/Verbraucher_1_Stufig/module.php b/Verbraucher_1_Stufig/module.php index 586c6c8..3cf61ca 100644 --- a/Verbraucher_1_Stufig/module.php +++ b/Verbraucher_1_Stufig/module.php @@ -29,6 +29,8 @@ class Verbraucher_1_Stufig extends IPSModule $this->RegisterVariableInteger("Aktuelle_Leistung", "Aktuelle_Leistung", "", 0); $this->RegisterVariableFloat("Bezogene_Energie", "Bezogene_Energie", "", 0); $this->RegisterVariableString("PowerSteps", "PowerSteps"); + $this->RegisterVariableInteger("Power", "Power"); + $this->RegisterVariableBoolean("Is_Peak_Shaving", "Is_Peak_Shaving"); // Hilfsvariabeln für Idle zustand $this->RegisterPropertyInteger("IdleCounterMax", 2); @@ -37,6 +39,9 @@ class Verbraucher_1_Stufig extends IPSModule // Initialisiere Idle $this->SetValue("Idle", true); + + $this->RegisterTimer("Timer_Do_UserCalc",5000,"IPS_RequestAction(" .$this->InstanceID .', "Do_UserCalc", "");'); + } public function ApplyChanges() @@ -44,24 +49,34 @@ class Verbraucher_1_Stufig extends IPSModule parent::ApplyChanges(); } - // Aktionen verarbeiten public function RequestAction($Ident, $Value) { switch ($Ident) { + case "SetAktuelle_Leistung": - $this->SetAktuelle_Leistung($Value); + SetValue("Power", $Value); break; + case "GetCurrentData": - return $this->GetCurrentData($Value); + SetValue("Is_Peak_Shaving", $Value); break; + case "ResetPowerSteps": $this->ResetPowerSteps($Value); break; + + case "Do_UserCalc": + $this->SetAktuelle_Leistung(GetValue("Power")); + $this->GetCurrentData(GetValue("Is_Peak_Shaving")); + break; + default: throw new Exception("Invalid Ident"); } } + + // Methode zum Setzen der PowerSteps und Timer starten public function SetTimerOn() { diff --git a/WP_Steuerung/module.php b/WP_Steuerung/module.php index d69e53a..e92bb92 100644 --- a/WP_Steuerung/module.php +++ b/WP_Steuerung/module.php @@ -34,6 +34,8 @@ class WP_Steuerung extends IPSModule $this->RegisterVariableInteger("Aktuelle_Leistung", "Aktuelle_Leistung", "", 0); $this->RegisterVariableFloat("Bezogene_Energie", "Bezogene_Energie", "", 0); $this->RegisterVariableString("PowerSteps", "PowerSteps"); + $this->RegisterVariableInteger("Power", "Power"); + $this->RegisterVariableBoolean("Is_Peak_Shaving", "Is_Peak_Shaving"); // Hilfsvariabeln für Idle zustand $this->RegisterPropertyInteger("IdleCounterMax", 2); @@ -42,6 +44,9 @@ class WP_Steuerung extends IPSModule // Initialisiere Idle $this->SetValue("Idle", true); + + $this->RegisterTimer("Timer_Do_UserCalc",5000,"IPS_RequestAction(" .$this->InstanceID .', "Do_UserCalc", "");'); + } public function ApplyChanges() @@ -49,24 +54,34 @@ class WP_Steuerung extends IPSModule parent::ApplyChanges(); } - // Aktionen verarbeiten + public function RequestAction($Ident, $Value) { switch ($Ident) { + case "SetAktuelle_Leistung": - $this->SetAktuelle_Leistung($Value); + SetValue("Power", $Value); break; + case "GetCurrentData": - return $this->GetCurrentData($Value); + SetValue("Is_Peak_Shaving", $Value); break; + case "ResetPowerSteps": $this->ResetPowerSteps($Value); break; + + case "Do_UserCalc": + $this->SetAktuelle_Leistung(GetValue("Power")); + $this->GetCurrentData(GetValue("Is_Peak_Shaving")); + break; + default: throw new Exception("Invalid Ident"); } } + // Methode zum Setzen des aktuellen Stromverbrauchs public function SetAktuelle_Leistung(float $power) { diff --git a/library.json b/library.json index 106140d..90b2b38 100644 --- a/library.json +++ b/library.json @@ -6,7 +6,7 @@ "compatibility": { "version": "7.1" }, - "version": "0.282", + "version": "0.283", "build": 0, "date": 0