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 2020/10/16 13:05:38 UTC

[plc4x] 01/02: Merge branch 'develop' of https://gitbox.apache.org/repos/asf/plc4x into feature/plc4go

This is an automated email from the ASF dual-hosted git repository.

cdutz pushed a commit to branch feature/plc4go
in repository https://gitbox.apache.org/repos/asf/plc4x.git

commit 223e0eeeb47adeee54c872cf8a00192fe7a08abb
Merge: f32a987 58827f9
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Fri Oct 16 11:52:01 2020 +0200

    Merge branch 'develop' of https://gitbox.apache.org/repos/asf/plc4x into feature/plc4go

 .../language/java/JavaLanguageTemplateHelper.java  |   16 +-
 .../resources/templates/java/data-io-template.ftlh |   14 +-
 .../org/apache/plc4x/java/api/model/PlcField.java  |   16 +
 .../org/apache/plc4x/java/api/value/PlcBOOL.java   |   14 +-
 .../org/apache/plc4x/java/api/value/PlcBYTE.java   |  118 +-
 .../org/apache/plc4x/java/api/value/PlcCHAR.java   |  111 +-
 .../org/apache/plc4x/java/api/value/PlcDINT.java   |    5 -
 .../org/apache/plc4x/java/api/value/PlcDWORD.java  |  118 +-
 .../org/apache/plc4x/java/api/value/PlcINT.java    |    5 -
 .../org/apache/plc4x/java/api/value/PlcLINT.java   |    5 -
 .../org/apache/plc4x/java/api/value/PlcLREAL.java  |    5 -
 .../org/apache/plc4x/java/api/value/PlcLWORD.java  |  118 +-
 .../org/apache/plc4x/java/api/value/PlcREAL.java   |    5 -
 .../org/apache/plc4x/java/api/value/PlcSINT.java   |    5 -
 .../org/apache/plc4x/java/api/value/PlcString.java |    6 +
 .../org/apache/plc4x/java/api/value/PlcUDINT.java  |    5 -
 .../org/apache/plc4x/java/api/value/PlcUINT.java   |    5 -
 .../org/apache/plc4x/java/api/value/PlcULINT.java  |    5 -
 .../org/apache/plc4x/java/api/value/PlcUSINT.java  |    5 -
 .../org/apache/plc4x/java/api/value/PlcValues.java |  123 +-
 .../org/apache/plc4x/java/api/value/PlcWCHAR.java  |  109 +-
 .../org/apache/plc4x/java/api/value/PlcWORD.java   |  118 +-
 .../apache/plc4x/java/abeth/field/AbEthField.java  |    5 +
 .../plc4x/java/ads/field/AdsFieldHandler.java      | 1063 -----------
 .../plc4x/java/ads/field/DirectAdsField.java       |    5 +
 .../plc4x/java/ads/field/SymbolicAdsField.java     |    5 +
 .../plc4x/java/eip/readwrite/field/EipField.java   |    5 +
 .../java/eip/readwrite/field/EipFieldHandler.java  |  393 +---
 .../readwrite/field/FirmataFieldAnalog.java        |    5 +
 .../readwrite/field/FirmataFieldDigital.java       |    5 +
 .../readwrite/field/FirmataFieldHandler.java       |  104 -
 .../plc4x/java/knxnetip/field/KnxNetIpField.java   |    5 +
 .../java/knxnetip/field/KnxNetIpFieldHandler.java  |   80 -
 .../plc4x/java/knxnetip/utils/KnxHelper.java       |   11 +-
 .../apache/plc4x/java/mock/field/MockField.java    |    5 +
 .../plc4x/java/modbus/field/ModbusField.java       |    5 +
 .../java/modbus/field/ModbusFieldHandler.java      | 1839 ------------------
 .../java/modbus/protocol/ModbusProtocolLogic.java  |  337 +---
 .../apache/plc4x/java/modbus/ModbusEncodeTest.java |   13 +-
 .../plc4x/java/opcua/protocol/OpcuaField.java      |    5 +
 .../java/opcua/protocol/OpcuaPlcFieldHandler.java  |  114 --
 .../plc4x/java/opcua/OpcuaPlcDriverTest.java       |    2 +-
 .../plc4x/java/s7/readwrite/field/S7Field.java     |    4 +
 .../java/s7/readwrite/field/S7PlcFieldHandler.java |  511 -----
 .../plc4x/java/simulated/field/SimulatedField.java |    4 +
 .../simulated/field/SimulatedFieldHandler.java     |  121 +-
 .../simulated/field/SimularedFieldHandlerTest.java |   19 +-
 .../examples/helloplc4x/write/HelloPlc4xWrite.java |    8 +-
 .../spi/connection/DefaultPlcFieldHandler.java     | 1991 +++++++++++++++++++-
 .../plc4x/java/spi/generation/WriteBuffer.java     |   65 +-
 .../java/opm/PlcEntityManagerComplexTest.java      |    5 +-
 .../asciidoc/users/blogs-videos-and-slides.adoc    |    3 +
 src/site/asciidoc/users/protocols/modbus.adoc      |    1 +
 53 files changed, 3053 insertions(+), 4616 deletions(-)