You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cg...@apache.org on 2023/12/05 21:47:47 UTC

(plc4x) branch feature/s7strings updated: Fix date deviation for the DATE format (1 day). Need to test with S7-1200/S7-1500.

This is an automated email from the ASF dual-hosted git repository.

cgarcia pushed a commit to branch feature/s7strings
in repository https://gitbox.apache.org/repos/asf/plc4x.git


The following commit(s) were added to refs/heads/feature/s7strings by this push:
     new 6705810474 Fix date deviation for the DATE format (1 day). Need to test with S7-1200/S7-1500.
6705810474 is described below

commit 67058104740f9284ea238e53a75ba1ba7fa6d6a1
Author: Cesar Garcia <ce...@ceos.com.ve>
AuthorDate: Tue Dec 5 17:46:57 2023 -0400

    Fix date deviation for the DATE format (1 day). Need to test with S7-1200/S7-1500.
---
 .../org/apache/plc4x/java/s7/readwrite/DataItem.java    | 17 +++++++----------
 .../java/s7/readwrite/protocol/S7ProtocolLogic.java     |  3 ++-
 .../plc4x/java/s7/readwrite/utils/StaticHelper.java     | 16 ++++++++++++----
 .../plc4x/examples/plc4j/s7event/PlcReadDataS7400H.java |  5 +++--
 protocols/s7/src/main/resources/protocols/s7/s7.mspec   |  7 ++++++-
 5 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/DataItem.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/DataItem.java
index a66b0a56d8..8617c595da 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/DataItem.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/DataItem.java
@@ -200,9 +200,9 @@ public class DataItem {
       return PlcLTIME.ofNanoseconds(nanoseconds);
     } else if (EvaluationHelper.equals(dataProtocolId, "IEC61131_DATE")) { // DATE
 
-      // Simple Field (daysSinceSiemensEpoch)
-      Integer daysSinceSiemensEpoch = /*TODO: migrate me*/ /*TODO: migrate me*/
-          readBuffer.readUnsignedInt("", 16);
+      // Manual Field (daysSinceSiemensEpoch)
+      int daysSinceSiemensEpoch =
+          (int) (org.apache.plc4x.java.s7.readwrite.utils.StaticHelper.parseTiaDate(readBuffer));
 
       return PlcDATE.ofDaysSinceSiemensEpoch(daysSinceSiemensEpoch);
     } else if (EvaluationHelper.equals(dataProtocolId, "IEC61131_TIME_OF_DAY")) { // TIME_OF_DAY
@@ -385,11 +385,8 @@ public class DataItem {
       /*TODO: migrate me*/
       /*TODO: migrate me*/ writeBuffer.writeUnsignedBigInteger("", 64, (BigInteger) (nanoseconds));
     } else if (EvaluationHelper.equals(dataProtocolId, "IEC61131_DATE")) { // DATE
-      // Simple Field (daysSinceSiemensEpoch)
-      int daysSinceSiemensEpoch = (int) ((PlcDATE) _value).getDaysSinceSiemensEpoch();
-      /*TODO: migrate me*/
-      /*TODO: migrate me*/ writeBuffer.writeUnsignedInt(
-          "", 16, ((Number) (daysSinceSiemensEpoch)).intValue());
+      // Manual Field (daysSinceSiemensEpoch)
+      org.apache.plc4x.java.s7.readwrite.utils.StaticHelper.serializeTiaDate(writeBuffer, _value);
     } else if (EvaluationHelper.equals(dataProtocolId, "IEC61131_TIME_OF_DAY")) { // TIME_OF_DAY
       // Simple Field (millisecondsSinceMidnight)
       long millisecondsSinceMidnight = (long) _value.getLong();
@@ -515,8 +512,8 @@ public class DataItem {
       // Simple Field (nanoseconds)
       sizeInBits += 64;
     } else if (EvaluationHelper.equals(dataProtocolId, "IEC61131_DATE")) { // DATE
-      // Simple Field (daysSinceSiemensEpoch)
-      sizeInBits += 16;
+      // Manual Field (daysSinceSiemensEpoch)
+      sizeInBits += 2;
     } else if (EvaluationHelper.equals(dataProtocolId, "IEC61131_TIME_OF_DAY")) { // TIME_OF_DAY
       // Simple Field (millisecondsSinceMidnight)
       sizeInBits += 32;
diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7ProtocolLogic.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7ProtocolLogic.java
index 264f1cf4b2..0e8dd71817 100644
--- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7ProtocolLogic.java
+++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7ProtocolLogic.java
@@ -1896,7 +1896,8 @@ public class S7ProtocolLogic extends Plc4xProtocolBase<TPKTPacket> {
                     lengthInBits = Math.min(lengthInBits, (stringLength * 8) + 16);
                 } else if(tag.getDataType() == TransportSize.WSTRING) {
                     lengthInBits = Math.min(lengthInBits, (stringLength * 16) + 32);
-                } else if(tag.getDataType() == TransportSize.S5TIME) {
+                } else if((tag.getDataType() == TransportSize.S5TIME) ||
+                        (tag.getDataType() == TransportSize.DATE)) {
                     lengthInBits = lengthInBits * 8;
                 }             
                 final WriteBufferByteBased writeBuffer = new WriteBufferByteBased((int) Math.ceil(((float) lengthInBits) / 8.0f));
diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/utils/StaticHelper.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/utils/StaticHelper.java
index 920c959fa3..7d67eedef9 100644
--- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/utils/StaticHelper.java
+++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/utils/StaticHelper.java
@@ -53,6 +53,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import org.apache.plc4x.java.spi.values.PlcDATE;
 import org.apache.plc4x.java.spi.values.PlcTIME;
 
 /**
@@ -2640,17 +2641,24 @@ public class StaticHelper {
         throw new NotImplementedException("Serializing TIME_OF_DAY not implemented");
     }
 
-    public static LocalDate parseTiaDate(ReadBuffer io) {
+    public static Integer parseTiaDate(ReadBuffer io) {
         try {
-            int daysSince1990 = io.readUnsignedInt(16);
-            return LocalDate.now().withYear(1990).withDayOfMonth(1).withMonth(1).plus(daysSince1990, ChronoUnit.DAYS);
+            int daysSince1990 = io.readUnsignedInt(16) + 1;
+            //return LocalDate.now().withYear(1990).withDayOfMonth(1).withMonth(1).plus(daysSince1990, ChronoUnit.DAYS);
+            return daysSince1990;
         } catch (ParseException e) {
             return null;
         }
     }
 
     public static void serializeTiaDate(WriteBuffer io, PlcValue value) {
-        throw new NotImplementedException("Serializing DATE not implemented");
+        final PlcDATE userDate = (PlcDATE) value;
+        int daysSince1990 = userDate.getDaysSinceSiemensEpoch() - 1;
+        try {
+            io.writeUnsignedInt(16, daysSince1990);
+        } catch (SerializationException ex) {
+            return;
+        }
     }
 
     //TODO: Call BCD converter
diff --git a/plc4j/examples/plc4j-s7event/src/main/java/org/apache/plc4x/examples/plc4j/s7event/PlcReadDataS7400H.java b/plc4j/examples/plc4j-s7event/src/main/java/org/apache/plc4x/examples/plc4j/s7event/PlcReadDataS7400H.java
index 6842f4ad4c..8ab317698c 100644
--- a/plc4j/examples/plc4j-s7event/src/main/java/org/apache/plc4x/examples/plc4j/s7event/PlcReadDataS7400H.java
+++ b/plc4j/examples/plc4j-s7event/src/main/java/org/apache/plc4x/examples/plc4j/s7event/PlcReadDataS7400H.java
@@ -20,6 +20,7 @@ package org.apache.plc4x.examples.plc4j.s7event;
 
 import java.io.IOException;
 import java.time.Duration;
+import java.time.LocalDate;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.apache.commons.lang3.time.StopWatch;
 import org.apache.plc4x.java.DefaultPlcDriverManager;
@@ -224,7 +225,7 @@ public class PlcReadDataS7400H implements ConnectionStateListener {
         if (!isConnected.get()) return;
         try {
             final PlcReadRequest.Builder readrequest = connection.readRequestBuilder();  //(01)
-            readrequest.addTagAddress("TEST", "%DB406:0:S5TIME"); //(02) 
+            readrequest.addTagAddress("TEST", "%DB406:2:DATE"); //(02) 
             
             final PlcReadRequest rr = readrequest.build(); //(03)
             final PlcReadResponse response; //(04)            
@@ -252,7 +253,7 @@ public class PlcReadDataS7400H implements ConnectionStateListener {
             final PlcWriteRequest.Builder writeRequest = connection.writeRequestBuilder();  //(01)
             //writeRequest.addTagAddress("TAG01", "%DB406:4:DWORD",(long) 0x0001_0001); //(02) 
             
-            writeRequest.addTagAddress("TAG01", "%DB406:0:S5TIME", Duration.ofMinutes(15)); //(02) 
+            writeRequest.addTagAddress("TAG01", "%DB406:2:DATE", LocalDate.now()); //(02) 
           
             
             final PlcWriteRequest wr = writeRequest.build(); //(03)
diff --git a/protocols/s7/src/main/resources/protocols/s7/s7.mspec b/protocols/s7/src/main/resources/protocols/s7/s7.mspec
index 179c624776..eb38e1220d 100644
--- a/protocols/s7/src/main/resources/protocols/s7/s7.mspec
+++ b/protocols/s7/src/main/resources/protocols/s7/s7.mspec
@@ -782,10 +782,15 @@
             [simple uint 64 nanoseconds]
         ]
         // - Date: Interpreted as "number of days since 1990-01-01"
+        // - Range in PLC S7-300/400 Min -> D#1990-01-01 (W#16#0000)
+        //                           Max -> D#2168-12-31 (W#16#FF62)
+        // - 01. Serialization using PlcDATE offsets the day indication by +/- 1 day.
+        // - 02. Need to test with S7-1200/S7-1500.
         ['"IEC61131_DATE"' DATE
-            [simple uint 16 daysSinceSiemensEpoch]
+            //[simple uint 16 daysSinceSiemensEpoch] //(01)
             // Number of days between 1990-01-01 and 1970-01-01 according to https://www.timeanddate.com/
             //[virtual uint 16 daysSinceEpoch 'daysSinceSiemensEpoch + 7305']
+            [manual uint 16 daysSinceSiemensEpoch   'STATIC_CALL("parseTiaDate", readBuffer)' 'STATIC_CALL("serializeTiaDate", writeBuffer, _value)' '2']
         ]
         //['"IEC61131_LDATE"' LDATE
         //    [implicit uint 16 daysSinceSiemensEpoch 'daysSinceEpoch - 7305']