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

Elwa2.... #2843

Merged
merged 3 commits into from
Jun 24, 2024
Merged

Elwa2.... #2843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c0ce9c
Elwa2....
okaegi Jun 13, 2024
fa36df8
typeo...
okaegi Jun 13, 2024
a9822f9
typo
okaegi Jun 14, 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
19 changes: 14 additions & 5 deletions packages/modules/smarthome/acthor/watt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@
faktor = 9000/instpower
elif atype == "M3":
faktor = 6000/instpower
elif atype == "E2M1":
faktor = 3500/instpower
elif atype == "E2M3":
faktor = 6500/instpower
else:
faktor = 3000/instpower
pvmodus = 0
Expand Down Expand Up @@ -84,6 +88,8 @@
# Temp0 Warmwasser 1001
# Temp1 1030 <- Optional wenn 0, nicht angeschlossen dann ersetzt durch 300 (keine Anzeige)
# Temp2 1031 <- Optional wenn 0, nicht angeschlossen dann ersetzt durch 300 (keine Anzeige)
# elwa2 hat nur zwei temp Fuehler
# nicht drei
value1 = resp.registers[1]
all = format(value1, '04x')
temp0int = int(struct.unpack('>h', codecs.decode(all, 'hex'))[0])
Expand All @@ -94,10 +100,13 @@
temp1 = temp1int / 10
if temp1 == 0:
temp1 = 300
value1 = resp.registers[31]
all = format(value1, '04x')
temp2int = int(struct.unpack('>h', codecs.decode(all, 'hex'))[0])
temp2 = temp2int / 10
if (atype == "E2M3" or atype == "E2M1"):
temp2 = 300.0
else:
value1 = resp.registers[31]
all = format(value1, '04x')
temp2int = int(struct.unpack('>h', codecs.decode(all, 'hex'))[0])
temp2 = temp2int / 10
if temp2 == 0:
temp2 = 300
if count5 == 0:
Expand All @@ -120,7 +129,7 @@
cap = instpower
if neupowertarget > int(cap * faktor):
neupowertarget = int(cap * faktor)
# status nach handbuch Thor
# status nach handbuch Thor/elwa2
# 0.. Aus
# 1-8 Geraetestart
# 9 Betrieb
Expand Down
2 changes: 1 addition & 1 deletion runs/mqttsub.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ def map_run(message: str, device_number: int, option: str):
"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", "9s27", "9s45")),
"device_acthortype": create_topic_handler(equals_one_of_validator("M1", "M3", "9s", "9s18", "9s27", "9s45", "E2M1", "E2M3")),
"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, 50000)),
Expand Down
5 changes: 4 additions & 1 deletion web/settings/smarthomeconfig.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
<option value="none" data-option="none" selected="selected">Kein Gerät</option>
<option value="shelly" data-option="shelly">Shelly oder Shelly plus</option>
<option value="tasmota" data-option="tasmota">Tasmota</option>
<option value="acthor" data-option="acthor">Acthor</option>
<option value="acthor" data-option="acthor">Acthor oder Elwa2</option>
<option value="lambda" data-option="lambda">Lambda</option>
<option value="elwa" data-option="elwa">Elwa</option>
<option value="idm" data-option="idm">Idm</option>
Expand All @@ -107,6 +107,7 @@
Wenn die Ausschaltbedingung erreicht ist wird einmalig 0 als Überschuss übertragen.
Die Ausschaltschwelle/ Ausschaltverzögerung in OpenWB ist sinnvoll zu wählen (z.B. 500 / 3) um die Regelung von Acthor nicht zu stören.
Wenn Acthor als Gerät 1 oder 2 definiert ist, wird die Warmwassertemperatur als Temp1 angezeigt (Modbusadresse 1001). Ebenso wird Temp2 (Modbusadresse 1030) und Temp3 (Modbusadresse 1031) angezeigt (falls angeschlossen).
Elwa2 hat fast die gleich Schnittstelle wie Acthor.
</span>
<span class="form-text small device<?php echo $devicenum; ?>-option device<?php echo $devicenum; ?>-option-lambda hide">
Wp der Firma lambda<br>
Expand Down Expand Up @@ -407,6 +408,8 @@
<select class="form-control" name="device_acthortype" id="device_acthortypeDevices<?php echo $devicenum; ?>" data-default="" data-topicprefix="openWB/config/get/SmartHome/" data-topicsubgroup="Devices/<?php echo $devicenum; ?>/">
<option value="M1" data-option="M1">Acthor M1</option>
<option value="M3" data-option="M3">Acthor M3</option>
<option value="E2M1" data-option="E2M1">Elwa2 M1</option>
<option value="E2M3" data-option="E2M3">Elwa2 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>
Expand Down
Loading