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/06/23 08:15:58 UTC
[plc4x] 01/01: Merge pull request #168 from
apache/feature/c-code-generation-tagged-unions
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 694c97ce58659e4821a5e706e2b99b42b1711f6a
Merge: 7e400de f2b9cad
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Tue Jun 23 10:15:48 2020 +0200
Merge pull request #168 from apache/feature/c-code-generation-tagged-unions
Feature/c code generation tagged unions
build-utils/language-base-freemarker/pom.xml | 5 +
.../BaseFreemarkerLanguageTemplateHelper.java | 712 +++++++++++
.../freemarker/FreemarkerLanguageOutput.java | 10 +-
build-utils/language-c/pom.xml | 5 -
.../apache/plc4x/language/c/CLanguageOutput.java | 4 +-
.../plc4x/language/c/CLanguageTemplateHelper.java | 797 ++++++++++---
.../main/resources/templates/c/enum-template.ftlh | 15 +-
.../resources/templates/c/pojo-template-c.ftlh | 614 +++++++++-
.../resources/templates/c/pojo-template-h.ftlh | 123 +-
.../plc4x/language/java/JavaLanguageOutput.java | 4 +-
.../language/java/JavaLanguageTemplateHelper.java | 170 +--
.../resources/templates/java/data-io-template.ftlh | 94 +-
.../templates/java/enum-package-info-template.ftlh | 8 +
.../resources/templates/java/enum-template.ftlh | 39 +-
.../main/resources/templates/java/io-template.ftlh | 426 ++++---
.../resources/templates/java/pojo-template.ftlh | 237 ++--
.../definitions/DefaultDataIoTypeDefinition.java | 2 +
.../model/definitions/DefaultTypeDefinition.java | 6 +
.../mspec/model/fields/DefaultSwitchField.java | 10 +-
.../mspec/parser/MessageFormatListener.java | 6 +-
.../apache/plc4x/java/s7/utils/StaticHelper.java | 6 +-
pom.xml | 2 +-
.../eip/src/main/resources/protocols/eip/eip.mspec | 4 +-
.../main/resources/protocols/firmata/firmata.mspec | 4 +-
.../resources/protocols/knxnetip/knxnetip.mspec | 4 +-
.../main/resources/protocols/modbus/modbus.mspec | 8 +-
.../s7/src/main/resources/protocols/s7/s7.mspec | 4 +-
sandbox/plc4c/api/include/plc4c/types.h | 2 +
sandbox/plc4c/api/include/plc4c/utils/list.h | 4 +
sandbox/plc4c/drivers/modbus/CMakeLists.txt | 4 +-
sandbox/plc4c/drivers/s7/CMakeLists.txt | 4 +-
.../modbus/includes/modbus_constants.h | 13 +
.../generated-sources/modbus/includes/modbus_pdu.h | 239 +++-
.../includes/modbus_pdu_diagnostic_request.h | 38 -
.../includes/modbus_pdu_diagnostic_response.h | 38 -
.../modbus/includes/modbus_pdu_error.h | 38 -
.../modbus_pdu_get_com_event_counter_request.h | 37 -
.../modbus_pdu_get_com_event_counter_response.h | 39 -
.../modbus_pdu_get_com_event_log_request.h | 37 -
.../modbus_pdu_get_com_event_log_response.h | 41 -
...odbus_pdu_mask_write_holding_register_request.h | 40 -
...dbus_pdu_mask_write_holding_register_response.h | 40 -
.../includes/modbus_pdu_read_coils_request.h | 39 -
.../includes/modbus_pdu_read_coils_response.h | 38 -
...modbus_pdu_read_device_identification_request.h | 37 -
...odbus_pdu_read_device_identification_response.h | 37 -
.../modbus_pdu_read_discrete_inputs_request.h | 39 -
.../modbus_pdu_read_discrete_inputs_response.h | 38 -
.../modbus_pdu_read_exception_status_request.h | 37 -
.../modbus_pdu_read_exception_status_response.h | 38 -
.../includes/modbus_pdu_read_fifo_queue_request.h | 38 -
.../includes/modbus_pdu_read_fifo_queue_response.h | 38 -
.../includes/modbus_pdu_read_file_record_request.h | 39 -
.../modbus_pdu_read_file_record_request_item.h | 9 +
.../modbus_pdu_read_file_record_response.h | 39 -
.../modbus_pdu_read_file_record_response_item.h | 11 +-
.../modbus_pdu_read_holding_registers_request.h | 39 -
.../modbus_pdu_read_holding_registers_response.h | 38 -
.../modbus_pdu_read_input_registers_request.h | 39 -
.../modbus_pdu_read_input_registers_response.h | 38 -
...read_write_multiple_holding_registers_request.h | 42 -
...ead_write_multiple_holding_registers_response.h | 38 -
.../includes/modbus_pdu_report_server_id_request.h | 37 -
.../modbus_pdu_report_server_id_response.h | 38 -
.../modbus_pdu_write_file_record_request.h | 39 -
.../modbus_pdu_write_file_record_request_item.h | 11 +-
.../modbus_pdu_write_file_record_response.h | 39 -
.../modbus_pdu_write_file_record_response_item.h | 11 +-
.../modbus_pdu_write_multiple_coils_request.h | 40 -
.../modbus_pdu_write_multiple_coils_response.h | 39 -
..._pdu_write_multiple_holding_registers_request.h | 40 -
...pdu_write_multiple_holding_registers_response.h | 39 -
.../modbus_pdu_write_single_coil_request.h | 39 -
.../modbus_pdu_write_single_coil_response.h | 39 -
.../modbus_pdu_write_single_register_request.h | 39 -
.../modbus_pdu_write_single_register_response.h | 39 -
.../modbus/includes/modbus_serial_adu.h | 11 +-
.../modbus/includes/modbus_tcp_adu.h | 15 +-
.../modbus/src/modbus_constants.c | 45 +-
.../generated-sources/modbus/src/modbus_pdu.c | 1238 +++++++++++++++++++-
.../modbus/src/modbus_pdu_diagnostic_request.c | 24 -
.../modbus/src/modbus_pdu_diagnostic_response.c | 24 -
.../modbus/src/modbus_pdu_error.c | 24 -
.../src/modbus_pdu_get_com_event_counter_request.c | 24 -
.../modbus_pdu_get_com_event_counter_response.c | 24 -
.../src/modbus_pdu_get_com_event_log_request.c | 24 -
.../src/modbus_pdu_get_com_event_log_response.c | 24 -
...odbus_pdu_mask_write_holding_register_request.c | 24 -
...dbus_pdu_mask_write_holding_register_response.c | 24 -
.../modbus/src/modbus_pdu_read_coils_request.c | 24 -
.../modbus/src/modbus_pdu_read_coils_response.c | 24 -
...modbus_pdu_read_device_identification_request.c | 24 -
...odbus_pdu_read_device_identification_response.c | 24 -
.../src/modbus_pdu_read_discrete_inputs_request.c | 24 -
.../src/modbus_pdu_read_discrete_inputs_response.c | 24 -
.../src/modbus_pdu_read_exception_status_request.c | 24 -
.../modbus_pdu_read_exception_status_response.c | 24 -
.../src/modbus_pdu_read_fifo_queue_request.c | 24 -
.../src/modbus_pdu_read_fifo_queue_response.c | 24 -
.../src/modbus_pdu_read_file_record_request.c | 24 -
.../src/modbus_pdu_read_file_record_request_item.c | 84 +-
.../src/modbus_pdu_read_file_record_response.c | 24 -
.../modbus_pdu_read_file_record_response_item.c | 83 +-
.../modbus_pdu_read_holding_registers_request.c | 24 -
.../modbus_pdu_read_holding_registers_response.c | 24 -
.../src/modbus_pdu_read_input_registers_request.c | 24 -
.../src/modbus_pdu_read_input_registers_response.c | 24 -
...read_write_multiple_holding_registers_request.c | 24 -
...ead_write_multiple_holding_registers_response.c | 24 -
.../src/modbus_pdu_report_server_id_request.c | 24 -
.../src/modbus_pdu_report_server_id_response.c | 24 -
.../src/modbus_pdu_write_file_record_request.c | 24 -
.../modbus_pdu_write_file_record_request_item.c | 109 +-
.../src/modbus_pdu_write_file_record_response.c | 24 -
.../modbus_pdu_write_file_record_response_item.c | 109 +-
.../src/modbus_pdu_write_multiple_coils_request.c | 24 -
.../src/modbus_pdu_write_multiple_coils_response.c | 24 -
..._pdu_write_multiple_holding_registers_request.c | 24 -
...pdu_write_multiple_holding_registers_response.c | 24 -
.../src/modbus_pdu_write_single_coil_request.c | 24 -
.../src/modbus_pdu_write_single_coil_response.c | 24 -
.../src/modbus_pdu_write_single_register_request.c | 24 -
.../modbus_pdu_write_single_register_response.c | 24 -
.../modbus/src/modbus_serial_adu.c | 105 +-
.../generated-sources/modbus/src/modbus_tcp_adu.c | 100 +-
.../generated-sources/s7/includes/cotp_packet.h | 75 +-
.../s7/includes/cotp_packet_connection_request.h | 45 -
.../s7/includes/cotp_packet_connection_response.h | 45 -
.../s7/includes/cotp_packet_data.h | 43 -
.../s7/includes/cotp_packet_disconnect_request.h | 45 -
.../s7/includes/cotp_packet_disconnect_response.h | 43 -
.../s7/includes/cotp_packet_tpdu_error.h | 43 -
.../generated-sources/s7/includes/cotp_parameter.h | 55 +-
.../s7/includes/cotp_parameter_called_tsap.h | 38 -
.../s7/includes/cotp_parameter_calling_tsap.h | 38 -
.../s7/includes/cotp_parameter_checksum.h | 38 -
...p_parameter_disconnect_additional_information.h | 38 -
.../s7/includes/cotp_parameter_tpdu_size.h | 39 -
.../generated-sources/s7/includes/cotp_tpdu_size.h | 2 +-
.../generated-sources/s7/includes/s7_address.h | 41 +-
.../generated-sources/s7/includes/s7_address_any.h | 45 -
.../generated-sources/s7/includes/s7_message.h | 57 +-
.../s7/includes/s7_message_request.h | 42 -
.../s7/includes/s7_message_response.h | 44 -
.../s7/includes/s7_message_response_data.h | 44 -
.../s7/includes/s7_message_user_data.h | 42 -
.../generated-sources/s7/includes/s7_parameter.h | 64 +-
.../s7/includes/s7_parameter_read_var_request.h | 39 -
.../s7/includes/s7_parameter_read_var_response.h | 38 -
.../s7/includes/s7_parameter_setup_communication.h | 40 -
.../s7/includes/s7_parameter_user_data.h | 39 -
.../s7/includes/s7_parameter_user_data_item.h | 41 +-
.../s7_parameter_user_data_item_cpu_functions.h | 45 -
.../s7/includes/s7_parameter_write_var_request.h | 39 -
.../s7/includes/s7_parameter_write_var_response.h | 38 -
.../generated-sources/s7/includes/s7_payload.h | 54 +-
.../s7/includes/s7_payload_read_var_response.h | 39 -
.../s7/includes/s7_payload_user_data.h | 39 -
.../s7/includes/s7_payload_user_data_item.h | 44 +-
..._user_data_item_cpu_function_read_szl_request.h | 44 -
...user_data_item_cpu_function_read_szl_response.h | 46 -
.../s7/includes/s7_payload_write_var_request.h | 39 -
.../s7/includes/s7_payload_write_var_response.h | 39 -
.../s7/includes/s7_var_payload_data_item.h | 11 +-
.../s7/includes/s7_var_payload_status_item.h | 9 +
.../s7/includes/s7_var_request_parameter_item.h | 35 +-
.../s7_var_request_parameter_item_address.h | 39 -
.../s7/includes/szl_data_tree_item.h | 11 +-
.../plc4c/generated-sources/s7/includes/szl_id.h | 9 +
.../generated-sources/s7/includes/tpkt_packet.h | 15 +-
.../plc4c/generated-sources/s7/src/cotp_packet.c | 326 +++++-
.../s7/src/cotp_packet_connection_request.c | 24 -
.../s7/src/cotp_packet_connection_response.c | 24 -
.../generated-sources/s7/src/cotp_packet_data.c | 24 -
.../s7/src/cotp_packet_disconnect_request.c | 24 -
.../s7/src/cotp_packet_disconnect_response.c | 24 -
.../s7/src/cotp_packet_tpdu_error.c | 24 -
.../generated-sources/s7/src/cotp_parameter.c | 160 ++-
.../s7/src/cotp_parameter_called_tsap.c | 24 -
.../s7/src/cotp_parameter_calling_tsap.c | 24 -
.../s7/src/cotp_parameter_checksum.c | 24 -
...p_parameter_disconnect_additional_information.c | 24 -
.../s7/src/cotp_parameter_tpdu_size.c | 24 -
.../plc4c/generated-sources/s7/src/s7_address.c | 138 ++-
.../generated-sources/s7/src/s7_address_any.c | 24 -
.../plc4c/generated-sources/s7/src/s7_message.c | 240 +++-
.../generated-sources/s7/src/s7_message_request.c | 24 -
.../generated-sources/s7/src/s7_message_response.c | 24 -
.../s7/src/s7_message_response_data.c | 24 -
.../s7/src/s7_message_user_data.c | 24 -
.../plc4c/generated-sources/s7/src/s7_parameter.c | 281 ++++-
.../s7/src/s7_parameter_read_var_request.c | 24 -
.../s7/src/s7_parameter_read_var_response.c | 24 -
.../s7/src/s7_parameter_setup_communication.c | 24 -
.../s7/src/s7_parameter_user_data.c | 24 -
.../s7/src/s7_parameter_user_data_item.c | 180 ++-
.../s7_parameter_user_data_item_cpu_functions.c | 24 -
.../s7/src/s7_parameter_write_var_request.c | 24 -
.../s7/src/s7_parameter_write_var_response.c | 24 -
.../plc4c/generated-sources/s7/src/s7_payload.c | 201 +++-
.../s7/src/s7_payload_read_var_response.c | 24 -
.../s7/src/s7_payload_user_data.c | 24 -
.../s7/src/s7_payload_user_data_item.c | 179 ++-
..._user_data_item_cpu_function_read_szl_request.c | 24 -
...user_data_item_cpu_function_read_szl_response.c | 24 -
.../s7/src/s7_payload_write_var_request.c | 24 -
.../s7/src/s7_payload_write_var_response.c | 24 -
.../s7/src/s7_var_payload_data_item.c | 118 +-
.../s7/src/s7_var_payload_status_item.c | 42 +-
.../s7/src/s7_var_request_parameter_item.c | 87 +-
.../s7/src/s7_var_request_parameter_item_address.c | 24 -
.../generated-sources/s7/src/szl_data_tree_item.c | 114 +-
sandbox/plc4c/generated-sources/s7/src/szl_id.c | 65 +-
.../plc4c/generated-sources/s7/src/tpkt_packet.c | 88 +-
.../spi/include/plc4c/spi/evaluation_helper.h | 32 +
sandbox/plc4c/spi/include/plc4c/spi/write_buffer.h | 2 +-
sandbox/plc4c/spi/src/evaluation_helper.c | 36 +
.../org/apache/plc4x/java/df1/util/DF1Utils.java | 5 +-
218 files changed, 7541 insertions(+), 5199 deletions(-)