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/10/17 16:48:26 UTC
[incubator-plc4x] 19/19: Merge branch 'master' of
https://gitbox.apache.org/repos/asf/incubator-plc4x into
feature/execute-operation
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 006226026f55d023ed99306551fab01f1b7f4ff2
Merge: 48dbad0 2e7ccc1
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Wed Oct 17 18:29:43 2018 +0200
Merge branch 'master' of https://gitbox.apache.org/repos/asf/incubator-plc4x into feature/execute-operation
plc4j/protocols/delta-v/pom.xml | 72 +
.../java/org/apache/plc4x/java/deltav/PoC.java | 968 ------------
.../java/org/apache/plc4x/java/deltav/PoCES.java | 1617 +++++++++++++++++++
.../org/apache/plc4x/java/deltav/PoCInflux.java | 1584 +++++++++++++++++++
.../base/messages/items/DefaultLongFieldItem.java | 2 +-
.../messages/items/DefaultLongFieldItemTest.java | 114 ++
.../plc4x/java/s7/netty/Plc4XS7Protocol.java | 2 +-
pom.xml | 3 +
src/site/asciidoc/protocols/delta-v/read-data.adoc | 1655 ++++++++++++++++++++
.../protocols/delta-v/reverse-engineering.adoc | 7 +
10 files changed, 5054 insertions(+), 970 deletions(-)