Check command address when command is handled

docbender · Nov 9, 2020 · 513ab6d · 513ab6d
1 parent f15c5d9
commit 513ab6d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/...tic/src/main/java/org/openhab/binding/simatic/internal/handler/simaticGenericHandler.java b/...tic/src/main/java/org/openhab/binding/simatic/internal/handler/simaticGenericHandler.java
@@ -175,6 +175,12 @@ public void handleCommand(ChannelUID channelUID, Command command) {
         }
         SimaticChannel channel = channels.get(channelUID);
 
+        if (channel.getCommandAddress() == null) {
+            logger.warn("{} - command not completed. Channel does not have a command address specified. ChannelUID={}",
+                    thing.getLabel(), channelUID);
+            return;
+        }
+
         connection.sendData(channel, command);
     }
 

diff --git a/...atic/src/main/java/org/openhab/binding/simatic/internal/simatic/SimaticGenericDevice.java b/...atic/src/main/java/org/openhab/binding/simatic/internal/simatic/SimaticGenericDevice.java
@@ -278,16 +278,14 @@ protected void reconnectWithDelaying() {
     /**
      * Send command into device channel
      *
-     * @see org.openhab.binding.SimaticIDevice.internal.SimaticIDevice#sendData(java.lang.String,
-     *      org.openhab.core.types.Command)
      */
     @Override
     public void sendData(SimaticChannel item, Command command) {
         try {
             var area = SimaticWriteDataArea.create(command, item, pduSize, charset);
             sendData(area);
         } catch (Exception ex) {
-            logger.error("{} - ", toString(), ex);
+            logger.error("{} - ChannelUID={}. {}.", toString(), item.channelId, ex.getMessage(), ex);
         }
     }
 

diff --git a/...g.simatic/src/main/java/org/openhab/binding/simatic/internal/simaticBindingConstants.java b/...g.simatic/src/main/java/org/openhab/binding/simatic/internal/simaticBindingConstants.java
@@ -25,7 +25,7 @@
 @NonNullByDefault
 public class SimaticBindingConstants {
 
-    public static final String VERSION = "3.0.0";
+    public static final String VERSION = "3.0.1";
 
     private static final String BINDING_ID = "simatic";