This is an automated email from the ASF dual-hosted git repository.
cgarcia pushed a commit to branch issue/s7h
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/issue/s7h by this push:
new 4bb047c7c6 Fixed URL handling in S7MuxImpl. Pending with parameter
management in parameter management in tcp transports.
4bb047c7c6 is described below
commit 4bb047c7c61ec72f26b45442049607646c44178a
Author: Cesar Garcia <[email protected]>
AuthorDate: Wed Nov 15 00:21:39 2023 -0400
Fixed URL handling in S7MuxImpl. Pending with parameter management in
parameter management in tcp transports.
---
.../s7/readwrite/protocol/S7HGeneratedDriverBase.java | 1 -
.../apache/plc4x/java/s7/readwrite/protocol/S7HMux.java | 3 ++-
.../plc4x/java/s7/readwrite/protocol/S7HMuxImpl.java | 17 +++++++++++------
.../java/s7/readwrite/protocol/S7HPlcConnection.java | 6 +-----
plc4j/examples/plc4j-s7event/pom.xml | 12 +++++++++++-
5 files changed, 25 insertions(+), 14 deletions(-)
diff --git
a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HGeneratedDriverBase.java
b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HGeneratedDriverBase.java
index 9e34320197..f74c8fe235 100644
---
a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HGeneratedDriverBase.java
+++
b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HGeneratedDriverBase.java
@@ -149,7 +149,6 @@ public class S7HGeneratedDriverBase extends
GeneratedDriverBase<TPKTPacket>{
awaitDiscoverComplete =
Boolean.parseBoolean(System.getProperty(PROPERTY_PLC4X_FORCE_AWAIT_DISCOVER_COMPLETE));
}
- logger.debug(">>>>>>>>>>>>>>>>>>> CREO LA CONEXION
<<<<<<<<<<<<<<<<<<<<<<<<<<");
return new S7HPlcConnection(
canPing(),
canRead(), canWrite(), canSubscribe(), canBrowse(),
diff --git
a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HMux.java
b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HMux.java
index 9697d6d774..1f027cc654 100644
---
a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HMux.java
+++
b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HMux.java
@@ -19,10 +19,11 @@
package org.apache.plc4x.java.s7.readwrite.protocol;
import io.netty.channel.Channel;
+import org.apache.plc4x.java.spi.configuration.Configuration;
public interface S7HMux {
-public void setEmbededhannel(Channel embeded_channel);
+public void setEmbededhannel(Channel embeded_channel, Configuration
configuration);
public void setPrimaryChannel(Channel primary_channel);
public void setSecondaryChannel(Channel secondary_channel);
public Channel getTCPChannel();
diff --git
a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HMuxImpl.java
b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HMuxImpl.java
index 4cee416f38..26ba62b8e9 100644
---
a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HMuxImpl.java
+++
b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HMuxImpl.java
@@ -31,6 +31,8 @@ import io.netty.util.AttributeKey;
import java.time.LocalTime;
import java.util.List;
import java.util.concurrent.TimeUnit;
+import org.apache.plc4x.java.s7.readwrite.configuration.S7Configuration;
+import org.apache.plc4x.java.spi.configuration.Configuration;
import org.apache.plc4x.java.spi.events.ConnectEvent;
import org.apache.plc4x.java.spi.events.ConnectedEvent;
import org.apache.plc4x.java.spi.events.DisconnectEvent;
@@ -272,15 +274,18 @@ public class S7HMuxImpl extends
MessageToMessageCodec<ByteBuf, ByteBuf> implemen
@Override
- public void setEmbededhannel(Channel embeded_channel) {
+ public void setEmbededhannel(Channel embeded_channel, Configuration
configuration) {
+ final S7Configuration conf = (S7Configuration) configuration;
this.embeded_channel = embeded_channel;
this.embeded_channel.attr(IS_CONNECTED).set(false);
this.embeded_channel.attr(WAS_CONNECTED).set(false);
- this.embeded_channel.attr(IS_PRIMARY).set(true);
- this.embeded_channel.attr(READ_TIME_OUT).set(8);
- this.embeded_channel.attr(IS_PING_ACTIVE).set(false);
- this.embeded_channel.attr(PING_TIME).set(-1);
- this.embeded_channel.attr(RETRY_TIME).set(8);
+ this.embeded_channel.attr(IS_PRIMARY).set(true);
+
+ //From the URL
+ this.embeded_channel.attr(READ_TIME_OUT).set(conf.getReadTimeout());
+ this.embeded_channel.attr(IS_PING_ACTIVE).set(conf.getPing());
+ this.embeded_channel.attr(PING_TIME).set(conf.getPingTime());
+ this.embeded_channel.attr(RETRY_TIME).set(conf.getRetryTime());
}
@Override
diff --git
a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HPlcConnection.java
b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HPlcConnection.java
index e6ef460025..5ae7ede7a1 100644
---
a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HPlcConnection.java
+++
b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HPlcConnection.java
@@ -157,11 +157,7 @@ public class S7HPlcConnection extends
DefaultNettyPlcConnection implements Runna
channel.pipeline().addFirst("Multiplexor",s7hmux);
}
- channel.pipeline().names().forEach( s -> {
- System.out.println("Nombre tuberia: " + s);
- });
-
- ((S7HMux) s7hmux).setEmbededhannel(channel);
+ ((S7HMux) s7hmux).setEmbededhannel(channel, configuration);
//channel.pipeline().addFirst((new
LoggingHandler(LogLevel.INFO)));
/*
channel.closeFuture().addListener(future -> {
diff --git a/plc4j/examples/plc4j-s7event/pom.xml
b/plc4j/examples/plc4j-s7event/pom.xml
index f70f69686e..142437385a 100644
--- a/plc4j/examples/plc4j-s7event/pom.xml
+++ b/plc4j/examples/plc4j-s7event/pom.xml
@@ -40,6 +40,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
+ <configuration>
+ <usedDependencies>
+ <dependency>org.slf4j:slf4j-simple</dependency>
+ </usedDependencies>
+ </configuration>
</plugin>
</plugins>
</build>
@@ -84,7 +89,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>2.0.9</version>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-common</artifactId>
+ <version>${netty.version}</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
