From 36d5d1fe1b328fa1609cb712f6dec91df6582b1f Mon Sep 17 00:00:00 2001 From: lolodomo Date: Sun, 21 Mar 2021 19:17:49 +0100 Subject: [PATCH] [plclogo] Fix deprecated tag "required" (#10368) Signed-off-by: Laurent Garnier --- .../src/main/resources/OH-INF/config/analog.xml | 9 +++------ .../src/main/resources/OH-INF/config/bridge.xml | 15 +++++---------- .../src/main/resources/OH-INF/config/datetime.xml | 9 +++------ .../src/main/resources/OH-INF/config/digital.xml | 6 ++---- .../src/main/resources/OH-INF/config/memory.xml | 10 ++++------ .../src/main/resources/OH-INF/config/pulse.xml | 10 ++++------ 6 files changed, 21 insertions(+), 38 deletions(-) diff --git a/bundles/org.openhab.binding.plclogo/src/main/resources/OH-INF/config/analog.xml b/bundles/org.openhab.binding.plclogo/src/main/resources/OH-INF/config/analog.xml index d6540f719bd..f1db22b2c98 100644 --- a/bundles/org.openhab.binding.plclogo/src/main/resources/OH-INF/config/analog.xml +++ b/bundles/org.openhab.binding.plclogo/src/main/resources/OH-INF/config/analog.xml @@ -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"> - + LOGO! analog block kind - true - + Propagate channels update to openHAB whether value changed or not false - false - + Smallest value change will be sent to openHAB 0 - false diff --git a/bundles/org.openhab.binding.plclogo/src/main/resources/OH-INF/config/bridge.xml b/bundles/org.openhab.binding.plclogo/src/main/resources/OH-INF/config/bridge.xml index 4050f224ade..d52ba4c9a4f 100644 --- a/bundles/org.openhab.binding.plclogo/src/main/resources/OH-INF/config/bridge.xml +++ b/bundles/org.openhab.binding.plclogo/src/main/resources/OH-INF/config/bridge.xml @@ -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"> - + network-address Network address of the PLC. - true - + LOGO! PLC hardware family version - true - + Local TSAP of the client as hex string - true 0x3000 - + Remote TSAP of the client as hex string - true 0x2000 - + Milliseconds between reread data from PLC. - true 100 diff --git a/bundles/org.openhab.binding.plclogo/src/main/resources/OH-INF/config/datetime.xml b/bundles/org.openhab.binding.plclogo/src/main/resources/OH-INF/config/datetime.xml index 1a873949fe8..6362ab4eba2 100644 --- a/bundles/org.openhab.binding.plclogo/src/main/resources/OH-INF/config/datetime.xml +++ b/bundles/org.openhab.binding.plclogo/src/main/resources/OH-INF/config/datetime.xml @@ -5,12 +5,11 @@ xsi:schemaLocation="https://openhab.org/schemas/config-description/v1.0.0 https://openhab.org/schemas/config-description-1.0.0.xsd"> - + LOGO! memory address - true - + Interpret received channel value as date or time @@ -18,13 +17,11 @@ time - true - + Propagate channels update to openHAB whether value changed or not false - false diff --git a/bundles/org.openhab.binding.plclogo/src/main/resources/OH-INF/config/digital.xml b/bundles/org.openhab.binding.plclogo/src/main/resources/OH-INF/config/digital.xml index 5dae526130a..a539f7675ba 100644 --- a/bundles/org.openhab.binding.plclogo/src/main/resources/OH-INF/config/digital.xml +++ b/bundles/org.openhab.binding.plclogo/src/main/resources/OH-INF/config/digital.xml @@ -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"> - + LOGO! digital block kind - true - + Propagate channels update to openHAB whether value changed or not false - false diff --git a/bundles/org.openhab.binding.plclogo/src/main/resources/OH-INF/config/memory.xml b/bundles/org.openhab.binding.plclogo/src/main/resources/OH-INF/config/memory.xml index d05eb2f8938..fa8b72d6421 100644 --- a/bundles/org.openhab.binding.plclogo/src/main/resources/OH-INF/config/memory.xml +++ b/bundles/org.openhab.binding.plclogo/src/main/resources/OH-INF/config/memory.xml @@ -6,22 +6,20 @@ + 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"> LOGO! memory address - true - + Update of the channel be should propagated to openHAB false - false - + Smallest value change will be sent to openHAB 0 - false diff --git a/bundles/org.openhab.binding.plclogo/src/main/resources/OH-INF/config/pulse.xml b/bundles/org.openhab.binding.plclogo/src/main/resources/OH-INF/config/pulse.xml index 58a9194bd7e..be93fca04df 100644 --- a/bundles/org.openhab.binding.plclogo/src/main/resources/OH-INF/config/pulse.xml +++ b/bundles/org.openhab.binding.plclogo/src/main/resources/OH-INF/config/pulse.xml @@ -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"> - + LOGO! memory address - true + 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"> LOGO! block or memory address to observe - false - + Time to wait before state reset 150 - false