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 2022/04/18 11:22:40 UTC
[plc4x] branch develop updated (843cd77a46 -> 60142132f3)
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 843cd77a46 feat(bacnet): fixed wrong calculations of length headers
add 60142132f3 chors(plc4c/plc4x): Added a first skeleton for support of the plc4x protocol to plc4c fix(plc4c): Fixed the way enums are being generated and handled
No new revisions were added by this update.
Summary of changes:
.../plc4x/language/c/CLanguageTemplateHelper.java | 6 +-
.../templates/c/complex-type-template.c.ftlh | 7 +-
.../resources/templates/c/data-io-template.c.ftlh | 6 +
.../resources/templates/c/enum-template.c.ftlh | 10 +-
.../resources/templates/c/enum-template.h.ftlh | 2 +-
plc4c/drivers/CMakeLists.txt | 1 +
plc4c/drivers/{s7 => plc4x}/CMakeLists.txt | 49 +-
.../plc4x/include/plc4c/driver_plc4x.h} | 29 +-
.../include/plc4c/driver_plc4x_encode_decode.h} | 11 +-
.../plc4x/include/plc4c/driver_plc4x_packets.h | 59 ++
.../include/plc4c/driver_plc4x_sm.h} | 20 +-
.../plc4x/include/plc4c/driver_plc4x_static.h | 20 +-
plc4c/drivers/plc4x/src/driver_plc4x.c | 62 ++
.../drivers/plc4x/src/driver_plc4x_encode_decode.c | 7 +-
plc4c/drivers/plc4x/src/driver_plc4x_packets.c | 330 +++++++++++
plc4c/drivers/plc4x/src/driver_plc4x_sm_connect.c | 143 +++++
.../src/driver_plc4x_sm_disconnect.c} | 34 +-
plc4c/drivers/plc4x/src/driver_plc4x_sm_read.c | 248 ++++++++
.../src/driver_plc4x_sm_write.c} | 151 +++--
.../drivers/plc4x/src/driver_plc4x_static.c | 8 +-
.../generated-sources/modbus/include/driver_type.h | 2 +-
.../modbus/include/modbus_data_type.h | 2 +-
.../modbus_device_information_conformity_level.h | 2 +-
.../include/modbus_device_information_level.h | 2 +-
.../modbus_device_information_more_follows.h | 2 +-
.../modbus/include/modbus_error_code.h | 2 +-
plc4c/generated-sources/modbus/src/driver_type.c | 10 +-
.../modbus/src/modbus_data_type.c | 10 +-
.../modbus_device_information_conformity_level.c | 10 +-
.../modbus/src/modbus_device_information_level.c | 10 +-
.../src/modbus_device_information_more_follows.c | 10 +-
.../modbus/src/modbus_error_code.c | 10 +-
plc4c/generated-sources/modbus/src/modbus_pdu.c | 20 +-
.../include/plc4x_constants.h} | 28 +-
.../state.h => plc4x/include/plc4x_field.h} | 32 +-
.../include/plc4x_field_request.h} | 32 +-
.../plc4x/include/plc4x_field_response.h | 60 ++
.../plc4x/include/plc4x_field_value_request.h | 62 ++
.../plc4x/include/plc4x_field_value_response.h | 64 ++
.../plc4x/include/plc4x_message.h | 115 ++++
.../plc4x/include/plc4x_request_type.h | 73 +++
.../plc4x/include/plc4x_response_code.h | 72 +++
.../plc4x/include/plc4x_return_code.h | 72 +++
.../data_item.h => plc4x/include/plc4x_value.h} | 18 +-
.../plc4x/include/plc4x_value_type.h | 86 +++
.../src/plc4x_constants.c} | 36 +-
plc4c/generated-sources/plc4x/src/plc4x_field.c | 122 ++++
.../src/plc4x_field_request.c} | 30 +-
.../plc4x/src/plc4x_field_response.c | 90 +++
.../plc4x/src/plc4x_field_value_request.c | 115 ++++
.../plc4x/src/plc4x_field_value_response.c | 132 +++++
plc4c/generated-sources/plc4x/src/plc4x_message.c | 660 +++++++++++++++++++++
.../plc4x/src/plc4x_request_type.c | 144 +++++
.../plc4x/src/plc4x_response_code.c | 138 +++++
.../plc4x/src/plc4x_return_code.c | 138 +++++
plc4c/generated-sources/plc4x/src/plc4x_value.c | 253 ++++++++
.../generated-sources/plc4x/src/plc4x_value_type.c | 222 +++++++
.../s7/include/alarm_state_type.h | 2 +-
plc4c/generated-sources/s7/include/alarm_type.h | 2 +-
.../s7/include/cotp_protocol_class.h | 2 +-
.../generated-sources/s7/include/cotp_tpdu_size.h | 2 +-
.../s7/include/cpu_subscribe_events.h | 2 +-
.../s7/include/data_transport_error_code.h | 2 +-
.../s7/include/data_transport_size.h | 2 +-
plc4c/generated-sources/s7/include/device_group.h | 2 +-
plc4c/generated-sources/s7/include/event_type.h | 2 +-
plc4c/generated-sources/s7/include/memory_area.h | 2 +-
.../s7/include/mode_transition_type.h | 2 +-
plc4c/generated-sources/s7/include/query_type.h | 2 +-
.../generated-sources/s7/include/syntax_id_type.h | 2 +-
.../s7/include/szl_module_type_class.h | 2 +-
plc4c/generated-sources/s7/include/szl_sublist.h | 2 +-
.../generated-sources/s7/include/transport_size.h | 2 +-
.../s7/src/alarm_message_ack_object_push_type.c | 4 +-
.../s7/src/alarm_message_object_ack_type.c | 4 +-
.../s7/src/alarm_message_object_push_type.c | 4 +-
.../s7/src/alarm_message_query_type.c | 8 +-
plc4c/generated-sources/s7/src/alarm_state_type.c | 10 +-
plc4c/generated-sources/s7/src/alarm_type.c | 10 +-
.../s7/src/associated_value_type.c | 8 +-
plc4c/generated-sources/s7/src/cotp_packet.c | 12 +-
plc4c/generated-sources/s7/src/cotp_parameter.c | 4 +-
.../generated-sources/s7/src/cotp_protocol_class.c | 10 +-
plc4c/generated-sources/s7/src/cotp_tpdu_size.c | 10 +-
.../s7/src/cpu_subscribe_events.c | 10 +-
.../s7/src/data_transport_error_code.c | 10 +-
.../generated-sources/s7/src/data_transport_size.c | 10 +-
plc4c/generated-sources/s7/src/device_group.c | 10 +-
plc4c/generated-sources/s7/src/event_type.c | 10 +-
plc4c/generated-sources/s7/src/memory_area.c | 10 +-
.../s7/src/mode_transition_type.c | 10 +-
plc4c/generated-sources/s7/src/query_type.c | 10 +-
plc4c/generated-sources/s7/src/s7_address.c | 4 +-
.../s7/src/s7_data_alarm_message.c | 20 +-
.../s7/src/s7_payload_user_data_item.c | 32 +-
.../s7/src/s7_var_payload_data_item.c | 10 +-
.../s7/src/s7_var_payload_status_item.c | 4 +-
plc4c/generated-sources/s7/src/syntax_id_type.c | 10 +-
plc4c/generated-sources/s7/src/szl_id.c | 8 +-
.../s7/src/szl_module_type_class.c | 10 +-
plc4c/generated-sources/s7/src/szl_sublist.c | 10 +-
plc4c/generated-sources/s7/src/transport_size.c | 10 +-
plc4c/pom.xml | 21 +
.../protocols.bacnet/ParserSerializerTestsuite.xml | Bin 480568 -> 0 bytes
.../testing/protocols/modbus/DriverTestsuite.xml | 499 ----------------
.../protocols/modbus/ParserSerializerTestsuite.xml | 240 --------
.../cmd/main/drivers/tests/modbus_driver_test.go | 2 +-
.../drivers/tests/modbus_parser_serializer_test.go | 4 +-
.../knxnetip/readwrite/model/KnxDatapoint.cs | 63 ++
.../readwrite/model/KnxDatapointMainType.cs | 246 ++++----
.../knxnetip/readwrite/model/KnxDatapointType.cs | 258 ++++----
111 files changed, 4206 insertions(+), 1530 deletions(-)
copy plc4c/drivers/{s7 => plc4x}/CMakeLists.txt (54%)
copy plc4c/{transports/tcp/include/plc4c/transport_tcp.h => drivers/plc4x/include/plc4c/driver_plc4x.h} (67%)
copy plc4c/drivers/{modbus/include/plc4c/driver_modbus_encode_decode.h => plc4x/include/plc4c/driver_plc4x_encode_decode.h} (79%)
create mode 100644 plc4c/drivers/plc4x/include/plc4c/driver_plc4x_packets.h
copy plc4c/drivers/{modbus/include/plc4c/driver_modbus_sm.h => plc4x/include/plc4c/driver_plc4x_sm.h} (66%)
copy sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/api/Buffer.java => plc4c/drivers/plc4x/include/plc4c/driver_plc4x_static.h (77%)
create mode 100644 plc4c/drivers/plc4x/src/driver_plc4x.c
copy plc4go/internal/plc4go/spi/HandlerExposer.go => plc4c/drivers/plc4x/src/driver_plc4x_encode_decode.c (86%)
create mode 100644 plc4c/drivers/plc4x/src/driver_plc4x_packets.c
create mode 100644 plc4c/drivers/plc4x/src/driver_plc4x_sm_connect.c
copy plc4c/drivers/{s7/src/driver_s7_sm_disconnect.c => plc4x/src/driver_plc4x_sm_disconnect.c} (67%)
create mode 100644 plc4c/drivers/plc4x/src/driver_plc4x_sm_read.c
copy plc4c/drivers/{s7/src/driver_s7_sm_write.c => plc4x/src/driver_plc4x_sm_write.c} (50%)
copy plc4go/cmd/main/main.go => plc4c/drivers/plc4x/src/driver_plc4x_static.c (95%)
copy plc4c/generated-sources/{s7/include/tpkt_packet.h => plc4x/include/plc4x_constants.h} (52%)
copy plc4c/generated-sources/{s7/include/state.h => plc4x/include/plc4x_field.h} (55%)
copy plc4c/generated-sources/{s7/include/date_and_time.h => plc4x/include/plc4x_field_request.h} (51%)
create mode 100644 plc4c/generated-sources/plc4x/include/plc4x_field_response.h
create mode 100644 plc4c/generated-sources/plc4x/include/plc4x_field_value_request.h
create mode 100644 plc4c/generated-sources/plc4x/include/plc4x_field_value_response.h
create mode 100644 plc4c/generated-sources/plc4x/include/plc4x_message.h
create mode 100644 plc4c/generated-sources/plc4x/include/plc4x_request_type.h
create mode 100644 plc4c/generated-sources/plc4x/include/plc4x_response_code.h
create mode 100644 plc4c/generated-sources/plc4x/include/plc4x_return_code.h
copy plc4c/generated-sources/{modbus/include/data_item.h => plc4x/include/plc4x_value.h} (61%)
create mode 100644 plc4c/generated-sources/plc4x/include/plc4x_value_type.h
copy plc4c/generated-sources/{modbus/src/modbus_constants.c => plc4x/src/plc4x_constants.c} (50%)
create mode 100644 plc4c/generated-sources/plc4x/src/plc4x_field.c
copy plc4c/generated-sources/{s7/src/s7_var_payload_status_item.c => plc4x/src/plc4x_field_request.c} (50%)
create mode 100644 plc4c/generated-sources/plc4x/src/plc4x_field_response.c
create mode 100644 plc4c/generated-sources/plc4x/src/plc4x_field_value_request.c
create mode 100644 plc4c/generated-sources/plc4x/src/plc4x_field_value_response.c
create mode 100644 plc4c/generated-sources/plc4x/src/plc4x_message.c
create mode 100644 plc4c/generated-sources/plc4x/src/plc4x_request_type.c
create mode 100644 plc4c/generated-sources/plc4x/src/plc4x_response_code.c
create mode 100644 plc4c/generated-sources/plc4x/src/plc4x_return_code.c
create mode 100644 plc4c/generated-sources/plc4x/src/plc4x_value.c
create mode 100644 plc4c/generated-sources/plc4x/src/plc4x_value_type.c
delete mode 100644 plc4go/assets/testing/protocols.bacnet/ParserSerializerTestsuite.xml
delete mode 100644 plc4go/assets/testing/protocols/modbus/DriverTestsuite.xml
delete mode 100644 plc4go/assets/testing/protocols/modbus/ParserSerializerTestsuite.xml