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/09/26 15:52:41 UTC
[plc4x] 03/10: Merge branch 'develop' of
https://github.com/apache/plc4x into Feature/ModbusDataType
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 199c7844c0f6fe0ccd0d27e122385ec5e1cd2079
Merge: 83957d3 4442cc3
Author: hutcheb <be...@gmail.com>
AuthorDate: Tue Sep 22 05:10:42 2020 -0400
Merge branch 'develop' of https://github.com/apache/plc4x into Feature/ModbusDataType
RELEASE_NOTES | 12 +-
.../BaseFreemarkerLanguageTemplateHelper.java | 4 +-
.../apache/plc4x/language/c/CLanguageOutput.java | 4 +-
.../plc4x/language/c/CLanguageTemplateHelper.java | 137 ++++--
.../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 +-
.../plugins/codegenerator/language/mspec/MSpec.g4 | 6 +-
.../definitions/DefaultDataIoTypeDefinition.java | 2 -
.../java/abeth/protocol/AbEthProtocolLogic.java | 6 +-
.../plc4x/java/ads/protocol/AdsProtocolLogic.java | 21 +-
.../plc4x/java/knxnetip/ets5/Ets5Parser.java | 21 +-
.../plc4x/java/knxnetip/ets5/model/Ets5Model.java | 8 +-
.../knxnetip/protocol/KnxNetIpProtocolLogic.java | 18 +-
.../plc4x/java/s7/readwrite/field/S7Field.java | 44 +-
.../s7/readwrite/protocol/S7ProtocolLogic.java | 24 +-
.../org/apache/plc4x/nifi/Plc4xSinkProcessor.java | 2 +-
.../apache/plc4x/nifi/Plc4xSourceProcessor.java | 2 +-
.../plc4x/java/spi/generation/ReadBuffer.java | 8 +-
.../connectionpool/PooledPlcDriverManager.java | 2 +-
pom.xml | 22 +-
.../main/resources/protocols/modbus/modbus.mspec | 2 +-
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 +-
.../{driver_modbus.h => driver_modbus_packets.h} | 21 +-
.../plc4c/{driver_modbus.h => 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 | 96 ++++
.../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 | 30 +-
.../modbus_pdu_write_file_record_response_item.c | 30 +-
.../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 +
.../data_item.h} | 27 +-
.../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 +++++
.../asciidoc/developers/release/build-tools.adoc | 36 +-
src/site/asciidoc/users/preparing-issues.adoc | 19 +
src/site/asciidoc/users/protocols/modbus.adoc | 119 ++++-
143 files changed, 5437 insertions(+), 945 deletions(-)