From e0632b75e6da8c7d0aa54df9c393629e7a37224a Mon Sep 17 00:00:00 2001 From: "belevo\\mh" Date: Mon, 23 Dec 2024 09:29:57 +0100 Subject: [PATCH] Div --- Batterie/module.php | 2 ++ Boiler_2_Stufig_Mit_Fueler/form.json | 6 ++++++ Boiler_2_Stufig_Mit_Fueler/module.php | 2 ++ library.json | 4 ++++ 4 files changed, 14 insertions(+) diff --git a/Batterie/module.php b/Batterie/module.php index fc069e2..acdb867 100644 --- a/Batterie/module.php +++ b/Batterie/module.php @@ -19,6 +19,8 @@ class Batterie extends IPSModule $this->RegisterVariableInteger("Aktuelle_Leistung", "Aktuelle_Leistung", "", 0); $this->RegisterVariableString("PowerSteps", "PowerSteps"); $this->RegisterVariableBoolean("Idle", "Idle", "", 0); + $this->RegisterVariableInteger("Sperre_Prio", "Sperre_Prio"); + $this->RegisterVariableInteger("PV_Prio", "PV_Prio"); // Hilfsvariabeln für Idle zustand $this->RegisterPropertyInteger("IdleCounterMax", 2); diff --git a/Boiler_2_Stufig_Mit_Fueler/form.json b/Boiler_2_Stufig_Mit_Fueler/form.json index d9d8436..f3fc90c 100644 --- a/Boiler_2_Stufig_Mit_Fueler/form.json +++ b/Boiler_2_Stufig_Mit_Fueler/form.json @@ -28,6 +28,12 @@ "caption": "Variable für Boilertemperatur", "test": true }, + { + "type": "SelectVariable", + "name": "Boilerfuehler_PT1", + "caption": "Variable für Boilerfühler PT1", + "test": true + }, { "type": "SelectVariable", "name": "Kontakt_Teillast", diff --git a/Boiler_2_Stufig_Mit_Fueler/module.php b/Boiler_2_Stufig_Mit_Fueler/module.php index cc8678b..7760b86 100644 --- a/Boiler_2_Stufig_Mit_Fueler/module.php +++ b/Boiler_2_Stufig_Mit_Fueler/module.php @@ -10,8 +10,10 @@ class Boiler_2_Stufig_Mit_Fueler extends IPSModule $this->RegisterPropertyInteger("BoilerLeistungTeillast", 3000); $this->RegisterPropertyInteger("BoilerLeistungVolllast", 6000); $this->RegisterPropertyInteger("Boilertemperatur", 0); + $this->RegisterPropertyInteger("Boilerfuehler_PT1", 0); $this->RegisterPropertyInteger("Kontakt_Teillast", 0); $this->RegisterPropertyInteger("Kontakt_Volllast", 0); + // Boiler spezifische Variablen $this->RegisterVariableInteger("Mindesttemperatur","Mindesttemperatur","",45); diff --git a/library.json b/library.json index aa46d87..b885d55 100644 --- a/library.json +++ b/library.json @@ -6,7 +6,11 @@ "compatibility": { "version": "7.1" }, +<<<<<<< HEAD "version": "0.215", +======= + "version": "0.190", +>>>>>>> 556e748 (div) "build": 0, "date": 0 } \ No newline at end of file