From b9dfc327225ac8a29f89c89a90d370e7d4836daf Mon Sep 17 00:00:00 2001 From: Andrey Date: Sun, 24 Oct 2021 19:19:16 -0400 Subject: [PATCH] generate java enum from C enum? generate both C and java from yaml? #2102 --- firmware/controllers/algo/engine_types.h | 6 +++--- firmware/tunerstudio/rusefi.input | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/firmware/controllers/algo/engine_types.h b/firmware/controllers/algo/engine_types.h index 814d85bff3..701bc0d0fd 100644 --- a/firmware/controllers/algo/engine_types.h +++ b/firmware/controllers/algo/engine_types.h @@ -97,7 +97,7 @@ UNUSED25 = 25, HELLEN72_ETB = 33, - HELLEN_NA6 = ET_HELLEN_NA6, + HELLEN_NA6 = 34, CAMARO_4 = 35, @@ -154,7 +154,7 @@ UNUSED25 = 25, TLE8888_BENCH_ENGINE = 59, - MICRO_RUS_EFI = ET_MRE_DEFAULTS, + MICRO_RUS_EFI = 60, PROTEUS_DEFAULTS = 61, @@ -192,7 +192,7 @@ UNUSED25 = 25, HELLEN_154_HYUNDAI_COUPE_BK1 = ET_HELLEN_154_HYUNDAI_COUPE_BK1, HELLEN_NB1 = ET_HELLEN_NB1, // 84 - HELLEN_121_NISSAN_4_CYL = ET_HELLEN_121_NISSAN_4_CYL, + HELLEN_121_NISSAN_4_CYL = 84, HELLEN_121_NISSAN_8_CYL = 85, diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index f32176b95b..a7279a0f75 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1774,18 +1774,18 @@ 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@@engine_type_e_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_microRusEFI_Defaults = "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@engine_type_e_MICRO_RUS_EFI_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_NA6 = "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@engine_type_e_HELLEN_NA6_16_hex@@" +cmd_set_engine_type_hellen_NA94 = "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@engine_type_e_HELLEN_NA94_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@@" -cmd_set_engine_type_hellen_nissan_121_8 = "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@ET_HELLEN_121_NISSAN_8_CYL_16_hex@@" +cmd_set_engine_type_hellen_nissan_121_4 = "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@engine_type_e_HELLEN_121_NISSAN_4_CYL_16_hex@@" +cmd_set_engine_type_hellen_nissan_121_6 = "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@engine_type_e_HELLEN_121_NISSAN_6_CYL_16_hex@@" +cmd_set_engine_type_hellen_nissan_121_8 = "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@engine_type_e_HELLEN_121_NISSAN_8_CYL_16_hex@@" cmd_set_engine_type_hellen_121_vag_4 = "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@engine_type_e_HELLEN_121_VAG_4_CYL_16_hex@@" cmd_set_engine_type_hellen_121_vag_5 = "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@engine_type_e_HELLEN_121_VAG_5_CYL_16_hex@@" @@ -1801,7 +1801,7 @@ cmd_set_engine_type_hellen_couple_bk1 = "@@TS_IO_TEST_COMMAND_char cmd_set_engine_type_hellen_couple_bk2 = "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@ET_HELLEN_154_HYUNDAI_COUPE_BK2_16_hex@@" ; MIATA_NA6_MAP = 41 -cmd_set_engine_type_Frankenso_Miata_NA6_MAP = "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@ET_FRANKENSO_MIATA_NA6_16_hex@@" +cmd_set_engine_type_Frankenso_Miata_NA6_MAP = "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@engine_type_e_FRANKENSO_MIATA_NA6_MAP_16_hex@@" ; MIATA_NA6_VAF = 57 cmd_set_engine_type_Frankenso_Miata_NA6_VAF = "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@ET_FRANKENSO_MIATA_NA6_VAF_16_hex@@" ; MAZDA_MIATA_2003 = 47