]> git.basschouten.com Git - openhab-addons.git/commitdiff
Fix too strict validation of ExtendedDeviceState number of bytes. (#11417)
authorjlaur <jacob-github@vindvejr.dk>
Thu, 21 Oct 2021 19:54:40 +0000 (21:54 +0200)
committerGitHub <noreply@github.com>
Thu, 21 Oct 2021 19:54:40 +0000 (21:54 +0200)
Fixes #11416

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/DishWasherHandler.java
bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/WashingMachineHandler.java

index b7086f89f9cd145910f790aac5c1e5e75d912afb..de0d8d61de711f4bcad6145c59d9cd3a86174f15 100644 (file)
@@ -46,7 +46,7 @@ public class DishWasherHandler extends MieleApplianceHandler<DishwasherChannelSe
 
     private static final int POWER_CONSUMPTION_BYTE_POSITION = 16;
     private static final int WATER_CONSUMPTION_BYTE_POSITION = 18;
-    private static final int EXTENDED_STATE_SIZE_BYTES = 24;
+    private static final int EXTENDED_STATE_MIN_SIZE_BYTES = 19;
 
     private final Logger logger = LoggerFactory.getLogger(DishWasherHandler.class);
 
@@ -97,8 +97,8 @@ public class DishWasherHandler extends MieleApplianceHandler<DishwasherChannelSe
     }
 
     public void onApplianceExtendedStateChanged(byte[] extendedDeviceState) {
-        if (extendedDeviceState.length != EXTENDED_STATE_SIZE_BYTES) {
-            logger.error("Unexpected size of extended state: {}", extendedDeviceState);
+        if (extendedDeviceState.length < EXTENDED_STATE_MIN_SIZE_BYTES) {
+            logger.warn("Unexpected size of extended state: {}", extendedDeviceState);
             return;
         }
 
index b7145a3196eeaea43a261163737957f88c0efbda..350281a45fba0e035c8b77cb5b62ddfeeb1d49f0 100644 (file)
@@ -46,7 +46,7 @@ public class WashingMachineHandler extends MieleApplianceHandler<WashingMachineC
 
     private static final int POWER_CONSUMPTION_BYTE_POSITION = 51;
     private static final int WATER_CONSUMPTION_BYTE_POSITION = 53;
-    private static final int EXTENDED_STATE_SIZE_BYTES = 59;
+    private static final int EXTENDED_STATE_MIN_SIZE_BYTES = 54;
 
     private final Logger logger = LoggerFactory.getLogger(WashingMachineHandler.class);
 
@@ -98,8 +98,8 @@ public class WashingMachineHandler extends MieleApplianceHandler<WashingMachineC
     }
 
     public void onApplianceExtendedStateChanged(byte[] extendedDeviceState) {
-        if (extendedDeviceState.length != EXTENDED_STATE_SIZE_BYTES) {
-            logger.error("Unexpected size of extended state: {}", extendedDeviceState);
+        if (extendedDeviceState.length < EXTENDED_STATE_MIN_SIZE_BYTES) {
+            logger.warn("Unexpected size of extended state: {}", extendedDeviceState);
             return;
         }