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] Remove deprecated channel 'manual_fan_speed' #14030

Merged
merged 1 commit into from
Dec 28, 2022
Merged

[danfossairunit] Remove deprecated channel 'manual_fan_speed' #14030

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
3 changes: 0 additions & 3 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,9 +28,6 @@ public enum Channel {

CHANNEL_CURRENT_TIME("current_time", ChannelGroup.MAIN, DanfossAirUnit::getCurrentTime),
CHANNEL_MODE("mode", ChannelGroup.MAIN, DanfossAirUnit::getMode, DanfossAirUnit::setMode),
// 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),
Expand Down
18 changes: 0 additions & 18 deletions .../main/java/org/openhab/binding/danfossairunit/internal/handler/DanfossAirUnitHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,12 @@
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
import org.openhab.binding.danfossairunit.internal.Channel;
import org.openhab.binding.danfossairunit.internal.ChannelGroup;
import org.openhab.binding.danfossairunit.internal.DanfossAirUnit;
import org.openhab.binding.danfossairunit.internal.DanfossAirUnitCommunicationController;
import org.openhab.binding.danfossairunit.internal.DanfossAirUnitConfiguration;
import org.openhab.binding.danfossairunit.internal.DanfossAirUnitWriteAccessor;
import org.openhab.binding.danfossairunit.internal.UnexpectedResponseValueException;
import org.openhab.binding.danfossairunit.internal.ValueCache;
import org.openhab.core.thing.ChannelGroupUID;
import org.openhab.core.thing.ChannelUID;
import org.openhab.core.thing.Thing;
import org.openhab.core.thing.ThingStatus;
Expand Down Expand Up @@ -99,7 +97,6 @@ public void initialize() {
updateStatus(ThingStatus.UNKNOWN);
config = getConfigAs(DanfossAirUnitConfiguration.class);
valueCache = new ValueCache(config.updateUnchangedValuesEveryMillis);
removeDeprecatedChannels();
try {
var localCommunicationController = new DanfossAirUnitCommunicationController(
InetAddress.getByName(config.host), TCP_PORT);
Expand All @@ -113,21 +110,6 @@ public void initialize() {
}
}

private void removeDeprecatedChannels() {
ChannelGroupUID mainChannelGroupUid = new ChannelGroupUID(thing.getUID(), ChannelGroup.MAIN.getGroupName());
ChannelUID manualFanSpeedChannelUid = new ChannelUID(mainChannelGroupUid,
Channel.CHANNEL_MANUAL_FAN_SPEED.getChannelName());
if (this.isLinked(manualFanSpeedChannelUid)) {
ChannelUID manualFanStepChannelUid = new ChannelUID(mainChannelGroupUid,
Channel.CHANNEL_MANUAL_FAN_STEP.getChannelName());
logger.warn("Channel '{}' is deprecated, please use '{}' instead.", manualFanSpeedChannelUid,
manualFanStepChannelUid);
} else {
logger.debug("Removing deprecated unlinked channel '{}'.", manualFanSpeedChannelUid);
updateThing(editThing().withoutChannel(manualFanSpeedChannelUid).build());
}
}

private void updateAllChannels() {
if (!initializeProperties()) {
return;
Expand Down
2 changes: 0 additions & 2 deletions ...g.openhab.binding.danfossairunit/src/main/resources/OH-INF/i18n/danfossairunit.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ channel-group-type.danfossairunit.humidity.channel.humidity.description = Curren
channel-group-type.danfossairunit.main.label = Mode and Fan Speeds
channel-group-type.danfossairunit.main.channel.boost.label = Boost
channel-group-type.danfossairunit.main.channel.boost.description = Enables fan boost
channel-group-type.danfossairunit.main.channel.manual_fan_speed.label = Manual Fan Speed
channel-group-type.danfossairunit.main.channel.manual_fan_speed.description = Deprecated, please use Manual Fan Step instead. This channel will be removed in a later version.
channel-group-type.danfossairunit.main.channel.night_cooling.label = Night Cooling
channel-group-type.danfossairunit.main.channel.night_cooling.description = Enables night cooling
channel-group-type.danfossairunit.recuperator.label = Recuperator
Expand Down
4 changes: 0 additions & 4 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 @@ -50,10 +50,6 @@
<channel id="current_time" typeId="currentTime"/>
<channel id="mode" typeId="mode"/>
<channel id="manual_fan_step" typeId="manualFanStep"/>
<channel id="manual_fan_speed" typeId="manualFanStep">
<label>Manual Fan Speed</label>
<description>Deprecated, please use Manual Fan Step instead. This channel will be removed in a later version.</description>
</channel>
<channel id="supply_fan_speed" typeId="supplyFanSpeed"/>
<channel id="extract_fan_speed" typeId="extractFanSpeed"/>
<channel id="supply_fan_step" typeId="supplyFanStep"/>
Expand Down