From 4b4314e86db9267b085b0cbea1d9763348eb86c2 Mon Sep 17 00:00:00 2001 From: Andrey Date: Sun, 24 Oct 2021 12:15:53 -0400 Subject: [PATCH] generate java enum from C enum? generate both C and java from yaml? #2102 --- firmware/controllers/algo/engine_types.h | 10 ++++++---- firmware/tunerstudio/rusefi.input | 10 +++++----- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/firmware/controllers/algo/engine_types.h b/firmware/controllers/algo/engine_types.h index e23a9c0e0e..7d58cbd932 100644 --- a/firmware/controllers/algo/engine_types.h +++ b/firmware/controllers/algo/engine_types.h @@ -15,6 +15,9 @@ */ typedef enum { DEFAULT_FRANKENSO = ET_DEFAULT_FRANKENSO, + + MIATA_PROTEUS_TCU = 1, + /** * 1995 Dodge Neon * http://rusefi.com/forum/viewtopic.php?t=360 @@ -37,7 +40,6 @@ typedef enum { */ GY6_139QMB = 8, - MIATA_PROTEUS_TCU = ET_MIATA_TCU_PROTEUS, MAZDA_MIATA_NB1 = 9, UNUSED10 = 10, MRE_MIATA_NB2_MAP = ET_MRE_MIATA_NB2_MAP, @@ -165,9 +167,9 @@ UNUSED25 = 25, DODGE_RAM = 64, CITROEN_TU3JP = ET_CITROEN_TU3JP, - MRE_M111 = ET_MRE_M111, + PROTEUS_MIATA_NB2 = 67, + MRE_M111 = 68, - PROTEUS_MIATA_NB2 = ET_PROTEUS_MIATA_NB2, HELLEN_NB2 = ET_HELLEN_NB2, @@ -205,7 +207,7 @@ UNUSED25 = 25, PROTEUS_HONDA_ELEMENT_2003 = ET_PROTEUS_HONDA_ELEMENT_2003, - PROTEUS_HONDA_OBD2A = ET_PROTEUS_HONDA_OBD2A, + PROTEUS_HONDA_OBD2A = 91, PROTEUS_VAG_80_18T = ET_PROTEUS_VAG_80_18T, diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 744d54ab09..3b80939da0 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1775,13 +1775,13 @@ cmd_set_engine_type_microRusEFI_Miata_NB2_MAF = "@@TS_IO_TEST_COMMAND_char@@\x0 cmd_set_engine_type_ET_MRE_SUBARU_EJ18 = "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@ET_MRE_SUBARU_EJ18_16_hex@@" cmd_set_engine_type_microRusEFI_Defaults = "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@ET_MRE_DEFAULTS_16_hex@@" -cmd_set_engine_type_ET_MRE_M111 = "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@ET_MRE_M111_16_hex@@" +cmd_set_engine_type_ET_MRE_M111 = "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@engine_type_e_MRE_M111_16_hex@@" cmd_set_engine_type_hellen_NA6 = "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@ET_HELLEN_NA6_16_hex@@" cmd_set_engine_type_hellen_NA94 = "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@ET_HELLEN_NA94_16_hex@@" -cmd_set_engine_type_hellen_NB1_36 = "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@ET_HELLEN_NB1_36_16_hex@@" -cmd_set_engine_type_hellen_NB2_36 = "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@ET_HELLEN_NB2_36_16_hex@@" +cmd_set_engine_type_hellen_NB1_36 = "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@engine_type_e_HELLEN_NB1_36_16_hex@@" +cmd_set_engine_type_hellen_NB2_36 = "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@engine_type_e_HELLEN_NB2_36_16_hex@@" cmd_set_engine_type_hellen_nissan_121_4 = "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@ET_HELLEN_121_NISSAN_4_CYL_16_hex@@" cmd_set_engine_type_hellen_nissan_121_6 = "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@ET_HELLEN_121_NISSAN_6_CYL_16_hex@@" @@ -1810,8 +1810,8 @@ cmd_set_engine_type_Frankenso_Miata_NB2 = "@@TS_IO_TEST_COMMAND_char@@\x00\x3 cmd_set_engine_type_Proteus_M73 = "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@ET_PROTEUS_BMW_M73_16_hex@@" cmd_set_engine_type_PROTEUS_HONDA_ELEMENT_2003 = "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@ET_PROTEUS_HONDA_ELEMENT_2003_16_hex@@" cmd_set_engine_type_PROTEUS_HONDA_OBD2A = "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@ET_PROTEUS_HONDA_OBD2A_16_hex@@" -cmd_set_engine_type_PROTEUS_MIATA_NB2 = "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@ET_PROTEUS_MIATA_NB2_16_hex@@" -cmd_set_engine_type_Proteus_Miata_TCU = "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@ET_MIATA_TCU_PROTEUS_16_hex@@" +cmd_set_engine_type_PROTEUS_MIATA_NB2 = "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@engine_type_e_PROTEUS_MIATA_NB2_16_hex@@" +cmd_set_engine_type_Proteus_Miata_TCU = "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@engine_type_e_MIATA_PROTEUS_TCU_16_hex@@" ; ETB_BENCH_ENGINE = 58