Skip to content

Commit

Permalink
[knx] Fix deprecated tag "required" (openhab#10361)
Browse files Browse the repository at this point in the history 
Signed-off-by: Laurent Garnier <lg.hc@free.fr>
  • Loading branch information
@lolodomo @thinkingstone
lolodomo authored and thinkingstone committed Nov 7, 2021
1 parent 6c9265f commit 3d1cda9
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 50 deletions.
54 changes: 18 additions & 36 deletions bundles/org.openhab.binding.knx/src/main/resources/OH-INF/config/channelConfig.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,37 +7,31 @@

<!-- Dimmer -->
<config-description uri="channel-type:knx:dimmer">
<parameter name="switch" type="text">
<parameter name="switch" type="text" required="false">
<label>Address</label>
<description>The group address(es) in Group Address Notation to toggle the dimmer on or off</description>
<required>false</required>
</parameter>
<parameter name="position" type="text">
<parameter name="position" type="text" required="false">
<label>Address</label>
<description>The group address(es) in Group Address Notation to set the absolute position of the dimmer</description>
<required>false</required>
</parameter>
<parameter name="increaseDecrease" type="text">
<parameter name="increaseDecrease" type="text" required="false">
<label>Address</label>
<description>The group address(es) in Group Address Notation to increase or decrease the dimmer</description>
<required>false</required>
</parameter>
</config-description>
<config-description uri="channel-type:knx:dimmer-control">
<parameter name="switch" type="text">
<parameter name="switch" type="text" required="false">
<label>Address</label>
<description>The group address(es) in Group Address Notation to toggle the dimmer on or off</description>
<required>false</required>
</parameter>
<parameter name="position" type="text">
<parameter name="position" type="text" required="false">
<label>Address</label>
<description>The group address(es) in Group Address Notation to set the absolute position of the dimmer</description>
<required>false</required>
</parameter>
<parameter name="increaseDecrease" type="text">
<parameter name="increaseDecrease" type="text" required="false">
<label>Address</label>
<description>The group address(es) in Group Address Notation to increase or decrease the dimmer</description>
<required>false</required>
</parameter>
<parameter name="frequency" type="integer">
<label>Frequency</label>
Expand All @@ -49,47 +43,39 @@

<!-- Color -->
<config-description uri="channel-type:knx:color">
<parameter name="hsb" type="text">
<parameter name="hsb" type="text" required="false">
<label>Color Value</label>
<description>The group address(es) in Group Address Notation for the color value</description>
<required>false</required>
</parameter>
<parameter name="switch" type="text">
<parameter name="switch" type="text" required="false">
<label>Address</label>
<description>The group address(es) in Group Address Notation to toggle the color on or off</description>
<required>false</required>
</parameter>
<parameter name="position" type="text">
<parameter name="position" type="text" required="false">
<label>Address</label>
<description>The group address(es) in Group Address Notation to set the absolute position of the color</description>
<required>false</required>
</parameter>
<parameter name="increaseDecrease" type="text">
<parameter name="increaseDecrease" type="text" required="false">
<label>Address</label>
<description>The group address(es) in Group Address Notation to increase or decrease the color</description>
<required>false</required>
</parameter>
</config-description>
<config-description uri="channel-type:knx:color-control">
<parameter name="hsb" type="text">
<parameter name="hsb" type="text" required="false">
<label>Color Value</label>
<description>The group address(es) in Group Address Notation for the color value</description>
<required>false</required>
</parameter>
<parameter name="switch" type="text">
<parameter name="switch" type="text" required="false">
<label>Address</label>
<description>The group address(es) in Group Address Notation to toggle the color on or off</description>
<required>false</required>
</parameter>
<parameter name="position" type="text">
<parameter name="position" type="text" required="false">
<label>Address</label>
<description>The group address(es) in Group Address Notation to set the absolute position of the color</description>
<required>false</required>
</parameter>
<parameter name="increaseDecrease" type="text">
<parameter name="increaseDecrease" type="text" required="false">
<label>Address</label>
<description>The group address(es) in Group Address Notation to increase or decrease the color</description>
<required>false</required>
</parameter>
<parameter name="frequency" type="integer">
<label>Frequency</label>
Expand All @@ -101,29 +87,25 @@

<!-- Rollershutter -->
<config-description uri="channel-type:knx:rollershutter">
<parameter name="upDown" type="text">
<parameter name="upDown" type="text" required="false">
<label>Address</label>
<description>The group address(es) in Group Address Notation to move the shutter in the DOWN or UP direction</description>
<required>false</required>
</parameter>
<parameter name="stopMove" type="text">
<parameter name="stopMove" type="text" required="false">
<label>Address</label>
<description>The group address(es) in Group Address Notation to start (MOVE) or STOP shutter movement</description>
<required>false</required>
</parameter>
<parameter name="position" type="text">
<parameter name="position" type="text" required="false">
<label>Address</label>
<description>The group address(es) in Group Address Notation to set the absolute position of the shutter, in %</description>
<required>false</required>
</parameter>
</config-description>

<!-- Generic single-GA -->
<config-description uri="channel-type:knx:single">
<parameter name="ga" type="text">
<parameter name="ga" type="text" required="true">
<label>Address</label>
<description>The group address(es) in Group Address Notation</description>
<required>true</required>
</parameter>
</config-description>

Expand Down
6 changes: 2 additions & 4 deletions bundles/org.openhab.binding.knx/src/main/resources/OH-INF/thing/ip.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@
<description>This is a KNX IP interface or router</description>

<config-description>
<parameter name="type" type="text">
<parameter name="type" type="text" required="true">
<label>IP Connection Type</label>
<description>The ip connection type for connecting to the KNX bus. Could be either TUNNEL or ROUTER</description>
<required>true</required>
<options>
<option value="TUNNEL">Tunnel</option>
<option value="ROUTER">Router</option>
Expand All @@ -23,9 +22,8 @@
<description>Network address of the KNX/IP gateway</description>
<context>network-address</context>
</parameter>
<parameter name="portNumber" type="integer">
<parameter name="portNumber" type="integer" required="false"> <!-- Only required in TUNNEL mode -->
<description>Port number of the KNX/IP gateway</description>
<required>false</required> <!-- Only required in TUNNEL mode -->
<label>Port</label>
<default>3671</default>
</parameter>
Expand Down
15 changes: 5 additions & 10 deletions bundles/org.openhab.binding.knx/src/main/resources/OH-INF/thing/serial.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,35 +8,30 @@
<label>KNX FT1.2 Interface</label>
<description>This is a serial interface for accessing the KNX bus</description>
<config-description>
<parameter name="serialPort" type="text">
<parameter name="serialPort" type="text" required="true">
<context>serial-port </context>
<label>Serial Port</label>
<description>The serial port to use for connecting to the KNX bus</description>
<required>true</required>
</parameter>
<parameter name="readingPause" type="integer">
<parameter name="readingPause" type="integer" required="true">
<label>Reading Pause</label>
<description>Time in milliseconds of how long should be paused between two read requests to the bus during
initialization</description>
<required>true</required>
<default>50</default>
</parameter>
<parameter name="responseTimeout" type="integer">
<parameter name="responseTimeout" type="integer" required="true">
<label>Response Timeout</label>
<description>Seconds to wait for a response from the KNX bus</description>
<required>true</required>
<default>10</default>
</parameter>
<parameter name="readRetriesLimit" type="integer">
<parameter name="readRetriesLimit" type="integer" required="true">
<label>Read Retries Limit</label>
<description>Limits the read retries while initialization from the KNX bus</description>
<required>true</required>
<default>3</default>
</parameter>
<parameter name="autoReconnectPeriod" type="integer">
<parameter name="autoReconnectPeriod" type="integer" required="true">
<label>Auto Reconnect Period</label>
<description>Seconds between connect retries when KNX link has been lost, 0 means never retry</description>
<required>true</required>
<default>0</default>
</parameter>
</config-description>
Expand Down

0 comments on commit 3d1cda9

Please sign in to comment.