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

[danfossairunit] Rename channel manual_fan_speed to manual_fan_step for consistency #11147

Merged
merged 1 commit into from
Aug 24, 2021
Merged

[danfossairunit] Rename channel manual_fan_speed to manual_fan_step for consistency #11147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions bundles/org.openhab.binding.danfossairunit/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ These are the available configuration parameters:
|---|---|---|---|---|
| current_time | main | DateTime | RO | Current time reported by the air unit. |
| mode | main | String | RW | Value to control the operation mode of the air unit. One of DEMAND, PROGRAM, MANUAL and OFF |
| manual_fan_speed | main | Dimmer | RW | Value to control the fan speed when in MANUAL mode (10 steps) |
| manual_fan_step | main | Dimmer | RW | Value to control the fan step when in MANUAL mode (10 steps) |
| supply_fan_speed | main | Number | RO | Current rotation of the fan supplying air to the rooms (in rpm) |
| extract_fan_speed | main | Number | RO | Current rotation of the fan extracting air from the rooms (in rpm) |
| supply_fan_step | main | Dimmer | RO | Current step setting of the fan supplying air to the rooms |
Expand All @@ -34,7 +34,7 @@ These are the available configuration parameters:
| room_temp | temps | Number:Temperature | RO | Temperature of the air in the room of the Air Dial |
| room_temp_calculated | temps | Number:Temperature | RO | Calculated Room Temperature |
| outdoor_temp | temps | Number:Temperature | RO | Temperature of the air outside |
| humidity | humidity | Number:Dimensionless | RO | Current relative humidity measured by the unit |
| humidity | humidity | Number:Dimensionless | RO | Current relative humidity measured by the air unit |
| bypass | recuperator | Switch | RW | Disables the heat exchange. Useful in summer when room temperature is above target and outside temperature is below target. |
| supply_temp | recuperator | Number | RO | Temperature of air which is passed to the rooms |
| extract_temp | recuperator | Number | RO | Temperature of the air as extracted from the rooms |
Expand Down
7 changes: 5 additions & 2 deletions ...ing.danfossairunit/src/main/java/org/openhab/binding/danfossairunit/internal/Channel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,11 @@ public enum Channel {

CHANNEL_CURRENT_TIME("current_time", ChannelGroup.MAIN, DanfossAirUnit::getCurrentTime),
CHANNEL_MODE("mode", ChannelGroup.MAIN, DanfossAirUnit::getMode, DanfossAirUnit::setMode),
CHANNEL_MANUAL_FAN_SPEED("manual_fan_speed", ChannelGroup.MAIN, DanfossAirUnit::getManualFanSpeed,
DanfossAirUnit::setManualFanSpeed),
// Backwards compatibility as channel was renamed from manual_fan_speed to manual_fan_step.
CHANNEL_MANUAL_FAN_SPEED("manual_fan_speed", ChannelGroup.MAIN, DanfossAirUnit::getManualFanStep,
DanfossAirUnit::setManualFanStep),
CHANNEL_MANUAL_FAN_STEP("manual_fan_step", ChannelGroup.MAIN, DanfossAirUnit::getManualFanStep,
DanfossAirUnit::setManualFanStep),
CHANNEL_EXTRACT_FAN_SPEED("extract_fan_speed", ChannelGroup.MAIN, DanfossAirUnit::getExtractFanSpeed),
CHANNEL_SUPPLY_FAN_SPEED("supply_fan_speed", ChannelGroup.MAIN, DanfossAirUnit::getSupplyFanSpeed),
CHANNEL_EXTRACT_FAN_STEP("extract_fan_step", ChannelGroup.MAIN, DanfossAirUnit::getExtractFanStep),
Expand Down
4 changes: 2 additions & 2 deletions ...fossairunit/src/main/java/org/openhab/binding/danfossairunit/internal/DanfossAirUnit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ public StringType getMode() throws IOException {
return new StringType(Mode.values()[getByte(REGISTER_1_READ, MODE)].name());
}

public PercentType getManualFanSpeed() throws IOException {
public PercentType getManualFanStep() throws IOException {
return new PercentType(BigDecimal.valueOf(getByte(REGISTER_1_READ, MANUAL_FAN_SPEED_STEP) * 10));
}

Expand Down Expand Up @@ -242,7 +242,7 @@ public DateTimeType getCurrentTime() throws IOException, UnexpectedResponseValue
return new DateTimeType(timestamp);
}

public PercentType setManualFanSpeed(Command cmd) throws IOException {
public PercentType setManualFanStep(Command cmd) throws IOException {
return setPercentTypeRegister(cmd, MANUAL_FAN_SPEED_STEP);
}

Expand Down
14 changes: 11 additions & 3 deletions bundles/org.openhab.binding.danfossairunit/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 @@ -48,6 +48,7 @@
<channels>
<channel id="current_time" typeId="currentTime"/>
<channel id="mode" typeId="mode"/>
<channel id="manual_fan_step" typeId="manualFanStep"/>
<channel id="manual_fan_speed" typeId="manualFanSpeed"/>
<channel id="supply_fan_speed" typeId="supplyFanSpeed"/>
<channel id="extract_fan_speed" typeId="extractFanSpeed"/>
Expand Down Expand Up @@ -85,7 +86,7 @@
<label>Humidity</label>
<channels>
<channel id="humidity" typeId="humidity">
<description>Current relative humidity measured by the unit</description>
<description>Current relative humidity measured by the air unit</description>
</channel>
</channels>
</channel-group-type>
Expand Down Expand Up @@ -147,13 +148,20 @@
</options>
</state>
</channel-type>
<channel-type id="manualFanSpeed">
<channel-type id="manualFanStep">
<item-type>Dimmer</item-type>
<label>Manual Fan Speed</label>
<label>Manual Fan Step</label>
<description>Controls 10-step setting of the fan when operation mode is manual</description>
<category>Fan</category>
<state step="10" min="0" max="100"/>
</channel-type>
<channel-type id="manualFanSpeed" advanced="true">
<item-type>Dimmer</item-type>
<label>Manual Fan Speed</label>
<description>Deprecated, please use Manual Fan Step instead. This channel will be removed in a later version.</description>
<category>Fan</category>
<state step="10" min="0" max="100"/>
</channel-type>
<channel-type id="supplyFanSpeed">
<item-type>Number</item-type>
<label>Supply Fan Speed</label>
Expand Down