You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by sr...@apache.org on 2019/12/18 14:01:37 UTC
[plc4x] branch next-gen-core updated: readded ethernet-ip after
refactoring
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch next-gen-core
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/next-gen-core by this push:
new 3e1d215 readded ethernet-ip after refactoring
3e1d215 is described below
commit 3e1d215c04a6a4072c09ed0553a8df74f7184ec0
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Wed Dec 18 15:01:00 2019 +0100
readded ethernet-ip after refactoring
---
.../java/ethernetip/connection/BaseEtherNetIpPlcConnection.java | 1 +
plc4j/drivers/pom.xml | 2 +-
plc4j/protocols/ethernet-ip/pom.xml | 6 +++++-
.../apache/plc4x/java/ethernetip/netty/Plc4XEtherNetIpProtocol.java | 3 ++-
plc4j/protocols/pom.xml | 2 +-
5 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/plc4j/drivers/ethernet-ip/src/main/java/org/apache/plc4x/java/ethernetip/connection/BaseEtherNetIpPlcConnection.java b/plc4j/drivers/ethernet-ip/src/main/java/org/apache/plc4x/java/ethernetip/connection/BaseEtherNetIpPlcConnection.java
index c95877f..9618146 100644
--- a/plc4j/drivers/ethernet-ip/src/main/java/org/apache/plc4x/java/ethernetip/connection/BaseEtherNetIpPlcConnection.java
+++ b/plc4j/drivers/ethernet-ip/src/main/java/org/apache/plc4x/java/ethernetip/connection/BaseEtherNetIpPlcConnection.java
@@ -26,6 +26,7 @@ import org.apache.plc4x.java.api.messages.PlcWriteResponse;
import org.apache.plc4x.java.spi.connection.ChannelFactory;
import org.apache.plc4x.java.spi.connection.NettyPlcConnection;
import org.apache.plc4x.java.ethernetip.netty.util.EnipPlcFieldHandler;
+import org.apache.plc4x.java.spi.messages.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/plc4j/drivers/pom.xml b/plc4j/drivers/pom.xml
index 15025ed..9eebcb7 100644
--- a/plc4j/drivers/pom.xml
+++ b/plc4j/drivers/pom.xml
@@ -36,7 +36,7 @@
<modules>
<module>ab-eth</module>
<module>ads</module>
-<!-- <module>ethernet-ip</module>-->
+ <module>ethernet-ip</module>
<module>modbus</module>
<!-- <module>s7</module>-->
<module>simulated</module>
diff --git a/plc4j/protocols/ethernet-ip/pom.xml b/plc4j/protocols/ethernet-ip/pom.xml
index 5bc4b12..f861009 100644
--- a/plc4j/protocols/ethernet-ip/pom.xml
+++ b/plc4j/protocols/ethernet-ip/pom.xml
@@ -42,7 +42,11 @@
<artifactId>plc4j-api</artifactId>
<version>0.6.0-SNAPSHOT</version>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.plc4x</groupId>
+ <artifactId>plc4j-spi</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>com.digitalpetri.enip</groupId>
diff --git a/plc4j/protocols/ethernet-ip/src/main/java/org/apache/plc4x/java/ethernetip/netty/Plc4XEtherNetIpProtocol.java b/plc4j/protocols/ethernet-ip/src/main/java/org/apache/plc4x/java/ethernetip/netty/Plc4XEtherNetIpProtocol.java
index 37b2fab..b0af9a3 100644
--- a/plc4j/protocols/ethernet-ip/src/main/java/org/apache/plc4x/java/ethernetip/netty/Plc4XEtherNetIpProtocol.java
+++ b/plc4j/protocols/ethernet-ip/src/main/java/org/apache/plc4x/java/ethernetip/netty/Plc4XEtherNetIpProtocol.java
@@ -37,11 +37,12 @@ import org.apache.plc4x.java.api.messages.PlcRequest;
import org.apache.plc4x.java.api.messages.PlcWriteRequest;
import org.apache.plc4x.java.api.model.PlcField;
import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.ethernetip.model.EtherNetIpField;
import org.apache.plc4x.java.spi.events.ConnectEvent;
import org.apache.plc4x.java.spi.events.ConnectedEvent;
+import org.apache.plc4x.java.spi.messages.*;
import org.apache.plc4x.java.spi.messages.items.BaseDefaultFieldItem;
import org.apache.plc4x.java.spi.messages.items.DefaultLongFieldItem;
-import org.apache.plc4x.java.ethernetip.model.EtherNetIpField;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/plc4j/protocols/pom.xml b/plc4j/protocols/pom.xml
index 7863bd5..75402c2 100644
--- a/plc4j/protocols/pom.xml
+++ b/plc4j/protocols/pom.xml
@@ -36,7 +36,7 @@
<modules>
<module>ads</module>
<!-- <module>delta-v</module>-->
-<!-- <module>ethernet-ip</module>-->
+ <module>ethernet-ip</module>
<!-- <module>iso-on-tcp</module>-->
<!-- <module>iso-tp</module>-->
<module>modbus</module>