acthor 27k (#2824)

* acthor 27k 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. * acthor 45K Neuer acthor type zugelassen 45000 Watt
snaptec · Mar 11, 2024 · 5a6a1a6 · 5a6a1a6
1 parent 33b0540
commit 5a6a1a6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/packages/modules/smarthome/acthor/watt.py b/packages/modules/smarthome/acthor/watt.py
@@ -42,7 +42,13 @@
 if instpower == 0:
     instpower = 1000
 cap = 9000
-if atype == "9s18":
+if atype == "9s45":
+    faktor = 45000/instpower
+    cap = 45000
+elif 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
@@ -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", "9s45")),
         "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
@@ -409,6 +409,8 @@
 												<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 boost 27k</option>
+												<option value="9s45" data-option="9s45">Acthor 9s boost 45k</option>
 											</select>
 											<span class="form-text small">
 												Hier ist das installierte Modell auszuwählen.
@@ -418,7 +420,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>