feat(types): remove redundant can in generic can message type

ZeniteSolar · Feb 26, 2024 · 7c698e1 · 7c698e1
1 parent 717d6ad
commit 7c698e1
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 61 deletions.
diff --git a/.semver b/.semver
@@ -1 +1 @@
-0.1.4
+0.1.5
diff --git a/can_ids.h b/can_ids.h
@@ -1,5 +1,5 @@
 // CODE GENERATED USING MAKOTEMPLATES.ORG, DO NOT EDIT.
-#define CAN_VERSION "0.1.3"
+#define CAN_VERSION "0.1.4"
 
 #include <stdint.h>
 

diff --git a/can_ids.json b/can_ids.json
@@ -1,5 +1,5 @@
 {
-    "version": "0.1.3",
+    "version": "0.1.4",
     "modules": [
         {
             "name": "GENERIC",

diff --git a/can_parser_types.h b/can_parser_types.h
@@ -1,5 +1,5 @@
 // CODE GENERATED USING MAKOTEMPLATES.ORG, DO NOT EDIT.
-#define CAN_VERSION "0.1.3"
+#define CAN_VERSION "0.1.4"
 
 #include <stdint.h>
 
@@ -1150,62 +1150,62 @@ typedef struct {
     uint8_t dlc;
     union {
         uint8_t raw[8];
-        can_generic_state_msg_t can_generic_state;
-        can_generic_generic_msg_t can_generic_generic;
-        can_mic19_state_msg_t can_mic19_state;
-        can_mic19_motor_msg_t can_mic19_motor;
-        can_mic19_pumps_msg_t can_mic19_pumps;
-        can_mic19_mppts_msg_t can_mic19_mppts;
-        can_mic19_mcs_msg_t can_mic19_mcs;
-        can_mic19_mde_msg_t can_mic19_mde;
-        can_mde22_state_msg_t can_mde22_state;
-        can_mde22_steeringbat_measurements_msg_t can_mde22_steeringbat_measurements;
-        can_mvc19_1_state_msg_t can_mvc19_1_state;
-        can_mvc19_2_state_msg_t can_mvc19_2_state;
-        can_mcc19_1_state_msg_t can_mcc19_1_state;
-        can_mcc19_1_measurements_msg_t can_mcc19_1_measurements;
-        can_mcc19_2_state_msg_t can_mcc19_2_state;
-        can_mcc19_2_measurements_msg_t can_mcc19_2_measurements;
-        can_mcc19_3_state_msg_t can_mcc19_3_state;
-        can_mcc19_3_measurements_msg_t can_mcc19_3_measurements;
-        can_mcc19_4_state_msg_t can_mcc19_4_state;
-        can_mcc19_4_measurements_msg_t can_mcc19_4_measurements;
-        can_mcc19_5_state_msg_t can_mcc19_5_state;
-        can_mcc19_5_measurements_msg_t can_mcc19_5_measurements;
-        can_mcc19_6_state_msg_t can_mcc19_6_state;
-        can_mcc19_6_measurements_msg_t can_mcc19_6_measurements;
-        can_mcb19_1_state_msg_t can_mcb19_1_state;
-        can_mcb19_1_measurements_msg_t can_mcb19_1_measurements;
-        can_mcb19_2_state_msg_t can_mcb19_2_state;
-        can_mcb19_2_measurements_msg_t can_mcb19_2_measurements;
-        can_mac22_state_msg_t can_mac22_state;
-        can_mac22_contactor_msg_t can_mac22_contactor;
-        can_mam19_state_msg_t can_mam19_state;
-        can_mam19_motor_msg_t can_mam19_motor;
-        can_mam19_contactor_msg_t can_mam19_contactor;
-        can_mab19_state_msg_t can_mab19_state;
-        can_mab19_pumps_msg_t can_mab19_pumps;
-        can_msc19_1_state_msg_t can_msc19_1_state;
-        can_msc19_1_adc_msg_t can_msc19_1_adc;
-        can_msc19_2_state_msg_t can_msc19_2_state;
-        can_msc19_2_adc_msg_t can_msc19_2_adc;
-        can_msc19_3_state_msg_t can_msc19_3_state;
-        can_msc19_3_adc_msg_t can_msc19_3_adc;
-        can_msc19_4_state_msg_t can_msc19_4_state;
-        can_msc19_4_adc_msg_t can_msc19_4_adc;
-        can_msc19_5_state_msg_t can_msc19_5_state;
-        can_msc19_5_adc_msg_t can_msc19_5_adc;
-        can_mcs19_state_msg_t can_mcs19_state;
-        can_mcs19_start_stages_msg_t can_mcs19_start_stages;
-        can_mcs19_bat_msg_t can_mcs19_bat;
-        can_mcs19_cap_msg_t can_mcs19_cap;
-        can_mt19_state_msg_t can_mt19_state;
-        can_mt19_rpm_msg_t can_mt19_rpm;
-        can_mswi19_state_msg_t can_mswi19_state;
-        can_mswi19_motor_msg_t can_mswi19_motor;
-        can_mswi19_pumps_msg_t can_mswi19_pumps;
-        can_mswi19_mppts_msg_t can_mswi19_mppts;
-        can_mswi19_mcs_msg_t can_mswi19_mcs;
+        can_generic_state_msg_t generic_state;
+        can_generic_generic_msg_t generic_generic;
+        can_mic19_state_msg_t mic19_state;
+        can_mic19_motor_msg_t mic19_motor;
+        can_mic19_pumps_msg_t mic19_pumps;
+        can_mic19_mppts_msg_t mic19_mppts;
+        can_mic19_mcs_msg_t mic19_mcs;
+        can_mic19_mde_msg_t mic19_mde;
+        can_mde22_state_msg_t mde22_state;
+        can_mde22_steeringbat_measurements_msg_t mde22_steeringbat_measurements;
+        can_mvc19_1_state_msg_t mvc19_1_state;
+        can_mvc19_2_state_msg_t mvc19_2_state;
+        can_mcc19_1_state_msg_t mcc19_1_state;
+        can_mcc19_1_measurements_msg_t mcc19_1_measurements;
+        can_mcc19_2_state_msg_t mcc19_2_state;
+        can_mcc19_2_measurements_msg_t mcc19_2_measurements;
+        can_mcc19_3_state_msg_t mcc19_3_state;
+        can_mcc19_3_measurements_msg_t mcc19_3_measurements;
+        can_mcc19_4_state_msg_t mcc19_4_state;
+        can_mcc19_4_measurements_msg_t mcc19_4_measurements;
+        can_mcc19_5_state_msg_t mcc19_5_state;
+        can_mcc19_5_measurements_msg_t mcc19_5_measurements;
+        can_mcc19_6_state_msg_t mcc19_6_state;
+        can_mcc19_6_measurements_msg_t mcc19_6_measurements;
+        can_mcb19_1_state_msg_t mcb19_1_state;
+        can_mcb19_1_measurements_msg_t mcb19_1_measurements;
+        can_mcb19_2_state_msg_t mcb19_2_state;
+        can_mcb19_2_measurements_msg_t mcb19_2_measurements;
+        can_mac22_state_msg_t mac22_state;
+        can_mac22_contactor_msg_t mac22_contactor;
+        can_mam19_state_msg_t mam19_state;
+        can_mam19_motor_msg_t mam19_motor;
+        can_mam19_contactor_msg_t mam19_contactor;
+        can_mab19_state_msg_t mab19_state;
+        can_mab19_pumps_msg_t mab19_pumps;
+        can_msc19_1_state_msg_t msc19_1_state;
+        can_msc19_1_adc_msg_t msc19_1_adc;
+        can_msc19_2_state_msg_t msc19_2_state;
+        can_msc19_2_adc_msg_t msc19_2_adc;
+        can_msc19_3_state_msg_t msc19_3_state;
+        can_msc19_3_adc_msg_t msc19_3_adc;
+        can_msc19_4_state_msg_t msc19_4_state;
+        can_msc19_4_adc_msg_t msc19_4_adc;
+        can_msc19_5_state_msg_t msc19_5_state;
+        can_msc19_5_adc_msg_t msc19_5_adc;
+        can_mcs19_state_msg_t mcs19_state;
+        can_mcs19_start_stages_msg_t mcs19_start_stages;
+        can_mcs19_bat_msg_t mcs19_bat;
+        can_mcs19_cap_msg_t mcs19_cap;
+        can_mt19_state_msg_t mt19_state;
+        can_mt19_rpm_msg_t mt19_rpm;
+        can_mswi19_state_msg_t mswi19_state;
+        can_mswi19_motor_msg_t mswi19_motor;
+        can_mswi19_pumps_msg_t mswi19_pumps;
+        can_mswi19_mppts_msg_t mswi19_mppts;
+        can_mswi19_mcs_msg_t mswi19_mcs;
     };
 } can_msg_t;
 
diff --git a/can_parser_types.h.mako b/can_parser_types.h.mako
@@ -56,7 +56,7 @@ typedef struct {
         uint8_t raw[8];
 %for module in db["modules"]:
 %for topic in module["topics"]:
-        can_${module["name"].lower()}_${topic["name"].lower()}_msg_t can_${module["name"].lower()}_${topic["name"].lower()};
+        can_${module["name"].lower()}_${topic["name"].lower()}_msg_t ${module["name"].lower()}_${topic["name"].lower()};
 %endfor
 %endfor
     };