Update plc4x dependency to 0.12.0

Update plc4x dependency to 0.12.0 Signed-off-by: Łukasz Dywicki <[email protected]>
ConnectorIO · Mar 5, 2024 · 23af66d · 23af66d
1 parent 0a69fcd
commit 23af66d
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 43 deletions.
diff --git a/...va/org/connectorio/addons/binding/amsads/internal/handler/AmsAdsNetworkBridgeHandler.java b/...va/org/connectorio/addons/binding/amsads/internal/handler/AmsAdsNetworkBridgeHandler.java
@@ -134,8 +134,8 @@ public void run() {
             }
           }
 
-          String target = "targetAmsNetId=" + config.targetAmsId + "&targetAmsPort=" + config.targetAmsPort;
-          String source = "&sourceAmsNetId=" + amsAds.sourceAmsId + "&sourceAmsPort=" + amsAds.sourceAmsPort;
+          String target = "target-ams-net-id=" + config.targetAmsId + "&target-ams-port=" + config.targetAmsPort;
+          String source = "&source-ams-net-id=" + amsAds.sourceAmsId + "&source-ams-port=" + amsAds.sourceAmsPort;
           String extraOpts = "&load-symbol-and-data-type-tables=false";
 
           PlcConnection connection = driverManager.getConnectionManager().getConnection("ads:tcp://" + config.host + "?" + target + source + extraOpts);

diff --git a/...ng.s7/src/main/java/org/connectorio/addons/binding/s7/internal/config/ControllerType.java b/...ng.s7/src/main/java/org/connectorio/addons/binding/s7/internal/config/ControllerType.java
diff --git a/...c/main/java/org/connectorio/addons/binding/s7/internal/config/S7NetworkConfiguration.java b/...c/main/java/org/connectorio/addons/binding/s7/internal/config/S7NetworkConfiguration.java
@@ -17,6 +17,7 @@
  */
 package org.connectorio.addons.binding.s7.internal.config;
 
+import org.apache.plc4x.java.s7.readwrite.ControllerType;
 import org.connectorio.addons.binding.config.PollingConfiguration;
 
 /**

diff --git a/.../main/java/org/connectorio/addons/binding/s7/internal/handler/S7NetworkBridgeHandler.java b/.../main/java/org/connectorio/addons/binding/s7/internal/handler/S7NetworkBridgeHandler.java
@@ -67,7 +67,7 @@ public void run() {
           String local = "local-slot=" + config.localSlot + "&local-rack=" + config.localRack;
           String remote = "&remote-slot=" + config.remoteSlot + "&remote-rack=" + config.remoteRack;
           String pdu = config.pduSize != null ? "&pdu-size=" + config.pduSize : "";
-          String type = config.controllerType != null ? "&controller-type=" + config.controllerType.getType().name() : "";
+          String type = config.controllerType != null ? "&controller-type=" + config.controllerType.name() : "";
           PlcConnection connection = driverManager.getConnectionManager()
             .getConnection("s7://" + config.host + "?" + local + remote + pdu + type);
 

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -37,7 +37,7 @@
     <compiler.source>11</compiler.source>
     <compiler.target>11</compiler.target>
 
-    <plc4x-extras.version>0.11.1-connectorio-1</plc4x-extras.version>
+    <plc4x-extras.version>0.12.0</plc4x-extras.version>
     <bacnet4j-wrapper.version>1.3.0-beta1</bacnet4j-wrapper.version>
 
     <openhab.version>3.0.4</openhab.version>