(streampipes) branch dev updated: fix(#2976): Support PLC4X datatypes (#2977)

[riemer]

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

riemer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/streampipes.git


The following commit(s) were added to refs/heads/dev by this push:
     new 2263cec2c9 fix(#2976): Support PLC4X datatypes (#2977)
2263cec2c9 is described below

commit 2263cec2c9932c5dbcb50f13c1c11f018efebed4
Author: Dominik Riemer <dominik.rie...@gmail.com>
AuthorDate: Sun Jun 30 21:12:39 2024 +0200

    fix(#2976): Support PLC4X datatypes (#2977)
    
    Co-authored-by: Dominik Riemer <dominik.rie...@gmail.comx>
---
 .../connectors/plc/adapter/modbus/Plc4xModbusAdapter.java           | 3 ++-
 .../connectors/plc/adapter/s7/config/ConfigurationParser.java       | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git 
a/streampipes-extensions/streampipes-connectors-plc/src/main/java/org/apache/streampipes/extensions/connectors/plc/adapter/modbus/Plc4xModbusAdapter.java
 
b/streampipes-extensions/streampipes-connectors-plc/src/main/java/org/apache/streampipes/extensions/connectors/plc/adapter/modbus/Plc4xModbusAdapter.java
index 6c0673797c..0e92d06e76 100644
--- 
a/streampipes-extensions/streampipes-connectors-plc/src/main/java/org/apache/streampipes/extensions/connectors/plc/adapter/modbus/Plc4xModbusAdapter.java
+++ 
b/streampipes-extensions/streampipes-connectors-plc/src/main/java/org/apache/streampipes/extensions/connectors/plc/adapter/modbus/Plc4xModbusAdapter.java
@@ -101,9 +101,10 @@ public class Plc4xModbusAdapter implements 
StreamPipesAdapter, IPullAdapter {
    * Connection to the PLC
    */
   private PlcConnection plcConnection;
-  private PlcConnectionManager connectionManager;
+  private final PlcConnectionManager connectionManager;
 
   public Plc4xModbusAdapter(PlcConnectionManager connectionManager) {
+    this.connectionManager = connectionManager;
   }
 
   /**
diff --git 
a/streampipes-extensions/streampipes-connectors-plc/src/main/java/org/apache/streampipes/extensions/connectors/plc/adapter/s7/config/ConfigurationParser.java
 
b/streampipes-extensions/streampipes-connectors-plc/src/main/java/org/apache/streampipes/extensions/connectors/plc/adapter/s7/config/ConfigurationParser.java
index f45b4dbc40..395a11115d 100644
--- 
a/streampipes-extensions/streampipes-connectors-plc/src/main/java/org/apache/streampipes/extensions/connectors/plc/adapter/s7/config/ConfigurationParser.java
+++ 
b/streampipes-extensions/streampipes-connectors-plc/src/main/java/org/apache/streampipes/extensions/connectors/plc/adapter/s7/config/ConfigurationParser.java
@@ -81,8 +81,10 @@ public class ConfigurationParser {
     return switch (type) {
       case "BOOL" -> Datatypes.Boolean;
       case "BYTE", "REAL" -> Datatypes.Float;
-      case "INT" -> Datatypes.Integer;
-      case "WORD", "TIME_OF_DAY", "DATE", "DATE_AND_TIME", "STRING", "CHAR" -> 
Datatypes.String;
+      case "LREAL" -> Datatypes.Double;
+      case "INT", "DINT", "UDINT", "UINT", "SINT", "USINT" -> 
Datatypes.Integer;
+      case "LINT", "ULINT" -> Datatypes.Long;
+      case "WORD", "LWORD", "TIME_OF_DAY", "DATE", "DATE_AND_TIME", "STRING", 
"CHAR", "WCHAR" -> Datatypes.String;
       default -> throw new AdapterException("Datatype " + plcType + " is not 
supported");
     };
   }