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

[digitalstrom] Standardize config URI (#11017) 

Signed-off-by: Laurent Garnier <lg.hc@free.fr>
This commit is contained in:
lolodomo 2021-07-18 09:14:19 +02:00 committed by GitHub
parent ee937debbb
commit 82ee00df1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/DigitalSTROMBindingConstants.java
View File

@ -53,11 +53,6 @@ public class DigitalSTROMBindingConstants {
public static final String OPTION_COMBINED_FIRST_ON = "90"; public static final String OPTION_COMBINED_FIRST_ON = "90";
public static final String OPTION_COMBINED_SECOND_ON = "130"; 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 */ /* Bridge config properties */
public static final String HOST = "dSSAddress"; public static final String HOST = "dSSAddress";

4
bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/providers/DsDeviceThingTypeProvider.java
View File

@ -82,8 +82,8 @@ public class DsDeviceThingTypeProvider extends BaseDsI18n implements ThingTypePr
private final Logger logger = LoggerFactory.getLogger(DsDeviceThingTypeProvider.class); private final Logger logger = LoggerFactory.getLogger(DsDeviceThingTypeProvider.class);
private final String DEVICE_WITH_POWER_SENSORS = "binding:digitalstrom:deviceWithPowerSensors"; private final String DEVICE_WITH_POWER_SENSORS = "thing-type:digitalstrom:deviceWithPowerSensors";
private final String DEVICE_WITHOUT_POWER_SENSORS = "binding:digitalstrom:deviceWithoutPowerSensors"; private final String DEVICE_WITHOUT_POWER_SENSORS = "thing-type:digitalstrom:deviceWithoutPowerSensors";
@Activate @Activate
@Override @Override

2
bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/config/bridgeConfig.xml
View File

@ -4,7 +4,7 @@
xmlns:config-description="https://openhab.org/schemas/config-description/v1.0.0" xmlns:config-description="https://openhab.org/schemas/config-description/v1.0.0"
xsi:schemaLocation="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"> https://openhab.org/schemas/config-description-1.0.0.xsd">
<config-description uri="binding:digitalstrom:dssBridge"> <config-description uri="bridge-type:digitalstrom:dssBridge">
<parameter-group name="connection"> <parameter-group name="connection">
<label>@text/dss_param_group_connection_label</label> <label>@text/dss_param_group_connection_label</label>
<description>@text/dss_param_group_connection_desc</description> <description>@text/dss_param_group_connection_desc</description>

4
bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/config/deviceConfig.xml
View File

@ -6,7 +6,7 @@
https://openhab.org/schemas/config-description-1.0.0.xsd"> https://openhab.org/schemas/config-description-1.0.0.xsd">
<!-- yellow/black Device --> <!-- yellow/black Device -->
<config-description uri="binding:digitalstrom:deviceWithPowerSensors"> <config-description uri="thing-type:digitalstrom:deviceWithPowerSensors">
<parameter-group name="devInfo"> <parameter-group name="devInfo">
<label>@text/device_param_group_info_label</label> <label>@text/device_param_group_info_label</label>
<description>@text/device_param_group_info_desc</description> <description>@text/device_param_group_info_desc</description>
@ -55,7 +55,7 @@
</parameter> </parameter>
</config-description> </config-description>
<!-- gray Device --> <!-- gray Device -->
<config-description uri="binding:digitalstrom:deviceWithoutPowerSensors"> <config-description uri="thing-type:digitalstrom:deviceWithoutPowerSensors">
<parameter name="dSID" type="text" readOnly="true" required="true"> <parameter name="dSID" type="text" readOnly="true" required="true">
<label>@text/device_param_dsid_label</label> <label>@text/device_param_dsid_label</label>
<description>@text/device_param_dsid_desc</description> <description>@text/device_param_dsid_desc</description>

2
bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/dssBridge.xml
View File

@ -16,7 +16,7 @@
<properties> <properties>
<property name="serverCert"></property> <property name="serverCert"></property>
</properties> </properties>
<config-description-ref uri="binding:digitalstrom:dssBridge"/> <config-description-ref uri="bridge-type:digitalstrom:dssBridge"/>
</bridge-type> </bridge-type>
</thing:thing-descriptions> </thing:thing-descriptions>