diff --git a/Boiler_2_Stufig_Mit_Fueler/module.php b/Boiler_2_Stufig_Mit_Fueler/module.php index 8e6f7f0..b55b17e 100644 --- a/Boiler_2_Stufig_Mit_Fueler/module.php +++ b/Boiler_2_Stufig_Mit_Fueler/module.php @@ -113,39 +113,24 @@ class Boiler_2_Stufig_Mit_Fueler extends IPSModule if ($boilertemperatur_glätten) { $boilerFuehlerPT1ID = $this->ReadPropertyInteger("Boilerfuehler_PT1"); - if (IPS_VariableExists($boilerFuehlerPT1ID)) { - $boilerPT1 = GetValue($boilerFuehlerPT1ID); - } else { - $boilerPT1 = 0.0; - } - $boilerTemp_test = $this->GetIDForIdent("Boilertemperatur"); - if (IPS_VariableExists($boilerTemp_test)) { - $boilerTemp_test = $this->GetValue("Boilertemperatur"); - } else { - $boilerTemp_test = 0.0; - } - $boilerPT1 = GetValue($boilerFuehlerPT1ID); + $boilerPT1 = IPS_VariableExists($boilerFuehlerPT1ID) ? GetValue($boilerFuehlerPT1ID) : 0.0; + $boilerTemp_test = $this->GetValue("Boilertemperatur"); - $time_constant= $this->ReadPropertyInteger("ZeitKonstante"); - $delta_t = 30; + + $time_constant = $this->ReadPropertyInteger("ZeitKonstante"); + $delta_t = 30; $alpha = $delta_t / ($time_constant + $delta_t); + $newBoilerTemp = $boilerTemp_test + $alpha * ($boilerPT1 - $boilerTemp_test); $this->SetValue("Boilertemperatur", $newBoilerTemp); - } else { - $boilerFuehlerPT1ID = $this->ReadPropertyInteger("Boilerfuehler_PT1"); - if (IPS_VariableExists($boilerFuehlerPT1ID)) { - $boilerPT1 = GetValue($boilerFuehlerPT1ID); - } else { - $boilerPT1 = 0.0; - } - $boilerPT1 = GetValue($boilerFuehlerPT1ID); + $boilerPT1 = IPS_VariableExists($boilerFuehlerPT1ID) ? GetValue($boilerFuehlerPT1ID) : 0.0; + $this->SetValue("Boilertemperatur", $boilerPT1); } - $boilerTemp = $this->GetValue("Boilertemperatur"); $minTemp = $this->GetValue("Mindesttemperatur"); diff --git a/library.json b/library.json index 8ba6e6c..106140d 100644 --- a/library.json +++ b/library.json @@ -6,7 +6,7 @@ "compatibility": { "version": "7.1" }, - "version": "0.281", + "version": "0.282", "build": 0, "date": 0