You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by ke...@apache.org on 2018/01/05 10:18:01 UTC
[incubator-plc4x] 01/01: Merge branch 'master' into PLC4X-12
This is an automated email from the ASF dual-hosted git repository.
keinmark pushed a commit to branch PLC4X-12
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 0edd6835b779bd0095e4f639585d85cf8a4a4021
Merge: 3be1fc5 d0adfde
Author: Mark Keinhörster <ma...@codecentric.de>
AuthorDate: Fri Jan 5 11:08:47 2018 +0100
Merge branch 'master' into PLC4X-12
.gitignore | 1 +
Jenkinsfile | 4 +-
.../plc4x/java/applications/iotree/IoTree.java | 2 +-
.../java/applications/plclogger/PlcLogger.java | 2 +-
.../apache/plc4x/edgent/PlcConnectionAdapter.java | 10 +-
.../java/api/connection/AbstractPlcConnection.java | 4 -
.../PlcUsernamePasswordAuthenticationTest.java | 0
.../plc4x/java/api/messages/APIMessageTests.java | 0
.../plc4x/java/api/messages/mock/MockAddress.java | 0
plc4j/pom.xml | 7 +
.../plc4x/java/isotp/netty/IsoTPProtocol.java | 265 ++++++++++++---------
.../java/isotp/netty/model/types/DeviceGroup.java | 4 +-
.../isotp/netty/model/types/DisconnectReason.java | 4 +-
.../isotp/netty/model/types/ParameterCode.java | 4 +-
.../isotp/netty/model/types/ProtocolClass.java | 4 +-
.../java/isotp/netty/model/types/RejectCause.java | 4 +-
.../java/isotp/netty/model/types/TpduCode.java | 4 +-
.../java/isotp/netty/model/types/TpduSize.java | 4 +-
.../plc4x/java/s7/connection/S7PlcConnection.java | 8 +-
.../plc4x/java/s7/netty/Plc4XS7Protocol.java | 9 +-
.../org/apache/plc4x/java/s7/netty/S7Protocol.java | 167 ++++++-------
.../netty/model/types/DataTransportErrorCode.java | 4 +-
.../s7/netty/model/types/DataTransportSize.java | 4 +-
.../java/s7/netty/model/types/MemoryArea.java | 4 +-
.../java/s7/netty/model/types/MessageType.java | 4 +-
.../java/s7/netty/model/types/ParameterType.java | 4 +-
.../s7/netty/model/types/SpecificationType.java | 4 +-
.../java/s7/netty/model/types/TransportSize.java | 4 +-
.../netty/model/types/VariableAddressingMode.java | 4 +-
.../plc4x/java/isotp/netty/IsoTPProtocolTest.java | 30 +++
.../apache/plc4x/java/isotp/netty/MockChannel.java | 18 ++
.../isotp/netty/MockChannelHandlerContext.java | 18 ++
.../java/isotp/netty/MockChannelPipeline.java | 18 ++
.../apache/plc4x/java/s7/S7PlcReaderSample.java | 2 +-
.../org/apache/plc4x/java/s7/S7PlcScanner.java | 2 +-
.../org/apache/plc4x/java/s7/S7PlcTestConsole.java | 2 +-
.../apache/plc4x/java/s7/S7PlcWriterSample.java | 2 +-
.../plc4x/java/s7/netty/Plc4XS7ProtocolTest.java | 205 +++++++++++++++-
.../apache/plc4x/java/s7/netty/S7ProtocolTest.java | 62 ++++-
pom.xml | 227 ++++++++++--------
sonar-project.properties.sav | 46 ++++
41 files changed, 804 insertions(+), 367 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.