Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

acthor 27k #2824

Merged
merged 2 commits into from
Mar 11, 2024
Merged

acthor 27k #2824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7068d64
acthor 27k
okaegi Mar 2, 2024
859e819
acthor 45K
okaegi Mar 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion packages/modules/smarthome/acthor/watt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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":
Expand Down
10 changes: 5 additions & 5 deletions runs/mqttsub.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)),
Expand Down Expand Up @@ -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$")),
Expand Down
4 changes: 3 additions & 1 deletion web/settings/smarthomeconfig.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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>
Expand Down
Loading