From 155ce251b0da76401de33159424030da6d8042aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20H=C3=A4fliger?= Date: Thu, 19 Dec 2024 09:38:56 +0100 Subject: [PATCH] =?UTF-8?q?forms=20f=C3=BCr=20smart=20me=20auswahl=20angep?= =?UTF-8?q?asst?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Boiler_2_Stufig_Mit_Fueler/module.php | 19 ++----- Ladestation_Universal/form.json | 77 +++++++++++++++++++-------- library.json | 2 +- 3 files changed, 59 insertions(+), 39 deletions(-) diff --git a/Boiler_2_Stufig_Mit_Fueler/module.php b/Boiler_2_Stufig_Mit_Fueler/module.php index 742bbc8..cc8678b 100644 --- a/Boiler_2_Stufig_Mit_Fueler/module.php +++ b/Boiler_2_Stufig_Mit_Fueler/module.php @@ -124,10 +124,7 @@ class Boiler_2_Stufig_Mit_Fueler extends IPSModule if ($Peak) { if ($boilerTemp < $minTemp) { - $this->SetValue( - "PowerSteps", - json_encode([0, $teilLeistung, $vollLeistung]) - ); + $this->SetValue( "PowerSteps", json_encode([0, $teilLeistung, $vollLeistung]) ); } elseif ( $boilerTemp < $minTemp + 5 && ($AktuelleVollast || $AktuelleTeillast) @@ -148,18 +145,10 @@ class Boiler_2_Stufig_Mit_Fueler extends IPSModule ) { $this->SetValue("PowerSteps", json_encode([$vollLeistung])); } elseif ($boilerTemp < $maxTemp - 5) { - $this->SetValue( - "PowerSteps", - json_encode([0, $teilLeistung, $vollLeistung]) - ); - } elseif ( - $boilerTemp < $maxTemp && - ($AktuelleVollast || $AktuelleTeillast) + $this->SetValue("PowerSteps", json_encode([0, $teilLeistung, $vollLeistung])); + } elseif ( $boilerTemp < $maxTemp && ($AktuelleVollast || $AktuelleTeillast) ) { - $this->SetValue( - "PowerSteps", - json_encode([0, $teilLeistung, $vollLeistung]) - ); + $this->SetValue( "PowerSteps", json_encode([0, $teilLeistung, $vollLeistung])); } else { $this->SetValue("PowerSteps", json_encode([0])); } diff --git a/Ladestation_Universal/form.json b/Ladestation_Universal/form.json index 364d862..d1609a7 100644 --- a/Ladestation_Universal/form.json +++ b/Ladestation_Universal/form.json @@ -1,10 +1,24 @@ { "elements": [ { - "type": "ValidationTextBox", - "name": "IP_Adresse", - "caption": "IP-Adresse Ladestation", - "suffix": "" + "type": "Select", + "name": "Ladestation", + "caption": "Ladestation", + "value": 2, + "options": [ + { + "caption": "Go-E Wallbox (Alte Version)", + "value": 1 + }, + { + "caption": "Go-E Germini / Germini Flex", + "value": 2 + }, + { + "caption": "Smart-Me Pico", + "value": 3 + } + ] }, { "type": "NumberSpinner", @@ -14,7 +28,7 @@ { "type": "NumberSpinner", "name": "MaxLeistung", - "caption": "Maximlalleistung Ladestation" + "caption": "Maximalleistung Ladestation" }, { "type": "NumberSpinner", @@ -24,29 +38,46 @@ { "type": "NumberSpinner", "name": "MaxLeistung_1ph", - "caption": "Maximlalleistung Ladestation 1-Phasig" + "caption": "Maximalleistung Ladestation 1-Phasig" }, { "type": "NumberSpinner", "name": "IdleCounterMax", - "caption": "Zyklen zwischen zwei Leisutungsänderungen", + "caption": "Zyklen zwischen zwei Leistungsänderungen", "suffix": "" }, { - "type": "Select", - "name": "Ladestation", - "caption": "Ladestation", - "value": 2, - "options": [ - { - "caption": "Go-E Wallbox (Alte Version)", - "value": 1 - }, - { - "caption": "Go-E Germini / Germini Flex", - "value": 2 - } - ] - } + "type": "ValidationTextBox", + "name": "IP_Adresse", + "caption": "IP-Adresse Ladestation", + "suffix": "", + "visible": true, + "visibilityCondition": { + "field": "Ladestation", + "valueNot": 3 + } + }, + { + "type": "ValidationTextBox", + "name": "ID", + "caption": "ID", + "suffix": "", + "visible": false, + "visibilityCondition": { + "field": "Ladestation", + "value": 3 + } + }, + { + "type": "ValidationTextBox", + "name": "Seriennummer", + "caption": "Seriennummer", + "suffix": "", + "visible": false, + "visibilityCondition": { + "field": "Ladestation", + "value": 3 + } + } ] -} +} \ No newline at end of file diff --git a/library.json b/library.json index 8bda1ef..a453d4e 100644 --- a/library.json +++ b/library.json @@ -6,7 +6,7 @@ "compatibility": { "version": "7.1" }, - "version": "0.197", + "version": "0.198", "build": 0, "date": 0 } \ No newline at end of file