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/03 09:52:54 UTC
[incubator-plc4x] branch feature/ethernet-ip updated (a372307 ->
5f3bf64)
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a change to branch feature/ethernet-ip
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git.
from a372307 Merge branches 'feature/ethernet-ip' and 'master' of https://gitbox.apache.org/repos/asf/incubator-plc4x into feature/ethernet-ip
add 75bf337 Added some javadoc to S7 communication path and several todos that may be helpful.
add a919e94 Added javadoc on S7PlcConnection.
add b1c4c86 Merge branch 's7-communication-documentation' of https://github.com/JulianFeinauer/incubator-plc4x into JulianFeinauer-s7-communication-documentation
add 4caff3c Removed the TODOs
add 8639d34 Merge branch 'JulianFeinauer-s7-communication-documentation'
add 5363805 Avoid some exceptions when disconnecting from S7 PLCs
add 972c532 Added byte[] and Byte[] implementation to modbus.
add f80c9ef Made the disconnect for S7 respect the ISO TP protocol.
new 5f3bf64 Merge branches 'feature/ethernet-ip' and 'master' of https://gitbox.apache.org/repos/asf/incubator-plc4x into feature/ethernet-ip
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/messages/PlcReadRequest.java | 13 +++++
.../plc4x/java/api/messages/PlcReadResponse.java | 10 ++++
.../java/api/messages/items/ReadRequestItem.java | 12 ++++
.../java/api/messages/items/ReadResponseItem.java | 6 ++
.../plc4x/java/api/messages/items/RequestItem.java | 5 ++
.../messages/specific/TypeSafePlcReadRequest.java | 8 +++
.../ads/connection/AdsAbstractPlcConnection.java | 3 +-
.../apache/plc4x/java/ads/adslib/AmsRouter.java | 6 +-
.../base/connection/AbstractPlcConnection.java | 2 +-
.../base/protocol/Plc4XSupportedDataTypes.java | 40 ++++++++++++-
.../java/modbus/netty/Plc4XModbusProtocol.java | 39 ++++++++++---
.../java/modbus/netty/Plc4XModbusProtocolTest.java | 52 ++++++++++++-----
plc4j/protocols/s7/pom.xml | 4 ++
.../plc4x/java/s7/connection/S7PlcConnection.java | 65 +++++++++++++++++++---
.../plc4x/java/s7/netty/Plc4XS7Protocol.java | 9 +++
.../org/apache/plc4x/java/s7/netty/S7Protocol.java | 9 +++
.../java/s7/netty/model/messages/S7Message.java | 10 ++++
.../s7/netty/model/messages/S7RequestMessage.java | 5 ++
.../s7/netty/model/messages/S7ResponseMessage.java | 3 +
.../java/s7/netty/model/params/VarParameter.java | 6 +-
.../model/params/items/S7AnyVarParameterItem.java | 15 +++++
.../java/s7/netty/model/payloads/VarPayload.java | 5 ++
.../java/s7/connection/S7PlcConnectionIT.java | 12 +++-
23 files changed, 303 insertions(+), 36 deletions(-)
[incubator-plc4x] 01/01: Merge branches 'feature/ethernet-ip' and
'master' of https://gitbox.apache.org/repos/asf/incubator-plc4x into
feature/ethernet-ip
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch feature/ethernet-ip
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 5f3bf64daaf8bc73cb16a2004d7145c71e5a6eed
Merge: a372307 f80c9ef
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Fri Aug 3 11:52:40 2018 +0200
Merge branches 'feature/ethernet-ip' and 'master' of https://gitbox.apache.org/repos/asf/incubator-plc4x into feature/ethernet-ip
.../plc4x/java/api/messages/PlcReadRequest.java | 13 +++++
.../plc4x/java/api/messages/PlcReadResponse.java | 10 ++++
.../java/api/messages/items/ReadRequestItem.java | 12 ++++
.../java/api/messages/items/ReadResponseItem.java | 6 ++
.../plc4x/java/api/messages/items/RequestItem.java | 5 ++
.../messages/specific/TypeSafePlcReadRequest.java | 8 +++
.../ads/connection/AdsAbstractPlcConnection.java | 3 +-
.../apache/plc4x/java/ads/adslib/AmsRouter.java | 6 +-
.../base/connection/AbstractPlcConnection.java | 2 +-
.../base/protocol/Plc4XSupportedDataTypes.java | 40 ++++++++++++-
.../java/modbus/netty/Plc4XModbusProtocol.java | 39 ++++++++++---
.../java/modbus/netty/Plc4XModbusProtocolTest.java | 52 ++++++++++++-----
plc4j/protocols/s7/pom.xml | 4 ++
.../plc4x/java/s7/connection/S7PlcConnection.java | 65 +++++++++++++++++++---
.../plc4x/java/s7/netty/Plc4XS7Protocol.java | 9 +++
.../org/apache/plc4x/java/s7/netty/S7Protocol.java | 9 +++
.../java/s7/netty/model/messages/S7Message.java | 10 ++++
.../s7/netty/model/messages/S7RequestMessage.java | 5 ++
.../s7/netty/model/messages/S7ResponseMessage.java | 3 +
.../java/s7/netty/model/params/VarParameter.java | 6 +-
.../model/params/items/S7AnyVarParameterItem.java | 15 +++++
.../java/s7/netty/model/payloads/VarPayload.java | 5 ++
.../java/s7/connection/S7PlcConnectionIT.java | 12 +++-
23 files changed, 303 insertions(+), 36 deletions(-)