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 2019/04/01 08:04:33 UTC
[incubator-plc4x] 01/02: Merge branches 'develop' and
'feature/generated-drivers' of
https://gitbox.apache.org/repos/asf/incubator-plc4x into
feature/generated-drivers
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch feature/generated-drivers
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 5c66bbe63fd30c96b0515a5e5f97b45a9305380e
Merge: bfa7428 e10fccc
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Mon Apr 1 08:35:09 2019 +0200
Merge branches 'develop' and 'feature/generated-drivers' of https://gitbox.apache.org/repos/asf/incubator-plc4x into feature/generated-drivers
.../connection/SimulatedPlcConnection.java | 7 ++++
.../base/connection/AbstractPlcConnection.java | 47 ++++++++++++++++++++++
.../plc4x/java/base/connection/ChannelFactory.java | 8 ++++
.../java/base/connection/NettyPlcConnection.java | 19 ++++++++-
.../base/connection/AbstractPlcConnectionTest.java | 8 ++++
.../base/connection/NettyPlcConnectionTest.java | 17 +++++++-
.../base/connection/RawSocketChannelFactory.java | 7 ++++
.../java/base/connection/SerialChannelFactory.java | 8 ++++
.../base/connection/TcpSocketChannelFactory.java | 7 ++++
.../java/base/connection/TestChannelFactory.java | 7 ++++
10 files changed, 133 insertions(+), 2 deletions(-)