This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 502e1b25392a7b2877369b8abdc78fd91b17ab8b
Merge: 4021fb8 9c820f7
Author: Christofer Dutz <christofer.d...@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(-)
