diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/DigitalSTROMBindingConstants.java b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/DigitalSTROMBindingConstants.java index 87b86e0d8..c8a1d1890 100644 --- a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/DigitalSTROMBindingConstants.java +++ b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/DigitalSTROMBindingConstants.java @@ -53,11 +53,6 @@ public class DigitalSTROMBindingConstants { public static final String OPTION_COMBINED_FIRST_ON = "90"; public static final String OPTION_COMBINED_SECOND_ON = "130"; - /* config URIs */ - public static final String DEVICE_CONFIG = "binding:digitalstrom:device"; - public static final String GRAY_DEVICE_CONFIG = "binding:digitalstrom:grayDevice"; - public static final String DSS_BRIDE_CONFIG = "binding:digitalstrom:dssBridge"; - /* Bridge config properties */ public static final String HOST = "dSSAddress"; diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/providers/DsDeviceThingTypeProvider.java b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/providers/DsDeviceThingTypeProvider.java index 560cbd082..74633a2fd 100644 --- a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/providers/DsDeviceThingTypeProvider.java +++ b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/providers/DsDeviceThingTypeProvider.java @@ -82,8 +82,8 @@ public class DsDeviceThingTypeProvider extends BaseDsI18n implements ThingTypePr private final Logger logger = LoggerFactory.getLogger(DsDeviceThingTypeProvider.class); - private final String DEVICE_WITH_POWER_SENSORS = "binding:digitalstrom:deviceWithPowerSensors"; - private final String DEVICE_WITHOUT_POWER_SENSORS = "binding:digitalstrom:deviceWithoutPowerSensors"; + private final String DEVICE_WITH_POWER_SENSORS = "thing-type:digitalstrom:deviceWithPowerSensors"; + private final String DEVICE_WITHOUT_POWER_SENSORS = "thing-type:digitalstrom:deviceWithoutPowerSensors"; @Activate @Override diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/config/bridgeConfig.xml b/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/config/bridgeConfig.xml index 2523b325a..ba0fef535 100644 --- a/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/config/bridgeConfig.xml +++ b/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/config/bridgeConfig.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"> - + @text/dss_param_group_connection_desc diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/config/deviceConfig.xml b/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/config/deviceConfig.xml index 77194eabc..ecb137b1c 100644 --- a/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/config/deviceConfig.xml +++ b/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/config/deviceConfig.xml @@ -6,7 +6,7 @@ https://openhab.org/schemas/config-description-1.0.0.xsd"> - + @text/device_param_group_info_desc @@ -55,7 +55,7 @@ - + @text/device_param_dsid_desc diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/dssBridge.xml b/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/dssBridge.xml index 9918f663a..bb27064dd 100644 --- a/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/dssBridge.xml +++ b/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/dssBridge.xml @@ -16,7 +16,7 @@ - +