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

[miio] channels removal #9237

Merged
merged 1 commit into from
Dec 7, 2020
Merged

[miio] channels removal #9237

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: 4 additions & 0 deletions ...ab.binding.miio/src/main/java/org/openhab/binding/miio/internal/MiIoBindingConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,10 @@ public final class MiIoBindingConstants {
public static final String PROPERTY_TIMEOUT = "timeout";
public static final String PROPERTY_CLOUDSERVER = "cloudServer";

public static final Set<String> PERSISTENT_CHANNELS = Collections.unmodifiableSet(
Stream.of(CHANNEL_COMMAND, CHANNEL_RPC, CHANNEL_SSID, CHANNEL_BSSID, CHANNEL_RSSI, CHANNEL_LIFE)
.collect(Collectors.toSet()));

public static final byte[] DISCOVER_STRING = org.openhab.binding.miio.internal.Utils
.hexStringToByteArray("21310020ffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
public static final int PORT = 54321;
Expand Down
14 changes: 7 additions & 7 deletions ...inding.miio/src/main/java/org/openhab/binding/miio/internal/handler/MiIoBasicHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,13 @@ private boolean buildChannelStructure(String deviceName) {
actions = new HashMap<>();
final MiIoBasicDevice device = this.miioDevice;
if (device != null) {
for (Channel cn : getThing().getChannels()) {
logger.trace("Channel '{}' for thing {} already exist... removing", cn.getUID(),
getThing().getUID());
if (!PERSISTENT_CHANNELS.contains(cn.getUID().getId().toString())) {
thingBuilder.withoutChannels(cn);
}
}
for (MiIoBasicChannel miChannel : device.getDevice().getChannels()) {
logger.debug("properties {}", miChannel);
if (!miChannel.getType().isEmpty()) {
Expand Down Expand Up @@ -454,13 +461,6 @@ private boolean buildChannelStructure(String deviceName) {
return null;
}
ChannelUID channelUID = new ChannelUID(getThing().getUID(), channel);

// TODO: Need to understand if this harms anything. If yes, channel only to be added when not there already.
// current way allows to have no issues when channels are changing.
if (getThing().getChannel(channel) != null) {
logger.info("Channel '{}' for thing {} already exist... removing", channel, getThing().getUID());
thingBuilder.withoutChannel(new ChannelUID(getThing().getUID(), channel));
}
ChannelBuilder newChannel = ChannelBuilder.create(channelUID, dataType).withLabel(miChannel.getFriendlyName());
boolean useGeneratedChannelType = false;
if (!miChannel.getChannelType().isBlank()) {
Expand Down