fixed double implementation in S7

apache · Jul 26, 2018 · 810d649 · 810d649
1 parent d7159aa
commit 810d649
Showing 1 changed file with 20 additions and 0 deletions.
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7TypeEncoder.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7TypeEncoder.java
@@ -49,6 +49,8 @@ public static byte[] encodeData(Object[] values) throws PlcProtocolException {
             throw new PlcNotImplementedException("calender not yet implemented in s7");
         } else if (valueType == Float.class) {
             result = encodeFloat(values, length);
+        } else if (valueType == Double.class) {
+            result = encodeDouble(values, length);
         } else if (valueType == String.class) {
             result = encodeString(values, length);
         } else {
@@ -89,6 +91,24 @@ public static byte[] encodeFloat(Object[] values, int length) {
         return result;
     }
 
+    public static byte[] encodeDouble(Object[] values, int length) {
+        byte[] result;
+        result = new byte[length * 8];
+        for (int i = 0; i < length; i++) {
+            double doubleValue = (double) values[i];
+            long longValue = Double.doubleToLongBits(doubleValue);
+            result[(i * 8)] =     (byte) ((longValue & 0xFF000000_00000000L) >> 56);
+            result[(i * 8) + 1] = (byte) ((longValue & 0x00FF0000_00000000L) >> 48);
+            result[(i * 8) + 2] = (byte) ((longValue & 0x0000FF00_00000000L) >> 40);
+            result[(i * 8) + 3] = (byte) ((longValue & 0x000000FF_00000000L) >> 32);
+            result[(i * 8) + 4] = (byte) ((longValue & 0x00000000_FF000000L) >> 24);
+            result[(i * 8) + 5] = (byte) ((longValue & 0x00000000_00FF0000L) >> 16);
+            result[(i * 8) + 6] = (byte) ((longValue & 0x00000000_0000FF00L) >> 8);
+            result[(i * 8) + 7] = (byte) (longValue & 0x00000000_000000FFL);
+        }
+        return result;
+    }
+
     public static byte[] encodeInteger(Object[] values, int length) {
         byte[] result;
         result = new byte[length * 4];