This is an automated email from the ASF dual-hosted git repository. cdutz pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 04c9bf2abaa6c143d0a4cb22a983d27a46cea55e Merge: 79d81d9 023f2c0 Author: Christofer Dutz <[email protected]> AuthorDate: Mon Aug 26 10:59:37 2019 +0200 Merge branches 'develop' and 'merge-julian-branch' of https://gitbox.apache.org/repos/asf/plc4x into develop Conflicts: plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/base/connection/SerialChannelFactory.java pom.xml plc4j/drivers/ads/pom.xml | 5 - .../ads/connection/AdsSerialPlcConnectionTest.java | 4 +- plc4j/drivers/modbus/pom.xml | 5 - .../connection/ModbusSerialPlcConnectionTest.java | 4 +- plc4j/examples/hello-world-plc4x/pom.xml | 6 - plc4j/protocols/driver-bases/serial/pom.xml | 23 +- .../plc4x/java/base/connection/SerialChannel.java | 636 +++++++++++++++++++++ .../java/base/connection/SerialChannelFactory.java | 34 +- .../java/base/connection/SerialChannelHandler.java | 172 ++++++ .../base/connection/SerialPollingSelector.java | 179 ++++++ .../java/base/connection/SerialSelectionKey.java | 81 +++ .../base/connection/SerialSelectorProvider.java | 68 +++ .../java/base/connection/SerialSocketAddress.java | 36 +- .../java/base/connection/SerialSocketChannel.java | 158 +++++ .../base/connection/SerialChannelFactoryTest.java | 108 ++++ pom.xml | 12 +- sandbox/test-java-df1-driver/pom.xml | 12 +- .../org/apache/plc4x/java/df1/DF1PlcDriver.java | 1 + .../java/org/apache/plc4x/java/df1/Df1Field.java | 15 +- .../org/apache/plc4x/java/df1/fields/DataType.java | 31 +- .../plc4x/java/df1/protocol/Df1Protocol.java | 94 +-- .../plc4x/java/df1/protocol/Plc4XDf1Protocol.java | 127 +++- .../org/apache/plc4x/java/df1/util/DF1Utils.java | 68 ++- .../plc4x/protocol/df1/BenchmarkManualDf1.java | 30 +- .../apache/plc4x/protocol/df1/EndToEndTest.java | 11 +- .../developers/writing-driver/writing-driver.adoc | 57 ++ 26 files changed, 1793 insertions(+), 184 deletions(-)
