You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by ot...@apache.org on 2021/01/06 21:43:09 UTC
[plc4x] 15/17: Merge branch 'develop' of
https://github.com/apache/plc4x into develop
This is an automated email from the ASF dual-hosted git repository.
otluk pushed a commit to branch feature/plc4py
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 4fd2cef485b74abf2a4e68320f91155ce505a9ca
Merge: c00bdad dc60b42
Author: ottlukas <ot...@gmail.com>
AuthorDate: Wed Oct 14 14:26:03 2020 +0200
Merge branch 'develop' of https://github.com/apache/plc4x into develop
RELEASE_NOTES | 14 +-
.../BaseFreemarkerLanguageTemplateHelper.java | 4 +-
.../apache/plc4x/language/c/CLanguageOutput.java | 4 +-
.../plc4x/language/c/CLanguageTemplateHelper.java | 136 +-
.../resources/templates/c/data-io-template-c.ftlh | 245 +++
...num-template-h.ftlh => data-io-template-h.ftlh} | 47 +-
.../resources/templates/c/enum-template-c.ftlh | 36 +-
.../resources/templates/c/enum-template-h.ftlh | 5 +
.../resources/templates/c/pojo-template-c.ftlh | 66 +-
.../resources/templates/c/pojo-template-h.ftlh | 4 +-
.../resources/templates/java/data-io-template.ftlh | 17 +-
.../resources/templates/java/pojo-template.ftlh | 93 -
.../definitions/DefaultDataIoTypeDefinition.java | 2 -
.../org/apache/plc4x/java/api/value/PlcBOOL.java | 295 ++++
.../org/apache/plc4x/java/api/value/PlcBYTE.java | 202 +++
.../apache/plc4x/java/api/value/PlcBoolean.java | 168 --
.../org/apache/plc4x/java/api/value/PlcByte.java | 168 --
.../org/apache/plc4x/java/api/value/PlcCHAR.java | 224 +++
.../org/apache/plc4x/java/api/value/PlcDINT.java | 283 +++
.../org/apache/plc4x/java/api/value/PlcDWORD.java | 205 +++
.../apache/plc4x/java/api/value/PlcIECValue.java | 77 +
.../org/apache/plc4x/java/api/value/PlcINT.java | 285 +++
.../apache/plc4x/java/api/value/PlcInteger.java | 168 --
.../org/apache/plc4x/java/api/value/PlcLINT.java | 281 +++
.../api/value/{PlcDouble.java => PlcLREAL.java} | 110 +-
.../org/apache/plc4x/java/api/value/PlcLWORD.java | 218 +++
.../org/apache/plc4x/java/api/value/PlcLong.java | 168 --
.../org/apache/plc4x/java/api/value/PlcNull.java | 5 +
.../java/api/value/{PlcFloat.java => PlcREAL.java} | 109 +-
.../org/apache/plc4x/java/api/value/PlcSINT.java | 290 ++++
.../org/apache/plc4x/java/api/value/PlcShort.java | 168 --
.../org/apache/plc4x/java/api/value/PlcUDINT.java | 314 ++++
.../org/apache/plc4x/java/api/value/PlcUINT.java | 295 ++++
.../org/apache/plc4x/java/api/value/PlcULINT.java | 326 ++++
.../org/apache/plc4x/java/api/value/PlcUSINT.java | 310 ++++
.../org/apache/plc4x/java/api/value/PlcValue.java | 2 +
.../plc4x/java/api/value/PlcValueAdapter.java | 10 +
.../org/apache/plc4x/java/api/value/PlcValues.java | 56 +-
.../org/apache/plc4x/java/api/value/PlcWCHAR.java | 205 +++
.../org/apache/plc4x/java/api/value/PlcWORD.java | 187 ++
.../java/abeth/protocol/AbEthProtocolLogic.java | 7 +-
.../java/abeth/protocol/Plc4xAbEthProtocol.java | 4 +-
.../plc4x/java/ads/field/AdsFieldHandler.java | 81 +-
.../plc4x/java/ads/protocol/AdsProtocolLogic.java | 31 +-
.../attic/protocol/util/LittleEndianDecoder.java | 62 +-
.../src/test/resources/testsuite/AdsDriverIT.xml | 12 +-
.../java/eip/readwrite/field/EipFieldHandler.java | 12 +-
.../eip/readwrite/protocol/EipProtocolLogic.java | 22 +-
.../resources/testsuite/EIPDriverTestsuite.xml | 2 +-
.../readwrite/field/FirmataFieldHandler.java | 13 +-
.../readwrite/protocol/FirmataProtocolLogic.java | 11 +-
.../java/knxnetip/field/KnxNetIpFieldHandler.java | 44 +-
.../knxnetip/protocol/KnxNetIpProtocolLogic.java | 29 +-
.../java/modbus/field/ModbusExtendedRegister.java | 22 +-
.../plc4x/java/modbus/field/ModbusField.java | 32 +-
.../plc4x/java/modbus/field/ModbusFieldCoil.java | 22 +-
.../modbus/field/ModbusFieldDiscreteInput.java | 22 +-
.../java/modbus/field/ModbusFieldHandler.java | 1813 +++++++++++++++++++-
.../modbus/field/ModbusFieldHoldingRegister.java | 22 +-
.../modbus/field/ModbusFieldInputRegister.java | 22 +-
.../java/modbus/protocol/ModbusProtocolLogic.java | 288 +++-
.../apache/plc4x/java/modbus/ModbusEncodeTest.java | 178 ++
.../plc4x/java/modbus/ModbusFieldDataTypeTest.java | 98 ++
.../apache/plc4x/java/modbus/ModbusFieldTest.java | 71 +
.../test/resources/testsuite/ModbusTestsuite.xml | 57 +
.../opcua/connection/OpcuaTcpPlcConnection.java | 26 +-
.../java/opcua/protocol/OpcuaPlcFieldHandler.java | 14 +-
.../plc4x/java/s7/readwrite/field/S7Field.java | 40 +-
.../java/s7/readwrite/field/S7PlcFieldHandler.java | 14 +-
.../s7/readwrite/protocol/S7ProtocolLogic.java | 15 +-
.../s7/src/test/resources/testsuite/S7DriverIT.xml | 2 +-
.../simulated/field/SimulatedFieldHandler.java | 14 +-
.../simulated/connection/SimulatedDeviceTest.java | 4 +-
.../watertank/service/WaterTankService.java | 4 +-
.../plc4x/edgent/PlcConnectionAdapterTest.java | 1 -
.../apache/plc4x/java/spi/generation/Message.java | 4 -
.../plc4x/java/spi/generation/ReadBuffer.java | 24 +-
.../java/spi/messages/DefaultPlcReadResponse.java | 2 +-
.../java/opm/PlcEntityManagerComplexTest.java | 4 +-
.../org/apache/plc4x/java/scraper/ScraperTest.java | 6 +-
.../triggeredscraper/TriggeredScraperImplTest.java | 16 +-
.../ads/src/main/resources/protocols/ads/ads.mspec | 60 +-
.../resources/protocols/knxnetip/knxnetip.mspec | 28 +-
.../main/resources/protocols/modbus/modbus.mspec | 139 +-
.../s7/src/main/resources/protocols/s7/s7.mspec | 30 +-
.../java/examples/helloinflux/HelloInflux.java | 22 +-
sandbox/plc4c/api/include/plc4c/connection.h | 10 +-
sandbox/plc4c/api/include/plc4c/data.h | 35 +-
sandbox/plc4c/api/include/plc4c/read.h | 1 +
sandbox/plc4c/api/include/plc4c/types.h | 7 +
sandbox/plc4c/drivers/modbus/CMakeLists.txt | 17 +-
.../drivers/modbus/include/plc4c/driver_modbus.h | 6 +-
.../include/plc4c/driver_modbus_packets.h} | 21 +-
.../include/plc4c/driver_modbus_sm.h} | 23 +-
.../include/plc4c/driver_s7_encode_decode.h} | 12 +-
sandbox/plc4c/drivers/modbus/src/driver_modbus.c | 16 +-
.../modbus/src/driver_modbus_encode_decode.c | 110 ++
.../drivers/modbus/src/driver_modbus_packets.c | 142 ++
.../drivers/modbus/src/driver_modbus_sm_connect.c | 51 +
.../modbus/src/driver_modbus_sm_disconnect.c | 74 +
.../drivers/modbus/src/driver_modbus_sm_read.c | 119 ++
.../drivers/modbus/src/driver_modbus_sm_write.c | 121 ++
sandbox/plc4c/drivers/s7/CMakeLists.txt | 11 +-
sandbox/plc4c/drivers/s7/include/plc4c/driver_s7.h | 59 +
.../include/plc4c/driver_s7_encode_decode.h} | 23 +-
.../drivers/s7/include/plc4c/driver_s7_packets.h | 53 +
.../include/plc4c/driver_s7_sm.h} | 23 +-
sandbox/plc4c/drivers/s7/src/driver_s7.c | 90 +-
.../plc4c/drivers/s7/src/driver_s7_encode_decode.c | 346 ++++
sandbox/plc4c/drivers/s7/src/driver_s7_packets.c | 524 ++++++
.../plc4c/drivers/s7/src/driver_s7_sm_connect.c | 348 ++++
.../plc4c/drivers/s7/src/driver_s7_sm_disconnect.c | 81 +
sandbox/plc4c/drivers/s7/src/driver_s7_sm_read.c | 207 +++
sandbox/plc4c/drivers/s7/src/driver_s7_sm_write.c | 122 ++
.../plc4c/drivers/s7/test/s7_address_parser_test.c | 110 ++
sandbox/plc4c/drivers/s7/test/s7_test.c | 7 +-
.../simulated/include/plc4c/driver_simulated.h | 6 +-
.../plc4c/drivers/simulated/src/driver_simulated.c | 15 +-
sandbox/plc4c/examples/hello-world/CMakeLists.txt | 11 +-
.../plc4c/examples/hello-world/src/hello_world.c | 59 +-
.../include/data_item.h} | 27 +-
.../{includes => include}/modbus_constants.h | 4 +-
.../modbus/{includes => include}/modbus_pdu.h | 4 +-
.../modbus_pdu_read_file_record_request_item.h | 4 +-
.../modbus_pdu_read_file_record_response_item.h | 4 +-
.../modbus_pdu_write_file_record_request_item.h | 4 +-
.../modbus_pdu_write_file_record_response_item.h | 4 +-
.../{includes => include}/modbus_serial_adu.h | 4 +-
.../modbus/{includes => include}/modbus_tcp_adu.h | 4 +-
.../plc4c/generated-sources/modbus/src/data_item.c | 336 ++++
.../modbus/src/modbus_constants.c | 10 +-
.../generated-sources/modbus/src/modbus_pdu.c | 341 ++--
.../src/modbus_pdu_read_file_record_request_item.c | 22 +-
.../modbus_pdu_read_file_record_response_item.c | 22 +-
.../modbus_pdu_write_file_record_request_item.c | 36 +-
.../modbus_pdu_write_file_record_response_item.c | 38 +-
.../modbus/src/modbus_serial_adu.c | 26 +-
.../generated-sources/modbus/src/modbus_tcp_adu.c | 26 +-
.../s7/{includes => include}/cotp_packet.h | 4 +-
.../s7/{includes => include}/cotp_parameter.h | 4 +-
.../s7/{includes => include}/cotp_protocol_class.h | 5 +
.../s7/{includes => include}/cotp_tpdu_size.h | 5 +
.../device_group.h => include/data_item.h} | 26 +-
.../data_transport_error_code.h | 5 +
.../s7/{includes => include}/data_transport_size.h | 5 +
.../s7/{includes => include}/device_group.h | 5 +
.../s7/{includes => include}/memory_area.h | 5 +
.../s7/{includes => include}/s7_address.h | 4 +-
.../s7/{includes => include}/s7_message.h | 4 +-
.../s7/{includes => include}/s7_parameter.h | 4 +-
.../s7_parameter_user_data_item.h | 4 +-
.../s7/{includes => include}/s7_payload.h | 4 +-
.../s7_payload_user_data_item.h | 4 +-
.../s7_var_payload_data_item.h | 4 +-
.../s7_var_payload_status_item.h | 4 +-
.../s7_var_request_parameter_item.h | 4 +-
.../s7/{includes => include}/szl_data_tree_item.h | 4 +-
.../s7/{includes => include}/szl_id.h | 4 +-
.../{includes => include}/szl_module_type_class.h | 5 +
.../s7/{includes => include}/szl_sublist.h | 5 +
.../s7/{includes => include}/tpkt_packet.h | 4 +-
.../s7/{includes => include}/transport_size.h | 5 +
.../plc4c/generated-sources/s7/src/cotp_packet.c | 94 +-
.../generated-sources/s7/src/cotp_parameter.c | 35 +-
.../generated-sources/s7/src/cotp_protocol_class.c | 46 +
.../generated-sources/s7/src/cotp_tpdu_size.c | 58 +
sandbox/plc4c/generated-sources/s7/src/data_item.c | 256 +++
.../s7/src/data_transport_error_code.c | 52 +
.../generated-sources/s7/src/data_transport_size.c | 58 +
.../plc4c/generated-sources/s7/src/device_group.c | 34 +
.../plc4c/generated-sources/s7/src/memory_area.c | 70 +
.../plc4c/generated-sources/s7/src/s7_address.c | 38 +-
.../plc4c/generated-sources/s7/src/s7_message.c | 54 +-
.../plc4c/generated-sources/s7/src/s7_parameter.c | 64 +-
.../s7/src/s7_parameter_user_data_item.c | 46 +-
.../plc4c/generated-sources/s7/src/s7_payload.c | 30 +-
.../s7/src/s7_payload_user_data_item.c | 40 +-
.../s7/src/s7_var_payload_data_item.c | 29 +-
.../s7/src/s7_var_payload_status_item.c | 10 +-
.../s7/src/s7_var_request_parameter_item.c | 18 +-
.../generated-sources/s7/src/szl_data_tree_item.c | 27 +-
sandbox/plc4c/generated-sources/s7/src/szl_id.c | 18 +-
.../s7/src/szl_module_type_class.c | 40 +
.../plc4c/generated-sources/s7/src/szl_sublist.c | 130 ++
.../plc4c/generated-sources/s7/src/tpkt_packet.c | 22 +-
.../generated-sources/s7/src/transport_size.c | 112 ++
sandbox/plc4c/spi/include/plc4c/spi/read_buffer.h | 7 +
.../plc4c/spi/include/plc4c/spi/types_private.h | 72 +-
sandbox/plc4c/spi/src/connection.c | 5 +
sandbox/plc4c/spi/src/data.c | 95 +-
sandbox/plc4c/spi/src/evaluation_helper.c | 4 +
sandbox/plc4c/spi/src/read.c | 24 +-
sandbox/plc4c/spi/src/system.c | 41 +-
sandbox/plc4c/spi/src/utils/list.c | 3 +-
sandbox/plc4c/spi/src/write.c | 9 +-
.../plc4c/transports/dummy/src/transport_dummy.c | 5 +
sandbox/plc4c/transports/serial/CMakeLists.txt | 4 +-
.../plc4c/transports/serial/src/transport_serial.c | 24 +
sandbox/plc4c/transports/tcp/CMakeLists.txt | 4 +-
.../transports/tcp/include/plc4c/transport_tcp.h | 8 +
sandbox/plc4c/transports/tcp/src/transport_tcp.c | 124 ++
.../configuration/BacNetIpConfiguration.java | 5 +-
.../plc4x/java/bacnetip/ede/model/Datapoint.java | 20 +-
.../bacnetip/protocol/BacNetIpProtocolLogic.java | 23 +-
.../plc4x/java/df1/protocol/Plc4XDf1Protocol.java | 6 +-
src/site/asciidoc/developers/team.adoc | 2 +-
src/site/asciidoc/users/preparing-issues.adoc | 19 +
src/site/asciidoc/users/protocols/modbus.adoc | 57 +-
208 files changed, 12801 insertions(+), 2292 deletions(-)