Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[digitalstrom] Fix deprecated tag "required" #10364

Merged
merged 1 commit into from
Mar 21, 2021
Merged

[digitalstrom] Fix deprecated tag "required" #10364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 8 additions & 16 deletions bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/config/bridgeConfig.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,54 +14,46 @@
<description>@text/dss_param_group_general_desc</description>
</parameter-group>
<!--Application token -->
<parameter name="applicationToken" type="text" groupName="connection">
<parameter name="applicationToken" type="text" groupName="connection" required="false">
<label>@text/dss_param_app_token_label</label>
<description>@text/dss_param_app_token_desc</description>
<required>false</required>
</parameter><!--ipAddress -->
<parameter name="dSSAddress" type="text" groupName="connection">
<parameter name="dSSAddress" type="text" groupName="connection" required="true">
<context>network-address</context>
<label>@text/dss_param_ip_address_label</label>
<description>@text/dss_param_ip_address_desc</description>
<required>true</required>
</parameter><!--userName -->
<parameter name="userName" type="text" groupName="connection">
<parameter name="userName" type="text" groupName="connection" required="false">
<label>@text/dss_param_username_label</label>
<description>@text/dss_param_username_desc</description>
<required>false</required>
</parameter><!--password -->
<parameter name="password" type="text" groupName="connection">
<parameter name="password" type="text" groupName="connection" required="false">
<label>@text/dss_param_password_label</label>
<description>@text/dss_param_password_desc</description>
<required>false</required>
<context>password</context>
</parameter>
<!--sensorDataUpdateInterval -->
<parameter name="sensorDataUpdateInterval" type="integer" groupName="general" min="60">
<parameter name="sensorDataUpdateInterval" type="integer" groupName="general" min="60" required="false">
<default>120</default>
<label>@text/dss_param_sensor_inter_label</label>
<description>@text/dss_param_sensor_inter_desc</description>
<required>false</required>
</parameter><!--totalPowerUpdateInterval -->
<parameter name="totalPowerUpdateInterval" type="integer" groupName="general" min="1">
<parameter name="totalPowerUpdateInterval" type="integer" groupName="general" min="1" required="false">
<default>30</default>
<label>@text/dss_param_total_power_inter_label</label>
<description>@text/dss_param_total_power_inter_desc</description>
<required>false</required>
</parameter><!--TrashBinDeleteTime -->
<parameter name="defaultTrashBinDeleteTime" type="integer" groupName="general" min="1">
<parameter name="defaultTrashBinDeleteTime" type="integer" groupName="general" min="1" required="false">
<default>7</default>
<label>@text/dss_param_trash_delete_label</label>
<description>@text/dss_param_trash_delete_desc</description>
<required>false</required>
</parameter>
<!--sensorWaitTime -->
<parameter name="sensorWaitTime" type="integer" groupName="general" min="1">
<parameter name="sensorWaitTime" type="integer" groupName="general" min="1" required="false">
<advanced>true</advanced>
<description>@text/dss_param_sensor_wait_label</description>
<default>60</default>
<label>@text/dss_param_sensor_wait_desc</label>
<required>false</required>
</parameter>
</config-description>
</config-description:config-descriptions>
15 changes: 5 additions & 10 deletions bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/config/deviceConfig.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<label>@text/device_param_group_sensor_label</label>
<description>@text/device_param_group_sensor_desc</description>
</parameter-group>
<parameter name="activePowerRefreshPriority" type="text" groupName='sensorSetup'>
<parameter name="activePowerRefreshPriority" type="text" groupName='sensorSetup' required="false">
<label>@text/device_param_active_power_label</label>
<description>@text/device_param_active_power_desc</description>
<options>
Expand All @@ -25,9 +25,8 @@
<option value="low">@text/DS_SENSOR_OPTION2</option>
</options>
<default>never</default>
<required>false</required>
</parameter>
<parameter name="electricMeterRefreshPriority" type="text" groupName='sensorSetup'>
<parameter name="electricMeterRefreshPriority" type="text" groupName='sensorSetup' required="false">
<label>@text/device_param_electric_meter_label</label>
<description>@text/device_param_electric_meter_desc</description>
<options>
Expand All @@ -37,9 +36,8 @@
<option value="low">@text/DS_SENSOR_OPTION2</option>
</options>
<default>never</default>
<required>false</required>
</parameter>
<parameter name="outputCurrentRefreshPriority" type="text" groupName='sensorSetup'>
<parameter name="outputCurrentRefreshPriority" type="text" groupName='sensorSetup' required="false">
<label>@text/device_param_output_current_label</label>
<description>@text/device_param_output_current_desc</description>
<options>
Expand All @@ -49,21 +47,18 @@
<option value="low">@text/DS_SENSOR_OPTION2</option>
</options>
<default>never</default>
<required>false</required>
</parameter>
<!--deviceID -->
<parameter name="dSID" type="text" readOnly="true" groupName="devInfo">
<parameter name="dSID" type="text" readOnly="true" groupName="devInfo" required="true">
<label>@text/device_param_dsid_label</label>
<description>@text/device_param_dsid_desc</description>
<required>true</required>
</parameter>
</config-description>
<!-- gray Device -->
<config-description uri="binding:digitalstrom:deviceWithoutPowerSensors">
<parameter name="dSID" type="text" readOnly="true">
<parameter name="dSID" type="text" readOnly="true" required="true">
<label>@text/device_param_dsid_label</label>
<description>@text/device_param_dsid_desc</description>
<required>true</required>
</parameter>
</config-description>
</config-description:config-descriptions>
3 changes: 1 addition & 2 deletions bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/AppartmentScene.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,9 @@

<config-description>
<!--scene id -->
<parameter name="sceneID" type="text" readOnly="true">
<parameter name="sceneID" type="text" readOnly="true" required="true">
<label>@text/param_scene_id_label</label>
<description>@text/param_scene_id_desc</description>
<required>true</required>
<options>
<option value="ABSENT">@text/absent</option>
<option value="PRESENT">@text/present</option>
Expand Down
9 changes: 3 additions & 6 deletions bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/GroupScene.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,19 @@

<config-description>
<!--zone id -->
<parameter name="zoneID" type="text">
<parameter name="zoneID" type="text" required="false">
<label>@text/param_scene_zone_id_label</label>
<description>@text/param_scene_zone_id_desc</description>
<required>false</required>
</parameter>
<!--groups id -->
<parameter name="groupID" type="text">
<parameter name="groupID" type="text" required="false">
<label>@text/param_scene_group_id_label</label>
<description>@text/param_scene_group_id_desc</description>
<required>false</required>
</parameter>
<!--scene id -->
<parameter name="sceneID" type="text">
<parameter name="sceneID" type="text" required="false">
<label>@text/param_scene_id_label</label>
<description>@text/param_scene_id_desc</description>
<required>false</required>
<options>
<option value="AREA_1_OFF">@text/AREA_1_OFF</option>
<option value="AREA_1_ON">@text/AREA_1_ON</option>
Expand Down
9 changes: 3 additions & 6 deletions bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/NamedScene.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,19 @@

<config-description>
<!--zone id -->
<parameter name="zoneID" type="text">
<parameter name="zoneID" type="text" required="false">
<label>@text/param_scene_zone_id_label</label>
<description>@text/param_scene_zone_id_desc</description>
<required>false</required>
</parameter>
<!--groups id -->
<parameter name="groupID" type="text">
<parameter name="groupID" type="text" required="false">
<label>@text/param_scene_group_id_label</label>
<description>@text/param_scene_group_id_desc</description>
<required>false</required>
</parameter>
<!--scene id -->
<parameter name="sceneID" type="text">
<parameter name="sceneID" type="text" required="false">
<label>@text/param_scene_id_label</label>
<description>@text/param_scene_id_desc</description>
<required>false</required>
<options>
<option value="AREA_1_OFF">@text/AREA_1_OFF</option>
<option value="AREA_1_ON">@text/AREA_1_ON</option>
Expand Down
6 changes: 2 additions & 4 deletions bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/ZoneScene.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,14 @@

<config-description>
<!--zone id -->
<parameter name="zoneID" type="text">
<parameter name="zoneID" type="text" required="false">
<label>@text/param_scene_zone_id_label</label>
<description>@text/param_scene_zone_id_desc</description>
<required>false</required>
</parameter>
<!--scene id -->
<parameter name="sceneID" type="text">
<parameter name="sceneID" type="text" required="false">
<label>@text/param_scene_id_label</label>
<description>@text/param_scene_id_desc</description>
<required>false</required>
<options>
<option value="DEEP_OFF">@text/deep_off</option>
<option value="STANDBY">@text/standby</option>
Expand Down
3 changes: 1 addition & 2 deletions ...g.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/ZoneTemperatureControl.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@

<config-description>
<!--zone id -->
<parameter name="zoneID" type="text">
<parameter name="zoneID" type="text" required="true">
<label>@text/zoneTemperatureControl_parm_zoneID_label</label>
<description>@text/zoneTemperatureControl_parm_zoneID_desc</description>
<required>true</required>
</parameter>
</config-description>
</thing-type>
Expand Down