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/11/19 17:26:39 UTC
(plc4x) 01/01: Adjusts your own TCP channel configuration. PLC clock reading and adjustment validated.
This is an automated email from the ASF dual-hosted git repository.
cgarcia pushed a commit to branch issue/s7h_v2
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 00e48c25b15f9dff7476c9bc35cba21d8626b66d
Author: Cesar Garcia <ce...@ceos.com.ve>
AuthorDate: Sun Nov 19 13:25:42 2023 -0400
Adjusts your own TCP channel configuration. PLC clock reading and adjustment validated.
---
.../plc4x/java/s7/readwrite/configuration/S7Configuration.java | 8 ++++----
.../apache/plc4x/examples/plc4j/s7event/PlcReadDataS7400H.java | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/configuration/S7Configuration.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/configuration/S7Configuration.java
index a3e42c7cf0..d97ccd6bc8 100644
--- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/configuration/S7Configuration.java
+++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/configuration/S7Configuration.java
@@ -23,7 +23,7 @@ import org.apache.plc4x.java.spi.configuration.annotations.ConfigurationParamete
import org.apache.plc4x.java.spi.configuration.annotations.defaults.BooleanDefaultValue;
import org.apache.plc4x.java.spi.configuration.annotations.defaults.IntDefaultValue;
-public class S7Configuration implements Configuration {
+public class S7Configuration extends S7TcpTransportConfiguration {
@ConfigurationParameter("local-rack")
@IntDefaultValue(1)
@@ -89,7 +89,6 @@ public class S7Configuration implements Configuration {
@IntDefaultValue(0)
public int retryTime = 0;
-
public int getLocalRack() {
return localRack;
}
@@ -217,7 +216,7 @@ public class S7Configuration implements Configuration {
public void setRetryTime(int retryTime) {
this.retryTime = retryTime;
}
-
+
@Override
public String toString() {
return "Configuration{" +
@@ -229,6 +228,7 @@ public class S7Configuration implements Configuration {
", remote-rack2=" + remoteRack2 +
", remote-slot2=" + remoteSlot2 +
", remote-tsap=" + remoteTsap +
+ ", port=" + getDefaultPort() +
", pduSize=" + pduSize +
", maxAmqCaller=" + maxAmqCaller +
", maxAmqCallee=" + maxAmqCallee +
@@ -240,6 +240,6 @@ public class S7Configuration implements Configuration {
'\'' +
'}';
}
-
+
}
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 49cf838d0e..604ab80045 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
@@ -77,7 +77,7 @@ public class PlcReadDataS7400H implements ConnectionStateListener {
OpenConnection("s7://10.10.1.80/10.10.1.81?remote-rack=0&"
+ "remote-slot=3&remote-rack2=0&remote-slot=4&"
- + "controller-type=S7_400&read-timeout=8&"
+ + "controller-type=S7_400&read-timeout=8&"
+ "ping=true&ping-time=2&retry-time=3"); //(01)
logger.info("*****************************************************");