public/openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[miio] Use generic channeltypes if none provided (#8999)

Browse Source 
To prevent channels not showing up in OH3 main UI

Signed-off-by: Marcel Verpaalen <marcel@verpaalen.com>
This commit is contained in:
Marcel 2020-11-14 00:09:39 +01:00 committed by GitHub
parent a09123b1a2
commit 02341d3536
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 54 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/handler/MiIoBasicHandler.java
View File

@ -12,7 +12,7 @@
*/ */
package org.openhab.binding.miio.internal.handler; package org.openhab.binding.miio.internal.handler;
import static org.openhab.binding.miio.internal.MiIoBindingConstants.CHANNEL_COMMAND; import static org.openhab.binding.miio.internal.MiIoBindingConstants.*;
import java.awt.Color; import java.awt.Color;
import java.io.IOException; import java.io.IOException;
@ -452,6 +452,7 @@ public class MiIoBasicHandler extends MiIoAbstractHandler {
thingBuilder.withoutChannel(new ChannelUID(getThing().getUID(), channel)); thingBuilder.withoutChannel(new ChannelUID(getThing().getUID(), channel));
} }
ChannelBuilder newChannel = ChannelBuilder.create(channelUID, datatype).withLabel(friendlyName); ChannelBuilder newChannel = ChannelBuilder.create(channelUID, datatype).withLabel(friendlyName);
boolean useGenericChannelType = false;
if (!channelType.isBlank()) { if (!channelType.isBlank()) {
ChannelTypeUID channelTypeUID = new ChannelTypeUID(channelType); ChannelTypeUID channelTypeUID = new ChannelTypeUID(channelType);
if (channelTypeRegistry.getChannelType(channelTypeUID) != null) { if (channelTypeRegistry.getChannelType(channelTypeUID) != null) {
@ -459,7 +460,13 @@ public class MiIoBasicHandler extends MiIoAbstractHandler {
} else { } else {
logger.debug("ChannelType '{}' is not available. Check the Json file for {}", channelTypeUID, logger.debug("ChannelType '{}' is not available. Check the Json file for {}", channelTypeUID,
getThing().getUID()); getThing().getUID());
useGenericChannelType = true;
} }
} else {
useGenericChannelType = true;
}
if (useGenericChannelType) {
newChannel = newChannel.withType(new ChannelTypeUID(BINDING_ID, datatype.toLowerCase()));
} }
thingBuilder.withChannel(newChannel.build()); thingBuilder.withChannel(newChannel.build());
return channelUID; return channelUID;

46
bundles/org.openhab.binding.miio/src/main/resources/OH-INF/thing/commonChannels.xml
View File

@ -14,6 +14,52 @@
</channels> </channels>
</channel-group-type> </channel-group-type>
<!-- Generic channels -->
<channel-type id="color">
<item-type>Color</item-type>
<label>Generic Color Channel</label>
</channel-type>
<channel-type id="contact">
<item-type>Contact</item-type>
<label>Generic Contact Channel</label>
</channel-type>
<channel-type id="datetime">
<item-type>DateTime</item-type>
<label>Generic DateTime Channel</label>
</channel-type>
<channel-type id="dimmer">
<item-type>Dimmer</item-type>
<label>Generic Dimmer Channel</label>
</channel-type>
<channel-type id="image">
<item-type>Image</item-type>
<label>Generic Image Channel</label>
</channel-type>
<channel-type id="location">
<item-type>Location</item-type>
<label>Generic Location Channel</label>
</channel-type>
<channel-type id="number">
<item-type>Number</item-type>
<label>Generic Number Channel</label>
</channel-type>
<channel-type id="player">
<item-type>Player</item-type>
<label>Generic Player Channel</label>
</channel-type>
<channel-type id="rollershutter">
<item-type>Rollershutter</item-type>
<label>Generic Rollershutter Channel</label>
</channel-type>
<channel-type id="string">
<item-type>String</item-type>
<label>Generic String Channel</label>
</channel-type>
<channel-type id="switch">
<item-type>Switch</item-type>
<label>Generic Switch Channel</label>
</channel-type>
<!-- Network channels --> <!-- Network channels -->
<channel-type id="ssid" advanced="true"> <channel-type id="ssid" advanced="true">
<item-type>String</item-type> <item-type>String</item-type>