From 41f8ae6acc8772ea8dd935aab57b7d138677a14e Mon Sep 17 00:00:00 2001 From: Ondrej Pecta Date: Wed, 13 Jan 2021 21:00:50 +0100 Subject: [PATCH] [jablotron] fixed programmable gates channels are not visible in the OH3 UI (#9809) - fixed programmable gates channels are not visible in the OH3 UI Signed-off-by: Ondrej Pecta --- .../binding/jablotron/JablotronBindingConstants.java | 2 +- .../internal/handler/JablotronJa100FHandler.java | 6 ++++-- .../internal/handler/JablotronJa100Handler.java | 10 ++++++---- .../src/main/resources/OH-INF/thing/channels.xml | 7 +++++++ 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/JablotronBindingConstants.java b/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/JablotronBindingConstants.java index b88993771..f5b9f4f27 100644 --- a/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/JablotronBindingConstants.java +++ b/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/JablotronBindingConstants.java @@ -28,7 +28,7 @@ import org.openhab.core.thing.ThingTypeUID; @NonNullByDefault public class JablotronBindingConstants { - private static final String BINDING_ID = "jablotron"; + public static final String BINDING_ID = "jablotron"; // List of all Thing Type UIDs public static final ThingTypeUID THING_TYPE_BRIDGE = new ThingTypeUID(BINDING_ID, "bridge"); diff --git a/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/internal/handler/JablotronJa100FHandler.java b/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/internal/handler/JablotronJa100FHandler.java index 855c93821..7b4b72f24 100644 --- a/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/internal/handler/JablotronJa100FHandler.java +++ b/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/internal/handler/JablotronJa100FHandler.java @@ -12,6 +12,7 @@ */ package org.openhab.binding.jablotron.internal.handler; +import static org.openhab.binding.jablotron.JablotronBindingConstants.BINDING_ID; import static org.openhab.binding.jablotron.JablotronBindingConstants.CACHE_TIMEOUT_MS; import static org.openhab.binding.jablotron.JablotronBindingConstants.CHANNEL_LAST_CHECK_TIME; @@ -125,15 +126,16 @@ public class JablotronJa100FHandler extends JablotronAlarmHandler { } private void createPGChannel(String name, String label) { + ChannelTypeUID pgmStatus = new ChannelTypeUID(BINDING_ID, "pgm_state"); ThingBuilder thingBuilder = editThing(); Channel channel = ChannelBuilder.create(new ChannelUID(thing.getUID(), name), "Switch").withLabel(label) - .build(); + .withType(pgmStatus).build(); thingBuilder.withChannel(channel); updateThing(thingBuilder.build()); } private void createStateChannel(String name, String label) { - ChannelTypeUID alarmStatus = new ChannelTypeUID("jablotron", "ja100f_alarm_state"); + ChannelTypeUID alarmStatus = new ChannelTypeUID(BINDING_ID, "ja100f_alarm_state"); ThingBuilder thingBuilder = editThing(); Channel channel = ChannelBuilder.create(new ChannelUID(thing.getUID(), name), "String").withLabel(label) .withType(alarmStatus).build(); diff --git a/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/internal/handler/JablotronJa100Handler.java b/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/internal/handler/JablotronJa100Handler.java index a2ff16905..8cf74b1a9 100644 --- a/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/internal/handler/JablotronJa100Handler.java +++ b/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/internal/handler/JablotronJa100Handler.java @@ -12,6 +12,7 @@ */ package org.openhab.binding.jablotron.internal.handler; +import static org.openhab.binding.jablotron.JablotronBindingConstants.BINDING_ID; import static org.openhab.binding.jablotron.JablotronBindingConstants.CACHE_TIMEOUT_MS; import static org.openhab.binding.jablotron.JablotronBindingConstants.CHANNEL_LAST_CHECK_TIME; @@ -98,7 +99,7 @@ public class JablotronJa100Handler extends JablotronAlarmHandler { } private void createTempChannel(String name, String label) { - ChannelTypeUID temperature = new ChannelTypeUID("jablotron", "temperature"); + ChannelTypeUID temperature = new ChannelTypeUID(BINDING_ID, "temperature"); ThingBuilder thingBuilder = editThing(); Channel channel = ChannelBuilder.create(new ChannelUID(thing.getUID(), name), "Number:Temperature") .withLabel(label).withType(temperature).build(); @@ -107,7 +108,7 @@ public class JablotronJa100Handler extends JablotronAlarmHandler { } private void createThermostatChannel(String name, String label) { - ChannelTypeUID temperature = new ChannelTypeUID("jablotron", "thermostat"); + ChannelTypeUID temperature = new ChannelTypeUID(BINDING_ID, "thermostat"); ThingBuilder thingBuilder = editThing(); Channel channel = ChannelBuilder.create(new ChannelUID(thing.getUID(), name), "Number:Temperature") .withLabel(label).withType(temperature).build(); @@ -116,15 +117,16 @@ public class JablotronJa100Handler extends JablotronAlarmHandler { } private void createPGMChannel(String name, String label) { + ChannelTypeUID pgmStatus = new ChannelTypeUID(BINDING_ID, "pgm_state"); ThingBuilder thingBuilder = editThing(); Channel channel = ChannelBuilder.create(new ChannelUID(thing.getUID(), name), "Switch").withLabel(label) - .build(); + .withType(pgmStatus).build(); thingBuilder.withChannel(channel); updateThing(thingBuilder.build()); } private void createStateChannel(String name, String label) { - ChannelTypeUID alarmStatus = new ChannelTypeUID("jablotron", "alarm_state"); + ChannelTypeUID alarmStatus = new ChannelTypeUID(BINDING_ID, "alarm_state"); ThingBuilder thingBuilder = editThing(); Channel channel = ChannelBuilder.create(new ChannelUID(thing.getUID(), name), "String").withLabel(label) .withType(alarmStatus).build(); diff --git a/bundles/org.openhab.binding.jablotron/src/main/resources/OH-INF/thing/channels.xml b/bundles/org.openhab.binding.jablotron/src/main/resources/OH-INF/thing/channels.xml index e20c20d82..f93504f87 100644 --- a/bundles/org.openhab.binding.jablotron/src/main/resources/OH-INF/thing/channels.xml +++ b/bundles/org.openhab.binding.jablotron/src/main/resources/OH-INF/thing/channels.xml @@ -125,6 +125,13 @@ + + + Switch + + A channel used for controlling the PGM state + + String