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/05/28 15:57:44 UTC
[plc4x] branch feature/c-code-generation updated: - Fixed another
glitch in the code generation
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch feature/c-code-generation
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/feature/c-code-generation by this push:
new 3577623 - Fixed another glitch in the code generation
3577623 is described below
commit 3577623de306524bb55db8f09bba9354ace27a1f
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Thu May 28 17:57:34 2020 +0200
- Fixed another glitch in the code generation
---
.../language-c/src/main/resources/templates/c/pojo-template-h.ftlh | 2 +-
sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu.h | 2 +-
sandbox/plc4c/generated-sources/s7/includes/cotp_packet.h | 2 +-
sandbox/plc4c/generated-sources/s7/includes/cotp_parameter.h | 2 +-
sandbox/plc4c/generated-sources/s7/includes/s7_address.h | 2 +-
sandbox/plc4c/generated-sources/s7/includes/s7_message.h | 2 +-
sandbox/plc4c/generated-sources/s7/includes/s7_parameter.h | 2 +-
.../plc4c/generated-sources/s7/includes/s7_parameter_user_data_item.h | 2 +-
sandbox/plc4c/generated-sources/s7/includes/s7_payload.h | 2 +-
sandbox/plc4c/generated-sources/s7/includes/s7_payload_user_data_item.h | 2 +-
.../plc4c/generated-sources/s7/includes/s7_var_request_parameter_item.h | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/build-utils/language-c/src/main/resources/templates/c/pojo-template-h.ftlh b/build-utils/language-c/src/main/resources/templates/c/pojo-template-h.ftlh
index e68f4af..70b09b2 100644
--- a/build-utils/language-c/src/main/resources/templates/c/pojo-template-h.ftlh
+++ b/build-utils/language-c/src/main/resources/templates/c/pojo-template-h.ftlh
@@ -76,7 +76,7 @@ enum plc4c_${helper.getCTypeName(type.name)}_type {
plc4c_${helper.getCTypeName(type.name)}_type_${helper.getCTypeName(subtype.name)} = ${subtype?index};
</#list>
}
-typedef enum plc4c_${helper.getCTypeName(type.name)}_types plc4c_${helper.getCTypeName(type.name)}_types;
+typedef enum plc4c_${helper.getCTypeName(type.name)}_type plc4c_${helper.getCTypeName(type.name)}_type;
</#if>
#ifdef __cplusplus
diff --git a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu.h b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu.h
index e9fca57..c677eae 100644
--- a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu.h
+++ b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu.h
@@ -73,7 +73,7 @@ enum plc4c_modbus_read_write_modbus_pdu_type {
plc4c_modbus_read_write_modbus_pdu_type_modbus_read_write_modbus_pdu_read_device_identification_request = 37;
plc4c_modbus_read_write_modbus_pdu_type_modbus_read_write_modbus_pdu_read_device_identification_response = 38;
}
-typedef enum plc4c_modbus_read_write_modbus_pdu_types plc4c_modbus_read_write_modbus_pdu_types;
+typedef enum plc4c_modbus_read_write_modbus_pdu_type plc4c_modbus_read_write_modbus_pdu_type;
#ifdef __cplusplus
}
diff --git a/sandbox/plc4c/generated-sources/s7/includes/cotp_packet.h b/sandbox/plc4c/generated-sources/s7/includes/cotp_packet.h
index a89e2a4..cdc69a0 100644
--- a/sandbox/plc4c/generated-sources/s7/includes/cotp_packet.h
+++ b/sandbox/plc4c/generated-sources/s7/includes/cotp_packet.h
@@ -44,7 +44,7 @@ enum plc4c_s7_read_write_cotp_packet_type {
plc4c_s7_read_write_cotp_packet_type_s7_read_write_cotp_packet_disconnect_response = 4;
plc4c_s7_read_write_cotp_packet_type_s7_read_write_cotp_packet_tpdu_error = 5;
}
-typedef enum plc4c_s7_read_write_cotp_packet_types plc4c_s7_read_write_cotp_packet_types;
+typedef enum plc4c_s7_read_write_cotp_packet_type plc4c_s7_read_write_cotp_packet_type;
#ifdef __cplusplus
}
diff --git a/sandbox/plc4c/generated-sources/s7/includes/cotp_parameter.h b/sandbox/plc4c/generated-sources/s7/includes/cotp_parameter.h
index 2191e05..dcd057a 100644
--- a/sandbox/plc4c/generated-sources/s7/includes/cotp_parameter.h
+++ b/sandbox/plc4c/generated-sources/s7/includes/cotp_parameter.h
@@ -39,7 +39,7 @@ enum plc4c_s7_read_write_cotp_parameter_type {
plc4c_s7_read_write_cotp_parameter_type_s7_read_write_cotp_parameter_checksum = 3;
plc4c_s7_read_write_cotp_parameter_type_s7_read_write_cotp_parameter_disconnect_additional_information = 4;
}
-typedef enum plc4c_s7_read_write_cotp_parameter_types plc4c_s7_read_write_cotp_parameter_types;
+typedef enum plc4c_s7_read_write_cotp_parameter_type plc4c_s7_read_write_cotp_parameter_type;
#ifdef __cplusplus
}
diff --git a/sandbox/plc4c/generated-sources/s7/includes/s7_address.h b/sandbox/plc4c/generated-sources/s7/includes/s7_address.h
index acc01ea..98bcdec 100644
--- a/sandbox/plc4c/generated-sources/s7/includes/s7_address.h
+++ b/sandbox/plc4c/generated-sources/s7/includes/s7_address.h
@@ -35,7 +35,7 @@ typedef struct plc4c_s7_read_write_s7_address plc4c_s7_read_write_s7_address;
enum plc4c_s7_read_write_s7_address_type {
plc4c_s7_read_write_s7_address_type_s7_read_write_s7_address_any = 0;
}
-typedef enum plc4c_s7_read_write_s7_address_types plc4c_s7_read_write_s7_address_types;
+typedef enum plc4c_s7_read_write_s7_address_type plc4c_s7_read_write_s7_address_type;
#ifdef __cplusplus
}
diff --git a/sandbox/plc4c/generated-sources/s7/includes/s7_message.h b/sandbox/plc4c/generated-sources/s7/includes/s7_message.h
index 3d9d3ac..9092be9 100644
--- a/sandbox/plc4c/generated-sources/s7/includes/s7_message.h
+++ b/sandbox/plc4c/generated-sources/s7/includes/s7_message.h
@@ -43,7 +43,7 @@ enum plc4c_s7_read_write_s7_message_type {
plc4c_s7_read_write_s7_message_type_s7_read_write_s7_message_response_data = 2;
plc4c_s7_read_write_s7_message_type_s7_read_write_s7_message_user_data = 3;
}
-typedef enum plc4c_s7_read_write_s7_message_types plc4c_s7_read_write_s7_message_types;
+typedef enum plc4c_s7_read_write_s7_message_type plc4c_s7_read_write_s7_message_type;
#ifdef __cplusplus
}
diff --git a/sandbox/plc4c/generated-sources/s7/includes/s7_parameter.h b/sandbox/plc4c/generated-sources/s7/includes/s7_parameter.h
index 0e79a64..e7b90a4 100644
--- a/sandbox/plc4c/generated-sources/s7/includes/s7_parameter.h
+++ b/sandbox/plc4c/generated-sources/s7/includes/s7_parameter.h
@@ -40,7 +40,7 @@ enum plc4c_s7_read_write_s7_parameter_type {
plc4c_s7_read_write_s7_parameter_type_s7_read_write_s7_parameter_write_var_response = 4;
plc4c_s7_read_write_s7_parameter_type_s7_read_write_s7_parameter_user_data = 5;
}
-typedef enum plc4c_s7_read_write_s7_parameter_types plc4c_s7_read_write_s7_parameter_types;
+typedef enum plc4c_s7_read_write_s7_parameter_type plc4c_s7_read_write_s7_parameter_type;
#ifdef __cplusplus
}
diff --git a/sandbox/plc4c/generated-sources/s7/includes/s7_parameter_user_data_item.h b/sandbox/plc4c/generated-sources/s7/includes/s7_parameter_user_data_item.h
index 04f4678..130a278 100644
--- a/sandbox/plc4c/generated-sources/s7/includes/s7_parameter_user_data_item.h
+++ b/sandbox/plc4c/generated-sources/s7/includes/s7_parameter_user_data_item.h
@@ -35,7 +35,7 @@ typedef struct plc4c_s7_read_write_s7_parameter_user_data_item plc4c_s7_read_wri
enum plc4c_s7_read_write_s7_parameter_user_data_item_type {
plc4c_s7_read_write_s7_parameter_user_data_item_type_s7_read_write_s7_parameter_user_data_item_cpu_functions = 0;
}
-typedef enum plc4c_s7_read_write_s7_parameter_user_data_item_types plc4c_s7_read_write_s7_parameter_user_data_item_types;
+typedef enum plc4c_s7_read_write_s7_parameter_user_data_item_type plc4c_s7_read_write_s7_parameter_user_data_item_type;
#ifdef __cplusplus
}
diff --git a/sandbox/plc4c/generated-sources/s7/includes/s7_payload.h b/sandbox/plc4c/generated-sources/s7/includes/s7_payload.h
index 8349b9a..a738e19 100644
--- a/sandbox/plc4c/generated-sources/s7/includes/s7_payload.h
+++ b/sandbox/plc4c/generated-sources/s7/includes/s7_payload.h
@@ -38,7 +38,7 @@ enum plc4c_s7_read_write_s7_payload_type {
plc4c_s7_read_write_s7_payload_type_s7_read_write_s7_payload_write_var_response = 2;
plc4c_s7_read_write_s7_payload_type_s7_read_write_s7_payload_user_data = 3;
}
-typedef enum plc4c_s7_read_write_s7_payload_types plc4c_s7_read_write_s7_payload_types;
+typedef enum plc4c_s7_read_write_s7_payload_type plc4c_s7_read_write_s7_payload_type;
#ifdef __cplusplus
}
diff --git a/sandbox/plc4c/generated-sources/s7/includes/s7_payload_user_data_item.h b/sandbox/plc4c/generated-sources/s7/includes/s7_payload_user_data_item.h
index d22ea6a..f2792ab 100644
--- a/sandbox/plc4c/generated-sources/s7/includes/s7_payload_user_data_item.h
+++ b/sandbox/plc4c/generated-sources/s7/includes/s7_payload_user_data_item.h
@@ -43,7 +43,7 @@ enum plc4c_s7_read_write_s7_payload_user_data_item_type {
plc4c_s7_read_write_s7_payload_user_data_item_type_s7_read_write_s7_payload_user_data_item_cpu_function_read_szl_request = 0;
plc4c_s7_read_write_s7_payload_user_data_item_type_s7_read_write_s7_payload_user_data_item_cpu_function_read_szl_response = 1;
}
-typedef enum plc4c_s7_read_write_s7_payload_user_data_item_types plc4c_s7_read_write_s7_payload_user_data_item_types;
+typedef enum plc4c_s7_read_write_s7_payload_user_data_item_type plc4c_s7_read_write_s7_payload_user_data_item_type;
#ifdef __cplusplus
}
diff --git a/sandbox/plc4c/generated-sources/s7/includes/s7_var_request_parameter_item.h b/sandbox/plc4c/generated-sources/s7/includes/s7_var_request_parameter_item.h
index 1de9e33..7aaa42f 100644
--- a/sandbox/plc4c/generated-sources/s7/includes/s7_var_request_parameter_item.h
+++ b/sandbox/plc4c/generated-sources/s7/includes/s7_var_request_parameter_item.h
@@ -35,7 +35,7 @@ typedef struct plc4c_s7_read_write_s7_var_request_parameter_item plc4c_s7_read_w
enum plc4c_s7_read_write_s7_var_request_parameter_item_type {
plc4c_s7_read_write_s7_var_request_parameter_item_type_s7_read_write_s7_var_request_parameter_item_address = 0;
}
-typedef enum plc4c_s7_read_write_s7_var_request_parameter_item_types plc4c_s7_read_write_s7_var_request_parameter_item_types;
+typedef enum plc4c_s7_read_write_s7_var_request_parameter_item_type plc4c_s7_read_write_s7_var_request_parameter_item_type;
#ifdef __cplusplus
}