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

[ecotouch] Add water and heating power limit channels #16446

Merged
merged 15 commits into from
Mar 4, 2024
Merged

[ecotouch] Add water and heating power limit channels #16446

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
c741a56
limit power compressor flags for water and heating
Feb 22, 2024
00cf521
typo in description fixed
Feb 22, 2024
7a46db2
labels shortened
Feb 23, 2024
3df96b9
file generated by i18n
Feb 27, 2024
42b8100
revert translation change
Feb 27, 2024
1029d5d
channels added to geo and air
Feb 27, 2024
7a8d96a
update instructions added
Feb 27, 2024
3f886fa
Instructions added
Feb 27, 2024
bc1a152
line endings removed by spotless
Feb 27, 2024
753e583
Update bundles/org.openhab.binding.ecotouch/src/main/resources/OH-INF…
troem Mar 4, 2024
90ec642
Update bundles/org.openhab.binding.ecotouch/src/main/resources/OH-INF…
troem Mar 4, 2024
c32a34f
Update bundles/org.openhab.binding.ecotouch/src/main/resources/OH-INF…
troem Mar 4, 2024
cb9bd0b
Update bundles/org.openhab.binding.ecotouch/src/main/resources/OH-INF…
troem Mar 4, 2024
839a94b
i18n translation
Mar 4, 2024
cf01ee5
thingTypeVersion added
Mar 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions bundles/org.openhab.binding.ecotouch/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,10 @@ Advanced channels:
| temperature_storage | Number:Temperature | yes | Temperature Storage |
| temperature_suction | Number:Temperature | yes | Temperature Suction |
| temperature_water_set | Number:Temperature | yes | Temperature Water Setpoint |
| percent_water_limit_min | Number:Dimensionless | no | Percent Water Power limit Min |
| percent_water_limit_max | Number:Dimensionless | no | Percent Water Power limit Max |
| percent_heating_limit_min | Number:Dimensionless | no | Percent Heating Power limit Min |
| percent_heating_limit_max | Number:Dimensionless | no | Percent Heating Power limit Min |
| time_hour | Number:Dimensionless | yes | Hour |
| time_minute | Number:Dimensionless | yes | Minute |
| version_bios | Number:Dimensionless | yes | Version BIOS |
Expand Down
36 changes: 36 additions & 0 deletions ...ab.binding.ecotouch/src/main/java/org/openhab/binding/ecotouch/internal/EcoTouchTags.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1030,6 +1030,42 @@ public enum EcoTouchTags {
}
},

// German: % Leistungsbegrenzung Min Ausgang
TYPE_PRECENT_WATER_LIMIT_MIN {
{
command = "percent_water_limit_min";
unit = PERCENT;
tagName = "A172";
}
},

// German: % Leistungsbegrenzung Max Ausgang
TYPE_PRECENT_WATER_LIMIT_MAX {
{
command = "percent_water_limit_max";
unit = PERCENT;
tagName = "A171";
}
},

// German: % Heizung Leistungsbegrenzung Min Ausgang
TYPE_PRECENT_HEATING_LIMIT_MIN {
{
command = "percent_heating_limit_min";
unit = PERCENT;
tagName = "A505";
}
},

// German: % Heizung Leistungsbegrenzung Max Ausgang
TYPE_PRECENT_HEATING_LIMIT_MAX {
{
command = "percent_heating_limit_max";
unit = PERCENT;
tagName = "A504";
}
},

//
// The following tags are only available, if an Ecovent System is attached to the Ecotouch
//
Expand Down
11 changes: 11 additions & 0 deletions bundles/org.openhab.binding.ecotouch/src/main/resources/OH-INF/i18n/ecotouch.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,11 @@ channel-type.ecotouch.operating_hours_source_pump.description = Operating Hours
channel-type.ecotouch.percent_compressor.label = Percent Compressor
channel-type.ecotouch.percent_heat_circ_pump.label = Percent Circulation Pump
channel-type.ecotouch.percent_heat_circ_pump.description = Percent Heating Circulation Pump
channel-type.ecotouch.percent_heating_limit_max.label = Heating Powerlimit max
channel-type.ecotouch.percent_heating_limit_min.label = Heating Powerlimit min
channel-type.ecotouch.percent_source_pump.label = Percent Source Pump
channel-type.ecotouch.percent_water_limit_max.label = Water Powerlimit max
channel-type.ecotouch.percent_water_limit_min.label = Water Powerlimit min
channel-type.ecotouch.position_expansion_valve.label = Position Expansion Valve
channel-type.ecotouch.power_compressor.label = Power Compressor
channel-type.ecotouch.power_cooling.label = Power Cooling
Expand Down Expand Up @@ -186,3 +190,10 @@ channel-type.ecotouch.version_controller.label = Version Controller
channel-type.ecotouch.version_controller.description = Version Display Controller
channel-type.ecotouch.version_controller_build.label = Build Number Controller
channel-type.ecotouch.version_controller_build.description = Build Number Display Controller

# channel types

channel-type.ecotouch.percent_water_limit_min.description = Water limit power percentage min
channel-type.ecotouch.percent_water_limit_max.description = Water limit power percentage max
channel-type.ecotouch.percent_heating_limit_min.description = Heating limit power percentage min
channel-type.ecotouch.percent_heating_limit_max.description = Heating limit power percentage max
30 changes: 29 additions & 1 deletion bundles/org.openhab.binding.ecotouch/src/main/resources/OH-INF/thing/thing-types.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,10 @@
<channel id="manual_coolvalve" typeId="manual_coolvalve"/>
<channel id="manual_4wayvalve" typeId="manual_4wayvalve"/>
<channel id="manual_multiext" typeId="manual_multiext"/>
<channel id="percent_water_limit_min" typeId="percent_water_limit_min"/>
<channel id="percent_water_limit_max" typeId="percent_water_limit_max"/>
<channel id="percent_heating_limit_min" typeId="percent_heating_limit_min"/>
<channel id="percent_heating_limit_max" typeId="percent_heating_limit_max"/>

<channel id="ecovent_temp_exhaust_air" typeId="ecovent_temp_exhaust_air"/>
<channel id="ecovent_temp_exit_air" typeId="ecovent_temp_exit_air"/>
Expand Down Expand Up @@ -256,6 +260,11 @@
<channel id="temperature_suction_air" typeId="temperature_suction_air"/>
<channel id="temperature_sump" typeId="temperature_sump"/>

<channel id="percent_water_limit_min" typeId="percent_water_limit_min"/>
<channel id="percent_water_limit_max" typeId="percent_water_limit_max"/>
<channel id="percent_heating_limit_min" typeId="percent_heating_limit_min"/>
<channel id="percent_heating_limit_max" typeId="percent_heating_limit_max"/>

<channel id="ecovent_temp_exhaust_air" typeId="ecovent_temp_exhaust_air"/>
<channel id="ecovent_temp_exit_air" typeId="ecovent_temp_exit_air"/>
<channel id="ecovent_temp_outdoor_air" typeId="ecovent_temp_outdoor_air"/>
Expand Down Expand Up @@ -888,7 +897,26 @@
<category>Temperature</category>
<state readOnly="true" pattern="%.1f %unit%"/>
</channel-type>

<channel-type id="percent_water_limit_min" advanced="true">
<item-type>Number:Dimensionless</item-type>
<label>Water Powerlimit min</label>
troem marked this conversation as resolved.
Show resolved Hide resolved
<state readOnly="false" pattern="%.1f %unit%"/>
</channel-type>
<channel-type id="percent_water_limit_max" advanced="true">
<item-type>Number:Dimensionless</item-type>
<label>Water Powerlimit max</label>
troem marked this conversation as resolved.
Show resolved Hide resolved
<state readOnly="false" pattern="%.1f %unit%"/>
</channel-type>
<channel-type id="percent_heating_limit_min" advanced="true">
<item-type>Number:Dimensionless</item-type>
<label>Heating Powerlimit min</label>
troem marked this conversation as resolved.
Show resolved Hide resolved
<state readOnly="false" pattern="%.1f %unit%"/>
</channel-type>
<channel-type id="percent_heating_limit_max" advanced="true">
<item-type>Number:Dimensionless</item-type>
<label>Heating Powerlimit max</label>
troem marked this conversation as resolved.
Show resolved Hide resolved
<state readOnly="false" pattern="%.1f %unit%"/>
</channel-type>
<!-- The following tags are only available, if an Ecovent System is attached to the Ecotouch -->
<channel-type id="ecovent_temp_exhaust_air">
<item-type>Number:Temperature</item-type>
Expand Down
40 changes: 40 additions & 0 deletions bundles/org.openhab.binding.ecotouch/src/main/resources/OH-INF/update/instructions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<update:update-descriptions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:update="https://openhab.org/schemas/update-description/v1.0.0"
xsi:schemaLocation="https://openhab.org/schemas/update-description/v1.0.0 https://openhab.org/schemas/update-description-1.0.0.xsd">

<thing-type uid="ecotouch:geo">
<instruction-set targetVersion="1">
<add-channel id="percent_water_limit_min">
<type>Number:Dimensionless</type>
</add-channel>
<add-channel id="percent_water_limit_max">
<type>Number:Dimensionless</type>
</add-channel>
<add-channel id="percent_heating_limit_min">
<type>Number:Dimensionless</type>
</add-channel>
<add-channel id="percent_heating_limit_max">
<type>Number:Dimensionless</type>
</add-channel>
</instruction-set>
</thing-type>

<thing-type uid="ecotouch:air">
<instruction-set targetVersion="1">
<add-channel id="percent_water_limit_min">
<type>Number:Dimensionless</type>
</add-channel>
<add-channel id="percent_water_limit_max">
<type>Number:Dimensionless</type>
</add-channel>
<add-channel id="percent_heating_limit_min">
<type>Number:Dimensionless</type>
</add-channel>
<add-channel id="percent_heating_limit_max">
<type>Number:Dimensionless</type>
</add-channel>
</instruction-set>
</thing-type>

</update:update-descriptions>