You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2018/08/23 09:30:04 UTC
[incubator-plc4x] branch feature/apache-kafka updated (5d062f0 ->
d6be19e)
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a change to branch feature/apache-kafka
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git.
from 5d062f0 Merge branches 'feature/apache-kafka' and 'master' of https://gitbox.apache.org/repos/asf/incubator-plc4x into feature/apache-kafka
add 735431e PLC4X-38 - Implement the Ethernet/IP Protocol
add 44627a3 PLC4X-38 - Implement the Ethernet/IP Protocol
add a372307 Merge branches 'feature/ethernet-ip' and 'master' of https://gitbox.apache.org/repos/asf/incubator-plc4x into feature/ethernet-ip
add 5f3bf64 Merge branches 'feature/ethernet-ip' and 'master' of https://gitbox.apache.org/repos/asf/incubator-plc4x into feature/ethernet-ip
add e035944 Added the repo for the enip snapshots
add 428b144 Added the EnipClient class from the enip projects client module
add 9a299c8 Added missing dependency
add 0bc1f0d Merge branches 'feature/ethernet-ip' and 'master' of https://gitbox.apache.org/repos/asf/incubator-plc4x into feature/ethernet-ip
add 73fe5e9 Merge branches 'feature/ethernet-ip' and 'master' of https://gitbox.apache.org/repos/asf/incubator-plc4x into feature/ethernet-ip
add 66ff504 Changed the scope of the core module
add 8e6af2d Merge branch 'master' of https://gitbox.apache.org/repos/asf/incubator-plc4x into feature/ethernet-ip
add 44860d9 Updated the code after moving the PlcRequestContainer to another package
add ffd8d81 Further work on the EtherNet/IP implementation.
add 8bec538 Adjusted the poc to latest changes in the enip driver
add 992f707 Updated the ethernetip driver to a new version
add 5dad848 Removed the maven version check as it was reported by the build itself not being intended for this sort of check
add 1f60789 First working version of a driver able to read values via EtherNet/IP
add 7fab974 Merge branches 'feature/ethernet-ip' and 'master' of https://gitbox.apache.org/repos/asf/incubator-plc4x into feature/ethernet-ip
add a4c4797 [ADS] added TODO: about broken multiplicator
add bd550d7 Merge branches 'feature/ethernet-ip' and 'master' of https://gitbox.apache.org/repos/asf/incubator-plc4x into feature/ethernet-ip
add 0b0e202 [ADS] partially fixed length calculation where it is partially possible
add 4021fb8 Merge branch 'master' of https://gitbox.apache.org/repos/asf/incubator-plc4x into feature/ethernet-ip
add 9c820f7 [ALL] added new PlcInvalidAddress to indicate an invalid address
add 502e1b2 Merge branch 'master' of https://gitbox.apache.org/repos/asf/incubator-plc4x into feature/ethernet-ip
add 23f05c8 - Renamed PlcInvalidAddress to PlcInvalidAddressException - Refactored the code for parsing addresses in the EtherNet/IP driver
new d6be19e Merge branches 'feature/apache-kafka' and 'master' of https://gitbox.apache.org/repos/asf/incubator-plc4x into feature/apache-kafka
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../plc4x/java/api/connection/PlcConnection.java | 6 +-
...eption.java => PlcInvalidAddressException.java} | 21 +-
...n.java => PlcUnsupportedDataTypeException.java} | 24 +-
.../plc4x/java/ads/protocol/Plc4x2AdsProtocol.java | 45 +-
.../ads/protocol/util/LittleEndianDecoder.java | 37 +-
.../ads/protocol/util/LittleEndianEncoder.java | 3 +-
.../ads/protocol/util/LittleEndianDecoderTest.java | 3 +-
.../ads/protocol/util/LittleEndianEncoderTest.java | 4 +-
.../plc4x/java/base/connection/MockConnection.java | 3 +-
plc4j/protocols/{modbus => ethernetip}/pom.xml | 77 ++--
.../java/ethernetip/EtherNetIpPlcDriver.java} | 44 +-
.../connection/BaseEtherNetIpPlcConnection.java | 57 +--
.../connection/EtherNetIpTcpPlcConnection.java | 83 ++++
.../java/ethernetip/model/EtherNetIpAddress.java | 102 +++++
.../plc4x/java/ethernetip/netty/EnipCodec.java | 58 +++
.../ethernetip/netty/Plc4XEtherNetIpProtocol.java | 488 +++++++++++++++++++++
.../netty/events/EtherNetIpConnectedEvent.java} | 4 +-
.../services/org.apache.plc4x.java.api.PlcDriver | 2 +-
.../ethernetip/src/site/asciidoc/index.adoc | 80 ++++
.../src/site/resources/img/WAGO_enip_exporer.png | Bin 0 -> 293168 bytes
.../org/apache/plc4x/java/ethernetip/EnipTest.java | 67 +++
.../java/ethernetip/ManualPlc4XEtherNetIpTest.java | 64 +++
.../src/test/resources/read-attribute.pcapng | Bin 0 -> 664 bytes
.../java/modbus/netty/Plc4XModbusProtocol.java | 10 +-
plc4j/protocols/pom.xml | 1 +
.../plc4x/java/s7/connection/S7PlcConnection.java | 7 +-
.../plc4x/java/s7/netty/util/S7TypeDecoder.java | 19 +-
.../plc4x/java/s7/netty/util/S7TypeEncoder.java | 6 +-
.../java/s7/connection/S7PlcConnectionTests.java | 2 +-
pom.xml | 19 +-
30 files changed, 1169 insertions(+), 167 deletions(-)
copy plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/{PlcNotImplementedException.java => PlcInvalidAddressException.java} (56%)
copy plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/{PlcNotImplementedException.java => PlcUnsupportedDataTypeException.java} (51%)
copy plc4j/protocols/{modbus => ethernetip}/pom.xml (70%)
copy plc4j/protocols/{s7/src/main/java/org/apache/plc4x/java/s7/S7PlcDriver.java => ethernetip/src/main/java/org/apache/plc4x/java/ethernetip/EtherNetIpPlcDriver.java} (58%)
copy examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/connection/DummyConnection.java => plc4j/protocols/ethernetip/src/main/java/org/apache/plc4x/java/ethernetip/connection/BaseEtherNetIpPlcConnection.java (57%)
create mode 100644 plc4j/protocols/ethernetip/src/main/java/org/apache/plc4x/java/ethernetip/connection/EtherNetIpTcpPlcConnection.java
create mode 100644 plc4j/protocols/ethernetip/src/main/java/org/apache/plc4x/java/ethernetip/model/EtherNetIpAddress.java
create mode 100644 plc4j/protocols/ethernetip/src/main/java/org/apache/plc4x/java/ethernetip/netty/EnipCodec.java
create mode 100644 plc4j/protocols/ethernetip/src/main/java/org/apache/plc4x/java/ethernetip/netty/Plc4XEtherNetIpProtocol.java
copy plc4j/protocols/{s7/src/main/java/org/apache/plc4x/java/isotp/netty/events/IsoTPConnectedEvent.java => ethernetip/src/main/java/org/apache/plc4x/java/ethernetip/netty/events/EtherNetIpConnectedEvent.java} (88%)
copy plc4j/{core/src/test => protocols/ethernetip/src/main}/resources/META-INF/services/org.apache.plc4x.java.api.PlcDriver (93%)
create mode 100644 plc4j/protocols/ethernetip/src/site/asciidoc/index.adoc
create mode 100644 plc4j/protocols/ethernetip/src/site/resources/img/WAGO_enip_exporer.png
create mode 100644 plc4j/protocols/ethernetip/src/test/java/org/apache/plc4x/java/ethernetip/EnipTest.java
create mode 100644 plc4j/protocols/ethernetip/src/test/java/org/apache/plc4x/java/ethernetip/ManualPlc4XEtherNetIpTest.java
create mode 100644 plc4j/protocols/ethernetip/src/test/resources/read-attribute.pcapng
[incubator-plc4x] 01/01: Merge branches 'feature/apache-kafka' and
'master' of https://gitbox.apache.org/repos/asf/incubator-plc4x into
feature/apache-kafka
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch feature/apache-kafka
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit d6be19efaa4c855d5c8cc42a8265812daf38eff9
Merge: 5d062f0 23f05c8
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Thu Aug 23 11:29:47 2018 +0200
Merge branches 'feature/apache-kafka' and 'master' of https://gitbox.apache.org/repos/asf/incubator-plc4x into feature/apache-kafka
.../plc4x/java/api/connection/PlcConnection.java | 6 +-
.../api/exceptions/PlcInvalidAddressException.java | 41 ++
.../PlcUnsupportedDataTypeException.java | 46 ++
.../plc4x/java/ads/protocol/Plc4x2AdsProtocol.java | 45 +-
.../ads/protocol/util/LittleEndianDecoder.java | 37 +-
.../ads/protocol/util/LittleEndianEncoder.java | 3 +-
.../ads/protocol/util/LittleEndianDecoderTest.java | 3 +-
.../ads/protocol/util/LittleEndianEncoderTest.java | 4 +-
.../plc4x/java/base/connection/MockConnection.java | 3 +-
plc4j/protocols/ethernetip/pom.xml | 149 +++++++
.../plc4x/java/ethernetip/EtherNetIpPlcDriver.java | 81 ++++
.../connection/BaseEtherNetIpPlcConnection.java | 86 ++++
.../connection/EtherNetIpTcpPlcConnection.java | 83 ++++
.../java/ethernetip/model/EtherNetIpAddress.java | 102 +++++
.../plc4x/java/ethernetip/netty/EnipCodec.java | 58 +++
.../ethernetip/netty/Plc4XEtherNetIpProtocol.java | 488 +++++++++++++++++++++
.../netty/events/EtherNetIpConnectedEvent.java | 22 +
.../services/org.apache.plc4x.java.api.PlcDriver | 19 +
.../ethernetip/src/site/asciidoc/index.adoc | 80 ++++
.../src/site/resources/img/WAGO_enip_exporer.png | Bin 0 -> 293168 bytes
.../org/apache/plc4x/java/ethernetip/EnipTest.java | 67 +++
.../java/ethernetip/ManualPlc4XEtherNetIpTest.java | 64 +++
.../src/test/resources/read-attribute.pcapng | Bin 0 -> 664 bytes
.../java/modbus/netty/Plc4XModbusProtocol.java | 10 +-
plc4j/protocols/pom.xml | 1 +
.../plc4x/java/s7/connection/S7PlcConnection.java | 7 +-
.../plc4x/java/s7/netty/util/S7TypeDecoder.java | 19 +-
.../plc4x/java/s7/netty/util/S7TypeEncoder.java | 6 +-
.../java/s7/connection/S7PlcConnectionTests.java | 2 +-
pom.xml | 19 +-
30 files changed, 1485 insertions(+), 66 deletions(-)