From 7068d64f9979e85baeffd1ff83eb8d459db9c07e Mon Sep 17 00:00:00 2001
From: okaegi <okaegi@pinball4you.ch>
Date: Sat, 2 Mar 2024 14:06:41 +0100
Subject: [PATCH] acthor 27k
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Unterstützung zwei verbundene Acthors (9000 Watt + 18000 Watt), Gesamthaft 27k Watt. Kann für 1.9 und 2.0 übernommen werden.
Der Acthor wird als ein Gerät angesteuert und macht Verteilung selber.
Kann für 1.9 und 2.0 übernommen werden, Gui für 2.0 kommt separat.
---
 packages/modules/smarthome/acthor/watt.py |  5 ++++-
 runs/mqttsub.py                           | 10 +++++-----
 web/settings/smarthomeconfig.php          |  3 ++-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/packages/modules/smarthome/acthor/watt.py b/packages/modules/smarthome/acthor/watt.py
index 53930fc15..00d6f736e 100644
--- a/packages/modules/smarthome/acthor/watt.py
+++ b/packages/modules/smarthome/acthor/watt.py
@@ -42,7 +42,10 @@
 if instpower == 0:
     instpower = 1000
 cap = 9000
-if atype == "9s18":
+if atype == "9s27":
+    faktor = 27000/instpower
+    cap = 27000
+elif atype == "9s18":
     faktor = 18000/instpower
     cap = 18000
 elif atype == "9s":
diff --git a/runs/mqttsub.py b/runs/mqttsub.py
index 26a7e9a7e..8c3cfd542 100755
--- a/runs/mqttsub.py
+++ b/runs/mqttsub.py
@@ -156,7 +156,7 @@ def map_run(message: str, device_number: int, option: str):
                                     "stiebel", "http", "avm", "mystrom", "viessmann", "mqtt", "NXDACXX", "ratiotherm"
                                     )),
         "device_measureType": create_topic_handler(
-            equals_one_of_validator("shelly", "tasmota", "http", "mystrom", "sdm630", "lovato", "we514", "fronius", "b23", 
+            equals_one_of_validator("shelly", "tasmota", "http", "mystrom", "sdm630", "lovato", "we514", "fronius", "b23",
                                     "json", "avm", "mqtt", "sdm120", "smaem")),
         "device_temperatur_configured": create_topic_handler(int_range_validator(0, 3)),
         "device_einschaltschwelle": create_topic_handler(int_range_validator(-100000, 100000)),
@@ -190,17 +190,17 @@ def map_run(message: str, device_number: int, option: str):
         "device_shusername": create_topic_handler(),
         "device_shpassword": create_topic_handler(),
         "device_manwatt": create_topic_handler(int_range_validator(0, 30000)),
-        "device_maxueb": create_topic_handler(int_range_validator(0, 30000)),        
+        "device_maxueb": create_topic_handler(int_range_validator(0, 30000)),
         "device_measureshusername": create_topic_handler(),
         "device_measureshpassword": create_topic_handler(),
         "device_actor": create_topic_handler(),
         "device_measureavmusername": create_topic_handler(),
         "device_measureavmpassword": create_topic_handler(),
         "device_measureavmactor": create_topic_handler(),
-        "device_acthortype": create_topic_handler(equals_one_of_validator("M1", "M3", "9s", "9s18")),
+        "device_acthortype": create_topic_handler(equals_one_of_validator("M1", "M3", "9s", "9s18", "9s27")),
         "device_lambdaueb": create_topic_handler(equals_one_of_validator("UP", "UN", "UZ")),
-        "device_idmueb": create_topic_handler(equals_one_of_validator("UP", "UZ")),        
-        "device_acthorpower": create_topic_handler(int_range_validator(0, 18000)),
+        "device_idmueb": create_topic_handler(equals_one_of_validator("UP", "UZ")),
+        "device_acthorpower": create_topic_handler(int_range_validator(0, 50000)),
         "device_finishTime": create_topic_handler(regex_match_validator(r"^([01]{0,1}\d|2[0-3]):[0-5]\d$")),
         "device_onTime": create_topic_handler(regex_match_validator(r"^([01]{0,1}\d|2[0-3]):[0-5]\d$")),
         "device_offTime": create_topic_handler(regex_match_validator(r"^([01]{0,1}\d|2[0-3]):[0-5]\d$")),
diff --git a/web/settings/smarthomeconfig.php b/web/settings/smarthomeconfig.php
index 421397a7c..09fba0b03 100644
--- a/web/settings/smarthomeconfig.php
+++ b/web/settings/smarthomeconfig.php
@@ -409,6 +409,7 @@
 												<option value="M3" data-option="M3">Acthor M3</option>
 												<option value="9s" data-option="9s">Acthor 9s</option>
 												<option value="9s18" data-option="9s18">Acthor 9s Dual 18k</option>
+												<option value="9s27" data-option="9s27">Acthor 9s Trippel 27k</option>
 											</select>
 											<span class="form-text small">
 												Hier ist das installierte Modell auszuwählen.
@@ -418,7 +419,7 @@
 									<div class="form-row mb-1">
 										<label for="device_acthorpowerDevices<?php echo $devicenum; ?>" class="col-md-4 col-form-label">Installierte Leistung</label>
 										<div class="col">
-											<input id="device_acthorpowerDevices<?php echo $devicenum; ?>" name="device_acthorpower" class="form-control" type="number" min="0" max="18000" step="100" required="required" data-default="0" value="0" data-topicprefix="openWB/config/get/SmartHome/" data-topicsubgroup="Devices/<?php echo $devicenum; ?>/">
+											<input id="device_acthorpowerDevices<?php echo $devicenum; ?>" name="device_acthorpower" class="form-control" type="number" min="0" max="50000" step="100" required="required" data-default="0" value="0" data-topicprefix="openWB/config/get/SmartHome/" data-topicsubgroup="Devices/<?php echo $devicenum; ?>/">
 											<span class="form-text small">
 												Hier bitte die an den Acthor angeschlossene Leistung in Watt angeben.
 											</span>