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/21 06:58:16 UTC
[plc4x] branch develop updated (659d6b8 -> 4442cc3)
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git.
from 659d6b8 Merge pull request #184 from hutcheb/Modbus/UpdateDocumentation
add fdb2a29 - Implemented most of the connection part of the S7 driver - Implemented a skeleton for the Modbus driver
add 6aa844c - Continued implementing the S7 driver
add 1adf1be PLC4X-239 - Read DTL (Date and Time) - Fixed the processing of Date and Time values when reading
add 1689d43 PLC4X-239 - Read DTL (Date and Time) - Fixed the processing of Date and Time values when reading
add d015359 - Continued implementing the read and write support
add c7a058e - Implemented the S7 address parser code
add a8e8445 Merge branch 'develop' of https://gitbox.apache.org/repos/asf/plc4x into feature/plc4c
add 28877a8 - Split up the s7 driver code into multiple files to be better manageable.
add 8d5ca5a - Cleanup and documentation.
add 90edbd9 - Updated the modbus driver to match the structure of the S7 driver.
add df4d588 - Implemented the skeleton for the modbus driver. - Resolved some naming conflicts.
add 29615ae - Fixed issues with the Docker build
add 65ef1a6 - Fixed issues with the Docker build
add 9927030 Merge branch 'develop' of https://gitbox.apache.org/repos/asf/plc4x into feature/plc4c
add 7991d4a - Working on the C S7 driver
add 001f8e3 Merge branch 'develop' of https://gitbox.apache.org/repos/asf/plc4x into feature/plc4c
add 8204eea - Fixed a bug in the C code generation of complex type arrays - Finished implementing the S7 connection part
add 7d85b71 - Got the S7 PLC identifiation working - Got the first read-requests working
add 8d1afb3 - PLC4X-207 - No registered handler found for message TPKTPacket[], , using default decode method - Communication with S7 and Modbus device hangs
add a536ba9 - Continued working on the S7 C driver
add d105ce4 Merge branch 'develop' of https://gitbox.apache.org/repos/asf/plc4x into feature/plc4c
add 24f9505 - Got a first working version of the dataIo generation working in C
add 4442cc3 Merge branch 'develop' of https://gitbox.apache.org/repos/asf/plc4x into feature/plc4c
No new revisions were added by this update.
Summary of changes:
.../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 +-
.../definitions/DefaultDataIoTypeDefinition.java | 2 -
.../plc4x/java/s7/readwrite/field/S7Field.java | 44 +-
.../s7/readwrite/protocol/S7ProtocolLogic.java | 15 +-
.../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 +-
.../modbus/include/plc4c/driver_modbus_packets.h} | 21 +-
.../modbus/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 +++
.../s7/include/plc4c/driver_s7_encode_decode.h} | 30 +-
.../drivers/s7/include/plc4c/driver_s7_packets.h | 53 +++
.../s7/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 +
.../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 +++++
.../ads/index.adoc => users/preparing-issues.adoc} | 8 +-
129 files changed, 5211 insertions(+), 874 deletions(-)
create mode 100644 build-utils/language-c/src/main/resources/templates/c/data-io-template-c.ftlh
copy build-utils/language-c/src/main/resources/templates/c/{enum-template-h.ftlh => data-io-template-h.ftlh} (50%)
copy sandbox/plc4c/{transports/dummy/include/plc4c/transport_dummy.h => drivers/modbus/include/plc4c/driver_modbus_packets.h} (53%)
copy sandbox/plc4c/{transports/dummy/include/plc4c/transport_dummy.h => drivers/modbus/include/plc4c/driver_modbus_sm.h} (52%)
copy sandbox/plc4c/{transports/dummy/include/plc4c/transport_dummy.h => drivers/modbus/include/plc4c/driver_s7_encode_decode.h} (75%)
create mode 100644 sandbox/plc4c/drivers/modbus/src/driver_modbus_encode_decode.c
create mode 100644 sandbox/plc4c/drivers/modbus/src/driver_modbus_packets.c
create mode 100644 sandbox/plc4c/drivers/modbus/src/driver_modbus_sm_connect.c
create mode 100644 sandbox/plc4c/drivers/modbus/src/driver_modbus_sm_disconnect.c
create mode 100644 sandbox/plc4c/drivers/modbus/src/driver_modbus_sm_read.c
create mode 100644 sandbox/plc4c/drivers/modbus/src/driver_modbus_sm_write.c
copy sandbox/plc4c/{api/include/plc4c/plc4c.h => drivers/s7/include/plc4c/driver_s7_encode_decode.h} (56%)
create mode 100644 sandbox/plc4c/drivers/s7/include/plc4c/driver_s7_packets.h
copy sandbox/plc4c/{transports/dummy/include/plc4c/transport_dummy.h => drivers/s7/include/plc4c/driver_s7_sm.h} (53%)
create mode 100644 sandbox/plc4c/drivers/s7/src/driver_s7_encode_decode.c
create mode 100644 sandbox/plc4c/drivers/s7/src/driver_s7_packets.c
create mode 100644 sandbox/plc4c/drivers/s7/src/driver_s7_sm_connect.c
create mode 100644 sandbox/plc4c/drivers/s7/src/driver_s7_sm_disconnect.c
create mode 100644 sandbox/plc4c/drivers/s7/src/driver_s7_sm_read.c
create mode 100644 sandbox/plc4c/drivers/s7/src/driver_s7_sm_write.c
create mode 100644 sandbox/plc4c/drivers/s7/test/s7_address_parser_test.c
copy sandbox/plc4c/generated-sources/{s7/includes/szl_module_type_class.h => modbus/include/data_item.h} (54%)
rename sandbox/plc4c/generated-sources/modbus/{includes => include}/modbus_constants.h (92%)
rename sandbox/plc4c/generated-sources/modbus/{includes => include}/modbus_pdu.h (98%)
rename sandbox/plc4c/generated-sources/modbus/{includes => include}/modbus_pdu_read_file_record_request_item.h (89%)
rename sandbox/plc4c/generated-sources/modbus/{includes => include}/modbus_pdu_read_file_record_response_item.h (89%)
rename sandbox/plc4c/generated-sources/modbus/{includes => include}/modbus_pdu_write_file_record_request_item.h (89%)
rename sandbox/plc4c/generated-sources/modbus/{includes => include}/modbus_pdu_write_file_record_response_item.h (89%)
rename sandbox/plc4c/generated-sources/modbus/{includes => include}/modbus_serial_adu.h (91%)
rename sandbox/plc4c/generated-sources/modbus/{includes => include}/modbus_tcp_adu.h (92%)
create mode 100644 sandbox/plc4c/generated-sources/modbus/src/data_item.c
rename sandbox/plc4c/generated-sources/s7/{includes => include}/cotp_packet.h (96%)
rename sandbox/plc4c/generated-sources/s7/{includes => include}/cotp_parameter.h (95%)
rename sandbox/plc4c/generated-sources/s7/{includes => include}/cotp_protocol_class.h (85%)
rename sandbox/plc4c/generated-sources/s7/{includes => include}/cotp_tpdu_size.h (87%)
copy sandbox/plc4c/generated-sources/s7/{includes/device_group.h => include/data_item.h} (55%)
rename sandbox/plc4c/generated-sources/s7/{includes => include}/data_transport_error_code.h (85%)
rename sandbox/plc4c/generated-sources/s7/{includes => include}/data_transport_size.h (86%)
rename sandbox/plc4c/generated-sources/s7/{includes => include}/device_group.h (85%)
rename sandbox/plc4c/generated-sources/s7/{includes => include}/memory_area.h (88%)
rename sandbox/plc4c/generated-sources/s7/{includes => include}/s7_address.h (95%)
rename sandbox/plc4c/generated-sources/s7/{includes => include}/s7_message.h (96%)
rename sandbox/plc4c/generated-sources/s7/{includes => include}/s7_parameter.h (96%)
rename sandbox/plc4c/generated-sources/s7/{includes => include}/s7_parameter_user_data_item.h (94%)
rename sandbox/plc4c/generated-sources/s7/{includes => include}/s7_payload.h (94%)
rename sandbox/plc4c/generated-sources/s7/{includes => include}/s7_payload_user_data_item.h (94%)
rename sandbox/plc4c/generated-sources/s7/{includes => include}/s7_var_payload_data_item.h (90%)
rename sandbox/plc4c/generated-sources/s7/{includes => include}/s7_var_payload_status_item.h (91%)
rename sandbox/plc4c/generated-sources/s7/{includes => include}/s7_var_request_parameter_item.h (94%)
rename sandbox/plc4c/generated-sources/s7/{includes => include}/szl_data_tree_item.h (92%)
rename sandbox/plc4c/generated-sources/s7/{includes => include}/szl_id.h (94%)
rename sandbox/plc4c/generated-sources/s7/{includes => include}/szl_module_type_class.h (84%)
rename sandbox/plc4c/generated-sources/s7/{includes => include}/szl_sublist.h (91%)
rename sandbox/plc4c/generated-sources/s7/{includes => include}/tpkt_packet.h (93%)
rename sandbox/plc4c/generated-sources/s7/{includes => include}/transport_size.h (93%)
create mode 100644 sandbox/plc4c/generated-sources/s7/src/data_item.c
copy src/site/asciidoc/{protocols/ads/index.adoc => users/preparing-issues.adoc} (94%)