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/01/09 15:09:24 UTC
[incubator-plc4x] 04/04: Merge branch 'master' of
https://gitbox.apache.org/repos/asf/incubator-plc4x into
feature/PLC4X-18--raw-sockets
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch feature/PLC4X-18--raw-sockets
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 9267533494e54ae1e279fa82988ef9e2c0f63efe
Merge: cbcd7e4 25a752c
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Tue Jan 9 16:09:02 2018 +0100
Merge branch 'master' of https://gitbox.apache.org/repos/asf/incubator-plc4x into feature/PLC4X-18--raw-sockets
Jenkinsfile | 4 +-
applications/iotree/pom.xml | 5 +
.../plc4x/java/applications/iotree/IoTree.java | 20 +-
applications/plclogger/pom.xml | 5 +
.../java/applications/plclogger/PlcLogger.java | 20 +-
integrations/apache-camel/pom.xml | 23 +-
.../java/org/apache/plc4x/camel/PLC4XProducer.java | 2 +
.../apache/plc4x/edgent/PlcConnectionAdapter.java | 8 +-
.../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 | 38 +--
.../plc4x/java/isotp/netty/IsoTPProtocol.java | 369 +++++++++++----------
.../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 | 6 +-
.../plc4x/java/s7/netty/Plc4XS7Protocol.java | 73 ++--
.../org/apache/plc4x/java/s7/netty/S7Protocol.java | 231 +++++++------
.../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 | 294 +++++++++++++++-
.../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 +-
.../plc4x/java/s7/netty/Plc4XS7ProtocolTest.java | 205 +++++++++++-
.../apache/plc4x/java/s7/netty/S7ProtocolTest.java | 62 +++-
pom.xml | 263 +++++++++------
...ject.properties => sonar-project.properties.sav | 17 +
41 files changed, 1237 insertions(+), 528 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.