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

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

commit 8b861671a4b0f2c75cdd01d86688deb04c4afc59
Merge: f8b1303 34e1177
Author: etiennerobinet <61242848+etiennerobi...@users.noreply.github.com>
AuthorDate: Fri May 15 12:38:00 2020 +0200

    Merge branch 'develop' of https://github.com/apache/plc4x into 
feature/scraper
    
     Conflicts:
       
plc4j/drivers/mock/src/main/java/org/apache/plc4x/java/mock/MockDriver.java
       plc4j/tools/scraper/pom.xml

 RELEASE_NOTES                                      |   3 +
 plc4j/drivers/ab-eth/pom.xml                       |  50 +-
 .../org/apache/plc4x/java/abeth/AbEthDriver.java   |  14 +-
 .../org/apache/plc4x/java/ads/AdsPlcDriver.java    |   2 -
 plc4j/drivers/eip/pom.xml                          |  79 ++-
 plc4j/drivers/firmata/pom.xml                      |  38 +-
 .../java/firmata/readwrite/FirmataDriver.java      |  25 +-
 .../java/firmata/readwrite/field/FirmataField.java |  14 +
 plc4j/drivers/knxnetip/pom.xml                     |  31 ++
 .../apache/plc4x/java/knxnetip/KnxNetIpDriver.java |   6 +
 .../org/apache/plc4x/java/mock/MockDriver.java     |   2 +-
 .../apache/plc4x/java/mock/field/MockField.java    |   6 +
 plc4j/drivers/modbus/pom.xml                       |  38 +-
 .../org/apache/plc4x/java/modbus/ModbusDriver.java |   9 +-
 .../plc4x/java/modbus/field/ModbusField.java       |  22 +
 plc4j/drivers/opcua/pom.xml                        |  78 ++-
 .../apache/plc4x/java/opcua/OpcuaPlcDriver.java    |   6 +
 .../plc4x/java/opcua/protocol/OpcuaField.java      |   1 -
 .../java/opcua/protocol/OpcuaPlcFieldHandler.java  |   1 -
 .../opcua/protocol/OpcuaSubsriptionHandle.java     |   1 -
 plc4j/drivers/s7/pom.xml                           |  23 +-
 plc4j/drivers/simulated/pom.xml                    |  54 +-
 .../plc4x/java/simulated/SimulatedDriver.java      |   8 +-
 plc4j/examples/hello-integration-iotdb/pom.xml     |   2 +-
 plc4j/examples/hello-webapp/pom.xml                |   2 +-
 plc4j/integrations/apache-camel/pom.xml            | 165 +++---
 plc4j/pom.xml                                      |   2 +-
 plc4j/protocols/ethernet-ip/pom.xml                | 124 -----
 .../java/ethernetip/model/EtherNetIpField.java     | 102 ----
 .../plc4x/java/ethernetip/netty/EnipCodec.java     |  58 ---
 .../ethernetip/netty/Plc4XEtherNetIpProtocol.java  | 497 ------------------
 .../netty/events/EtherNetIpConnectedEvent.java     |  22 -
 .../ethernetip/netty/util/EnipPlcFieldHandler.java | 110 ----
 .../ethernet-ip/src/site/asciidoc/index.adoc       |  80 ---
 .../site/resources/images/WAGO_enip_exporer.png    | Bin 293168 -> 0 bytes
 plc4j/protocols/pom.xml                            |   1 -
 .../SingleItemToSingleRequestProtocol.java         |   4 +-
 pom.xml                                            | 119 +----
 sandbox/code-gen/pom.xml                           |  16 +
 sandbox/plc4c/.clang-format                        | 186 +++++++
 sandbox/plc4c/.gitignore                           | 145 ++++++
 sandbox/plc4c/CMakeLists.txt                       |  54 +-
 sandbox/plc4c/CODE_CONVENTIONS.md                  |  43 ++
 sandbox/plc4c/README.md                            |  41 ++
 sandbox/plc4c/api/CMakeLists.txt                   |   9 +-
 sandbox/plc4c/api/include/plc4c/connection.h       | 313 +++++++++++
 sandbox/plc4c/api/include/plc4c/data.h             | 154 ++++++
 .../test/c/AdderTest.c => include/plc4c/plc4c.h}   |  35 +-
 sandbox/plc4c/api/include/plc4c/read.h             | 114 ++++
 sandbox/plc4c/api/include/plc4c/subscribe.h        | 259 +++++++++
 sandbox/plc4c/api/include/plc4c/system.h           | 278 ++++++++++
 sandbox/plc4c/api/include/plc4c/types.h            | 197 +++++++
 sandbox/plc4c/api/include/plc4c/utils/list.h       |  81 +++
 sandbox/plc4c/api/include/plc4c/utils/queue.h      |  60 +++
 sandbox/plc4c/api/include/plc4c/write.h            | 115 ++++
 sandbox/plc4c/api/src/main/include/plc4c.h         | 280 ----------
 sandbox/plc4c/design-guidelines.adoc               |  53 +-
 sandbox/plc4c/drivers/CMakeLists.txt               |   1 +
 sandbox/plc4c/drivers/modbus/CMakeLists.txt        |   9 +-
 .../modbus/include/plc4c/driver_modbus.h}          |  30 +-
 sandbox/plc4c/drivers/modbus/src/driver_modbus.c   |  41 ++
 .../plc4c/drivers/modbus/src/main/include/Test.h   |  19 -
 sandbox/plc4c/drivers/s7/CMakeLists.txt            |   9 +-
 .../s7/include/plc4c/driver_s7.h}                  |  15 +-
 sandbox/plc4c/drivers/s7/src/driver_s7.c           |  41 ++
 .../serial => drivers/simulated}/CMakeLists.txt    |  10 +-
 .../simulated/include/plc4c/driver_simulated.h}    |  17 +-
 .../plc4c/drivers/simulated/src/driver_simulated.c | 424 +++++++++++++++
 sandbox/plc4c/examples/CMakeLists.txt              |   1 +
 .../CMakeLists.txt                                 |  11 +-
 .../hello-subsciptions/src/hello_subscriptions.c   | 285 ++++++++++
 sandbox/plc4c/examples/hello-world/CMakeLists.txt  |  11 +-
 .../plc4c/examples/hello-world/src/hello_world.c   | 337 ++++++++++++
 .../examples/hello-world/src/main/c/hello_world.c  |  71 ---
 .../integrations/apache-mynewt/CMakeLists.txt      |   2 +-
 sandbox/plc4c/pom.xml                              | 577 +++++++++++----------
 sandbox/plc4c/spi/CMakeLists.txt                   |  18 +-
 .../plc4c/spi/system_private.h}                    |  26 +-
 .../plc4c/spi/include/plc4c/spi/types_private.h    | 301 +++++++++++
 sandbox/plc4c/spi/src/connection.c                 | 277 ++++++++++
 sandbox/plc4c/spi/src/data.c                       | 183 +++++++
 sandbox/plc4c/spi/src/main/c/plc4c.c               | 100 ----
 sandbox/plc4c/spi/src/read.c                       | 108 ++++
 sandbox/plc4c/spi/src/subscribe.c                  | 344 ++++++++++++
 sandbox/plc4c/spi/src/system.c                     | 488 +++++++++++++++++
 sandbox/plc4c/spi/src/types.c                      | 147 ++++++
 sandbox/plc4c/spi/src/utils/list.c                 | 189 +++++++
 sandbox/plc4c/spi/src/utils/queue.c                |  73 +++
 sandbox/plc4c/spi/src/write.c                      | 116 +++++
 sandbox/plc4c/spi/test/system_test.c               |  97 ++++
 sandbox/plc4c/transports/CMakeLists.txt            |   1 +
 .../transports/{serial => dummy}/CMakeLists.txt    |  10 +-
 .../dummy/include/plc4c/transport_dummy.h}         |  28 +-
 .../dummy/src/transport_dummy.c}                   |  10 +
 sandbox/plc4c/transports/serial/CMakeLists.txt     |  10 +-
 .../serial/include/plc4c/transport_serial.h}       |  28 +-
 .../serial/src/transport_serial.c}                 |  10 +
 sandbox/plc4c/transports/tcp/CMakeLists.txt        |  10 +-
 .../tcp/include/plc4c/transport_tcp.h}             |  28 +-
 .../Test.c => transports/tcp/src/transport_tcp.c}  |  10 +
 sandbox/plc4cpp/examples/CMakeLists.txt            |   2 +-
 src/main/script/preSiteGeneration.groovy           |  71 +++
 src/main/script/prerequisiteCheck.groovy           | 189 +++----
 .../asciidoc/developers/preparing/windows.adoc     |  22 +
 src/site/asciidoc/developers/release/release.adoc  |   2 -
 src/site/asciidoc/users/users.adoc                 |  43 ++
 106 files changed, 6768 insertions(+), 2316 deletions(-)


Reply via email to