[incubator-plc4x] branch master updated (474a95e -> a643829)

[sr...@apache.org]

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

sruehl pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git.


    from 474a95e  Added missing Apache header.
     add 88ddd90  added initial integration of https://github.com/digitalpetri/modbus
     add 0d37f46  added basic manual test for Modbus
     add 295a5e9  MODBUS: fixed patterns and aligned them on ADS
     add 0db64c8  fix dependency problems
     add 5330bcd  ignore the tcp dependency for now
     add 948bbba  fix build
     add ae4e81b  use combine children attribute to merge ignored dependencies
     add 3b5fd72  added some logging
     add 6f222f0  added possibility to supply port to modbus
     add 3560f75  set test logging to trace for now
     add 1ee4886  modbus bugfix don't wait for session complete
     add 807afb5  MODBUS: fixing matchers don't match
     add 5241986  modbus: fix netty read mockup
     add 7920c4f  modbus test display byte[]
     add e2e735e  fix build
     add 920a96f  modbus: fixed typo in addressing
     add a643829  modbus consume error messages

No new revisions were added by this update.

Summary of changes:
 plc4j/protocols/modbus/pom.xml                     |  55 ++++++-
 .../apache/plc4x/java/modbus/ModbusPlcDriver.java  |  25 ++--
 .../modbus/connection/BaseModbusPlcConnection.java |  35 +++--
 .../connection/ModbusSerialPlcConnection.java      |  18 +--
 .../modbus/connection/ModbusTcpPlcConnection.java  |  24 +--
 .../model/MaskWriteRegisterModbusAddress.java      |  88 +++++++++++
 .../plc4x/java/modbus/model/ModbusAddress.java     |  42 +++++-
 .../java/modbus/model/MultiModbusAddress.java}     |  54 +++----
 .../java/modbus/model/ReadCoilsModbusAddress.java  |  44 ++++++
 .../model/ReadDiscreteInputsModbusAddress.java     |  43 ++++++
 .../model/ReadHoldingRegistersModbusAddress.java   |  43 ++++++
 .../model/ReadInputRegistersModbusAddress.java     |  43 ++++++
 .../model/WriteMultipleCoilsModbusAddress.java     |  44 ++++++
 .../model/WriteMultipleRegistersModbusAddress.java |  43 ++++++
 .../model/WriteSingleCoilModbusAddress.java}       |  27 ++--
 .../model/WriteSingleRegisterModbusAddress.java}   |  27 ++--
 .../plc4x/java/modbus/netty/ModbusProtocol.java    |  40 -----
 .../java/modbus/netty/ModbusSerialProtocol.java    |  39 -----
 .../plc4x/java/modbus/netty/ModbusTcpProtocol.java |  39 -----
 .../java/modbus/netty/Plc4XModbusProtocol.java     | 166 +++++++++++++++++++--
 .../java/modbus/netty/model/ModbusMessage.java     |  22 ---
 .../plc4x/java/modbus/ManualPlc4XModbusTest.java}  |  34 ++---
 .../main => modbus/src/test}/resources/logback.xml |   6 +-
 23 files changed, 723 insertions(+), 278 deletions(-)
 create mode 100644 plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/MaskWriteRegisterModbusAddress.java
 copy plc4j/{api/src/main/java/org/apache/plc4x/java/api/messages/PlcProprietaryRequest.java => protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/MultiModbusAddress.java} (51%)
 create mode 100644 plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadCoilsModbusAddress.java
 create mode 100644 plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadDiscreteInputsModbusAddress.java
 create mode 100644 plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadHoldingRegistersModbusAddress.java
 create mode 100644 plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadInputRegistersModbusAddress.java
 create mode 100644 plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/WriteMultipleCoilsModbusAddress.java
 create mode 100644 plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/WriteMultipleRegistersModbusAddress.java
 copy plc4j/protocols/{ads/src/test/java/org/apache/plc4x/java/ads/api/commands/types/DeviceTest.java => modbus/src/main/java/org/apache/plc4x/java/modbus/model/WriteSingleCoilModbusAddress.java} (52%)
 copy plc4j/protocols/{ads/src/test/java/org/apache/plc4x/java/ads/api/commands/types/DeviceTest.java => modbus/src/main/java/org/apache/plc4x/java/modbus/model/WriteSingleRegisterModbusAddress.java} (51%)
 delete mode 100644 plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/netty/ModbusProtocol.java
 delete mode 100644 plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/netty/ModbusSerialProtocol.java
 delete mode 100644 plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/netty/ModbusTcpProtocol.java
 delete mode 100644 plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/netty/model/ModbusMessage.java
 copy plc4j/protocols/{ads/src/test/java/org/apache/plc4x/java/ads/ManualPlc4XAdsTest.java => modbus/src/test/java/org/apache/plc4x/java/modbus/ManualPlc4XModbusTest.java} (58%)
 copy plc4j/protocols/{benchmarks/src/main => modbus/src/test}/resources/logback.xml (84%)