From 9a6df0d318517d4e67428f8f2fbc6eaee319b313 Mon Sep 17 00:00:00 2001 From: dw-8 Date: Sun, 25 Jul 2021 02:13:58 -0400 Subject: [PATCH] Revert "[homeassistant/homie] Standardize config URI (#11021)" This reverts commit ebbc17d5e1baa81bdfe335ccf042097b7ab24483. --- .../homeassistant/generic/internal/MqttBindingConstants.java | 2 +- .../resources/OH-INF/config/homeassistant-channel-config.xml | 2 +- .../mqtt/homie/generic/internal/MqttBindingConstants.java | 2 +- .../src/main/resources/OH-INF/config/homie-channel-config.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bundles/org.openhab.binding.mqtt.homeassistant/src/main/java/org/openhab/binding/mqtt/homeassistant/generic/internal/MqttBindingConstants.java b/bundles/org.openhab.binding.mqtt.homeassistant/src/main/java/org/openhab/binding/mqtt/homeassistant/generic/internal/MqttBindingConstants.java index 39d11f1c67112..ddcd6dca1573d 100644 --- a/bundles/org.openhab.binding.mqtt.homeassistant/src/main/java/org/openhab/binding/mqtt/homeassistant/generic/internal/MqttBindingConstants.java +++ b/bundles/org.openhab.binding.mqtt.homeassistant/src/main/java/org/openhab/binding/mqtt/homeassistant/generic/internal/MqttBindingConstants.java @@ -29,5 +29,5 @@ public class MqttBindingConstants { // List of all Thing Type UIDs public static final ThingTypeUID HOMEASSISTANT_MQTT_THING = new ThingTypeUID(BINDING_ID, "homeassistant"); - public static final String CONFIG_HA_CHANNEL = "channel-type:mqtt:ha-channel"; + public static final String CONFIG_HA_CHANNEL = "mqtt:ha_channel"; } diff --git a/bundles/org.openhab.binding.mqtt.homeassistant/src/main/resources/OH-INF/config/homeassistant-channel-config.xml b/bundles/org.openhab.binding.mqtt.homeassistant/src/main/resources/OH-INF/config/homeassistant-channel-config.xml index 64cbf21ea2977..d1c27cced9c93 100644 --- a/bundles/org.openhab.binding.mqtt.homeassistant/src/main/resources/OH-INF/config/homeassistant-channel-config.xml +++ b/bundles/org.openhab.binding.mqtt.homeassistant/src/main/resources/OH-INF/config/homeassistant-channel-config.xml @@ -4,7 +4,7 @@ xmlns:config-description="https://openhab.org/schemas/config-description/v1.0.0" xsi:schemaLocation="https://openhab.org/schemas/config-description/v1.0.0 https://openhab.org/schemas/config-description-1.0.0.xsd"> - + HomeAssistant component type (e.g. binary_sensor, switch, light) diff --git a/bundles/org.openhab.binding.mqtt.homie/src/main/java/org/openhab/binding/mqtt/homie/generic/internal/MqttBindingConstants.java b/bundles/org.openhab.binding.mqtt.homie/src/main/java/org/openhab/binding/mqtt/homie/generic/internal/MqttBindingConstants.java index 8ed20a9b59763..0f423f363eb2c 100644 --- a/bundles/org.openhab.binding.mqtt.homie/src/main/java/org/openhab/binding/mqtt/homie/generic/internal/MqttBindingConstants.java +++ b/bundles/org.openhab.binding.mqtt.homie/src/main/java/org/openhab/binding/mqtt/homie/generic/internal/MqttBindingConstants.java @@ -29,7 +29,7 @@ public class MqttBindingConstants { // List of all Thing Type UIDs public static final ThingTypeUID HOMIE300_MQTT_THING = new ThingTypeUID(BINDING_ID, "homie300"); - public static final String CONFIG_HOMIE_CHANNEL = "channel-type:mqtt:homie-channel"; + public static final String CONFIG_HOMIE_CHANNEL = "mqtt:homie_channel"; public static final String HOMIE_PROPERTY_VERSION = "homieversion"; public static final String HOMIE_PROPERTY_HEARTBEAT_INTERVAL = "heartbeat_interval"; diff --git a/bundles/org.openhab.binding.mqtt.homie/src/main/resources/OH-INF/config/homie-channel-config.xml b/bundles/org.openhab.binding.mqtt.homie/src/main/resources/OH-INF/config/homie-channel-config.xml index 83e50a30bb535..741a1369644e3 100644 --- a/bundles/org.openhab.binding.mqtt.homie/src/main/resources/OH-INF/config/homie-channel-config.xml +++ b/bundles/org.openhab.binding.mqtt.homie/src/main/resources/OH-INF/config/homie-channel-config.xml @@ -4,7 +4,7 @@ xmlns:config-description="https://openhab.org/schemas/config-description/v1.0.0" xsi:schemaLocation="https://openhab.org/schemas/config-description/v1.0.0 https://openhab.org/schemas/config-description-1.0.0.xsd"> - + The channels unit