Skip to content

Commit

Permalink
[plclogo] Fix deprecated tag "required" (openhab#10368)
Browse files Browse the repository at this point in the history 
Signed-off-by: Laurent Garnier <lg.hc@free.fr>
Signed-off-by: John Marshall <john.marshall.au@gmail.com>
  • Loading branch information
@lolodomo @themillhousegroup
lolodomo authored and themillhousegroup committed May 10, 2021
1 parent 428e802 commit 1175fec
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 38 deletions.
9 changes: 3 additions & 6 deletions bundles/org.openhab.binding.plclogo/src/main/resources/OH-INF/config/analog.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,19 @@
xsi:schemaLocation="https://openhab.org/schemas/config-description/v1.0.0 https://openhab.org/schemas/config-description-1.0.0.xsd">

<config-description uri="thing-type:plclogo:analog">
<parameter name="kind" type="text" pattern="AI|AM|AQ|NAI|NAQ">
<parameter name="kind" type="text" pattern="AI|AM|AQ|NAI|NAQ" required="true">
<label>LOGO! Analog Block Kind</label>
<description>LOGO! analog block kind</description>
<required>true</required>
</parameter>
<parameter name="force" type="boolean">
<parameter name="force" type="boolean" required="false">
<label>Force Channels Update</label>
<description>Propagate channels update to openHAB whether value changed or not</description>
<default>false</default>
<required>false</required>
</parameter>
<parameter name="threshold" type="integer" min="0">
<parameter name="threshold" type="integer" min="0" required="false">
<label>Smallest Value Change to Sent</label>
<description>Smallest value change will be sent to openHAB</description>
<default>0</default>
<required>false</required>
</parameter>
</config-description>
</config-description:config-descriptions>
15 changes: 5 additions & 10 deletions bundles/org.openhab.binding.plclogo/src/main/resources/OH-INF/config/bridge.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,37 +5,32 @@
xsi:schemaLocation="https://openhab.org/schemas/config-description/v1.0.0 https://openhab.org/schemas/config-description-1.0.0.xsd">

<config-description uri="thing-type:plclogo:bridge">
<parameter name="address" type="text">
<parameter name="address" type="text" required="true">
<context>network-address</context>
<label>Network Address</label>
<description>Network address of the PLC.</description>
<required>true</required>
</parameter>
<parameter name="family" type="text">
<parameter name="family" type="text" required="true">
<label>LOGO! Family</label>
<description>LOGO! PLC hardware family version</description>
<options>
<option value="0BA7">0BA7</option>
<option value="0BA8">0BA8</option>
</options>
<required>true</required>
</parameter>
<parameter name="localTSAP" type="text" pattern="(0x[0-9]{4})">
<parameter name="localTSAP" type="text" pattern="(0x[0-9]{4})" required="true">
<label>Local TSAP</label>
<description>Local TSAP of the client as hex string</description>
<required>true</required>
<default>0x3000</default>
</parameter>
<parameter name="remoteTSAP" type="text" pattern="(0x[0-9]{4})">
<parameter name="remoteTSAP" type="text" pattern="(0x[0-9]{4})" required="true">
<label>Remote TSAP</label>
<description>Remote TSAP of the client as hex string</description>
<required>true</required>
<default>0x2000</default>
</parameter>
<parameter name="refresh" type="integer" min="100" step="50">
<parameter name="refresh" type="integer" min="100" step="50" required="true">
<label>Refresh Interval</label>
<description>Milliseconds between reread data from PLC.</description>
<required>true</required>
<default>100</default>
</parameter>
</config-description>
Expand Down
9 changes: 3 additions & 6 deletions bundles/org.openhab.binding.plclogo/src/main/resources/OH-INF/config/datetime.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,23 @@
xsi:schemaLocation="https://openhab.org/schemas/config-description/v1.0.0 https://openhab.org/schemas/config-description-1.0.0.xsd">

<config-description uri="thing-type:plclogo:datetime">
<parameter name="block" type="text" pattern="VW(\d|[1-9]\d|[1-7]\d{2}|8[0-4]\d)">
<parameter name="block" type="text" pattern="VW(\d|[1-9]\d|[1-7]\d{2}|8[0-4]\d)" required="true">
<label>LOGO! Memory Address</label>
<description>LOGO! memory address</description>
<required>true</required>
</parameter>
<parameter name="type" type="text">
<parameter name="type" type="text" required="true">
<label>Send Value As</label>
<description>Interpret received channel value as date or time</description>
<options>
<option value="date">date</option>
<option value="time">time</option>
</options>
<default>time</default>
<required>true</required>
</parameter>
<parameter name="force" type="boolean">
<parameter name="force" type="boolean" required="false">
<label>Force Channels Update</label>
<description>Propagate channels update to openHAB whether value changed or not</description>
<default>false</default>
<required>false</required>
</parameter>
</config-description>
</config-description:config-descriptions>
6 changes: 2 additions & 4 deletions bundles/org.openhab.binding.plclogo/src/main/resources/OH-INF/config/digital.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,14 @@
xsi:schemaLocation="https://openhab.org/schemas/config-description/v1.0.0 https://openhab.org/schemas/config-description-1.0.0.xsd">

<config-description uri="thing-type:plclogo:digital">
<parameter name="kind" type="text" pattern="I|M|Q|NI|NQ">
<parameter name="kind" type="text" pattern="I|M|Q|NI|NQ" required="true">
<label>LOGO! Digital Block Kind</label>
<description>LOGO! digital block kind</description>
<required>true</required>
</parameter>
<parameter name="force" type="boolean">
<parameter name="force" type="boolean" required="false">
<label>Force Channels Update</label>
<description>Propagate channels update to openHAB whether value changed or not</description>
<default>false</default>
<required>false</required>
</parameter>
</config-description>
</config-description:config-descriptions>
10 changes: 4 additions & 6 deletions bundles/org.openhab.binding.plclogo/src/main/resources/OH-INF/config/memory.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,20 @@

<config-description uri="thing-type:plclogo:memory">
<parameter name="block" type="text"
pattern="VB(\d|[1-9]\d|[1-7]\d{2}|8[0-4]\d|850)\.[0-7]|VB(\d|[1-9]\d|[1-7]\d{2}|8[0-4]\d|850)|VW(\d|[1-9]\d|[1-7]\d{2}|8[0-4]\d)|VD(\d|[1-9]\d|[1-7]\d{2}|8[0-3]\d|84[0-7])">
pattern="VB(\d|[1-9]\d|[1-7]\d{2}|8[0-4]\d|850)\.[0-7]|VB(\d|[1-9]\d|[1-7]\d{2}|8[0-4]\d|850)|VW(\d|[1-9]\d|[1-7]\d{2}|8[0-4]\d)|VD(\d|[1-9]\d|[1-7]\d{2}|8[0-3]\d|84[0-7])"
required="true">
<label>LOGO! Memory Address</label>
<description>LOGO! memory address</description>
<required>true</required>
</parameter>
<parameter name="force" type="boolean">
<parameter name="force" type="boolean" required="false">
<label>Force Channel Update</label>
<description>Update of the channel be should propagated to openHAB</description>
<default>false</default>
<required>false</required>
</parameter>
<parameter name="threshold" type="integer" min="0">
<parameter name="threshold" type="integer" min="0" required="false">
<label>Smallest Value Change to Sent</label>
<description>Smallest value change will be sent to openHAB</description>
<default>0</default>
<required>false</required>
</parameter>
</config-description>
</config-description:config-descriptions>
10 changes: 4 additions & 6 deletions bundles/org.openhab.binding.plclogo/src/main/resources/OH-INF/config/pulse.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,20 @@
xsi:schemaLocation="https://openhab.org/schemas/config-description/v1.0.0 https://openhab.org/schemas/config-description-1.0.0.xsd">

<config-description uri="thing-type:plclogo:pulse">
<parameter name="block" type="text" pattern="VB(\d|[1-9]\d|[1-7]\d{2}|8[0-4]\d|850)\.[0-7]">
<parameter name="block" type="text" pattern="VB(\d|[1-9]\d|[1-7]\d{2}|8[0-4]\d|850)\.[0-7]" required="true">
<label>LOGO! Memory Address</label>
<description>LOGO! memory address</description>
<required>true</required>
</parameter>
<parameter name="observe" type="text"
pattern="I([1-9]|1\d|2[0-4])|NI([1-9]|[1-5]\d|6[0-4])|Q([1-9]|1\d|20)|NQ([1-9]|[1-5]\d|6[0-4])|M([1-9]|[1-5]\d|6[0-4])|VB(\d|[1-9]\d|[1-7]\d{2}|8[0-4]\d|850)\.[0-7]">
pattern="I([1-9]|1\d|2[0-4])|NI([1-9]|[1-5]\d|6[0-4])|Q([1-9]|1\d|20)|NQ([1-9]|[1-5]\d|6[0-4])|M([1-9]|[1-5]\d|6[0-4])|VB(\d|[1-9]\d|[1-7]\d{2}|8[0-4]\d|850)\.[0-7]"
required="false">
<label>LOGO! Block/Memory Address</label>
<description>LOGO! block or memory address to observe</description>
<required>false</required>
</parameter>
<parameter name="pulse" type="integer">
<parameter name="pulse" type="integer" required="false">
<label>Pulse Length</label>
<description>Time to wait before state reset</description>
<default>150</default>
<required>false</required>
</parameter>
</config-description>
</config-description:config-descriptions>

0 comments on commit 1175fec

Please sign in to comment.