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

Kwithus patch 1 #29

Merged
merged 8 commits into from
Oct 7, 2024
Merged

Kwithus patch 1 #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
92a90c8
Add files via upload
kwithus Oct 7, 2024
0d8eab5
Delete custom_components/solvis_control/solvis_control directory
kwithus Oct 7, 2024
c51fa64
Add files via upload
kwithus Oct 7, 2024
91c3c89
Add files via upload
kwithus Oct 7, 2024
e87ae45
Merge branch 'main' into kwithus-patch-1
LarsK1 Oct 7, 2024
9bfe301
Fixes for black
LarsK1 Oct 7, 2024
d16a680
Remove duplicated attributes
LarsK1 Oct 7, 2024
0f590df
Remove duplicated attributes
LarsK1 Oct 7, 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
99 changes: 86 additions & 13 deletions custom_components/solvis_control/const.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,27 +184,40 @@ class ModbusFieldConfig:
unit="%",
device_class="power_factor",
state_class="measurement",
multiplier=0.01,
),
ModbusFieldConfig( # A02.Pumpe Warmwasser
name="a02_pumpe_warmwasser",
address=33281,
unit="%",
device_class="power_factor",
state_class="measurement",
multiplier=0.01,
),
ModbusFieldConfig( # A03.Pumpe HK1
name="a03_pumpe_hk1",
ModbusFieldConfig( # A03.Pumpe HKR 1
name="a03_pumpe_hkr_1",
address=33282,
unit="%",
device_class="power_factor",
state_class="measurement",
multiplier=0.01,

),
ModbusFieldConfig( # A05.Pumpe Zirkulation
name="a05_pumpe_zirkulation",
ModbusFieldConfig( # A04.Pumpe HKR 2
name="a04_pumpe_hkr_2",
address=33283,
unit="V",
device_class="voltage",
state_class="measurement",
multiplier=0.01,
),
ModbusFieldConfig( # A05.Pumpe HKR 3
name="a05_pumpe_hkr_3",
address=33284,
unit="%",
device_class="power_factor",
state_class="measurement",
multiplier=0.01,
),
ModbusFieldConfig( # A12.Brennerstatus
name="a12_brennerstatus",
Expand Down Expand Up @@ -259,8 +272,30 @@ class ModbusFieldConfig:
input_type=2,
range_data=(5, 75),
),
ModbusFieldConfig( # HKR1 Absenktemperatur Nacht
name="hkr1_absenktemperatur_nacht",

ModbusFieldConfig( # HKR1 Vorlaufart
name="hkr1_vorlaufart",
address=2819,
unit="",
device_class=None,
state_class=None,
register=2,
multiplier=1,
data=("0", "1"),
),
ModbusFieldConfig( # HKR1 Fix Vorlauf Tag
name="hkr1_fix_vorlauf_tag",
address=2820,
unit="°C",
device_class="temperature",
state_class="measurement",
register=2,
multiplier=1,
edit=True,
data=(5, 75),
),
ModbusFieldConfig( # HKR1 Fix Vorlauf Nacht
name="hkr1_fix_vorlauf_nacht",
address=2821,
unit="°C",
device_class="temperature",
Expand All @@ -271,8 +306,8 @@ class ModbusFieldConfig:
input_type=2,
range_data=(5, 75),
),
ModbusFieldConfig( # HKR1 Heizkurve Tag Temp. 1
name="hkr1_heizkurve_temp_tag_1",
ModbusFieldConfig( # HKR1 Kurve Solltemperatur Tag1
name="hkr1_kurve_solltemperatur_tag1",
address=2822,
unit="°C",
device_class="temperature",
Expand Down Expand Up @@ -367,6 +402,17 @@ class ModbusFieldConfig:
range_data=(5, 75),
conf_option=1,
),
ModbusFieldConfig( # HKR2 Vorlaufart
name="hkr2_vorlaufart",
address=3075,
unit="",
device_class=None,
state_class=None,
register=2,
multiplier=1,
data=("0", "1"),
),

ModbusFieldConfig( # HKR2 Absenktemperatur Nacht
name="hkr2_absenktemperatur_nacht",
address=3077,
Expand Down Expand Up @@ -457,6 +503,7 @@ class ModbusFieldConfig:
range_data=(0, 40),
conf_option=1,
),

ModbusFieldConfig( # HKR3 Betriebsart
name="hkr3_betriebsart",
address=3330,
Expand All @@ -482,8 +529,33 @@ class ModbusFieldConfig:
range_data=(5, 75),
conf_option=2,
),
ModbusFieldConfig( # HKR3 Absenktemperatur Nacht
name="hkr3_absenktemperatur_nacht",

ModbusFieldConfig( # HKR3 Vorlaufart
name="hkr3_vorlaufart",
address=3331,
unit="",
device_class=None,
state_class=None,
register=2,
multiplier=1,
data=("0", "1"),
),


ModbusFieldConfig( # HKR3 Fix Vorlauf Tag
name="hkr3_fix_vorlauf_tag",
address=3332,
unit="°C",
device_class="temperature",
state_class="measurement",
register=2,
multiplier=1,
edit=True,
data=(5, 75),
),

ModbusFieldConfig( # HKR3 Fix Vorlauf Nacht
name="hkr3_fix_vorlauf_nacht",
address=3333,
unit="°C",
device_class="temperature",
Expand Down Expand Up @@ -572,6 +644,7 @@ class ModbusFieldConfig:
range_data=(0, 40),
conf_option=2,
),

ModbusFieldConfig( # DigIn Stoerungen
name="digin_stoerungen",
address=33045,
Expand Down Expand Up @@ -632,9 +705,9 @@ class ModbusFieldConfig:
ModbusFieldConfig( # elektrische Wärmepumenleistung
name="elek_waermepumpe_leistung",
address=33545,
unit="kW",
device_class="power",
state_class="measurement",
unit="kWh",
device_class="energy",
state_class="total",
register=2,
edit=False,
conf_option=4,
Expand Down
2 changes: 1 addition & 1 deletion custom_components/solvis_control/strings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,4 +268,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion custom_components/solvis_control/translations/de.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,4 +268,4 @@
}
}
}
}
}
Loading