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:13:03 UTC
[incubator-plc4x] branch feature/ethernet-ip updated (7fab974 ->
502e1b2)
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 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
new 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
new 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
new 502e1b2 Merge branch 'master' of https://gitbox.apache.org/repos/asf/incubator-plc4x into feature/ethernet-ip
The 3 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 +--
.../java/api/exceptions/PlcInvalidAddress.java} | 42 +++++++++-----------
...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 +-
.../java/modbus/netty/Plc4XModbusProtocol.java | 10 ++---
.../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 +-
14 files changed, 133 insertions(+), 78 deletions(-)
copy plc4j/{protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/exception/AdsException.java => api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcInvalidAddress.java} (50%)
copy plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/{PlcNotImplementedException.java => PlcUnsupportedDataTypeException.java} (51%)
[incubator-plc4x] 02/03: Merge branch '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 4021fb83f2f20b0a602230c6371dae097e1da4e5
Merge: bd550d7 0b0e202
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Thu Aug 23 10:55:17 2018 +0200
Merge branch 'master' of https://gitbox.apache.org/repos/asf/incubator-plc4x into feature/ethernet-ip
.../PlcUnsupportedDataTypeException.java | 46 ++++++++++++++++++++++
.../plc4x/java/ads/protocol/Plc4x2AdsProtocol.java | 46 +++++++++++++++++++++-
2 files changed, 90 insertions(+), 2 deletions(-)
[incubator-plc4x] 03/03: Merge branch '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 502e1b25392a7b2877369b8abdc78fd91b17ab8b
Merge: 4021fb8 9c820f7
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Thu Aug 23 11:12:52 2018 +0200
Merge branch 'master' of https://gitbox.apache.org/repos/asf/incubator-plc4x into feature/ethernet-ip
.../plc4x/java/api/connection/PlcConnection.java | 6 +--
.../java/api/exceptions/PlcInvalidAddress.java | 53 ++++++++++++++++++++++
.../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 +-
.../java/modbus/netty/Plc4XModbusProtocol.java | 10 ++--
.../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 +-
12 files changed, 102 insertions(+), 51 deletions(-)
[incubator-plc4x] 01/03: 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 bd550d7a5919392710be2d3d756986d1d59bf715
Merge: 7fab974 a4c4797
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Thu Aug 23 10:28:34 2018 +0200
Merge branches 'feature/ethernet-ip' and 'master' of https://gitbox.apache.org/repos/asf/incubator-plc4x into feature/ethernet-ip
.../main/java/org/apache/plc4x/java/ads/protocol/Plc4x2AdsProtocol.java | 1 +
1 file changed, 1 insertion(+)