splitting enum header

only:uaefi

firmware/controllers/algo/algo.mk

@@ -4,6 +4,7 @@ CONTROLLERS_ALGO_SRC_CPP = $(PROJECT_DIR)/controllers/algo/advance_map.cpp \
 	$(GENERATED_ENUMS_DIR)/auto_generated_enums.cpp \
 	$(GENERATED_ENUMS_DIR)/auto_generated_commonenum.cpp \
 	$(GENERATED_ENUMS_DIR)/auto_generated_enginetypes.cpp \
+	$(GENERATED_ENUMS_DIR)/auto_generated_engine_type_e.cpp \
 	$(PROJECT_DIR)/controllers/algo/fuel_math.cpp \
 	$(PROJECT_DIR)/controllers/algo/accel_enrichment.cpp \
 	$(PROJECT_DIR)/controllers/algo/wall_fuel.cpp \

firmware/controllers/algo/auto_generated_engine_type_e.cpp

@@ -0,0 +1,242 @@
+#include "global.h"
+#include "engine_type_e.h"
+// was generated automatically by rusEFI tool  from engine_type_e.h // by enum_to_string.jar tool on Mon Oct 07 14:49:42 EDT 2024
+// see also gen_config_and_enums.bat
+
+
+
+const char *getEngine_type_e(engine_type_e value){
+switch(value) {
+case engine_type_e::BMW_M52:
+  return "BMW_M52";
+case engine_type_e::BMW_M73_MRE:
+  return "BMW_M73_MRE";
+case engine_type_e::BMW_M73_MRE_SLAVE:
+  return "BMW_M73_MRE_SLAVE";
+case engine_type_e::DEFAULT_FRANKENSO:
+  return "DEFAULT_FRANKENSO";
+case engine_type_e::DISCOVERY_PDM:
+  return "DISCOVERY_PDM";
+case engine_type_e::DODGE_NEON_1995:
+  return "DODGE_NEON_1995";
+case engine_type_e::DODGE_NEON_2003_CRANK:
+  return "DODGE_NEON_2003_CRANK";
+case engine_type_e::DODGE_RAM:
+  return "DODGE_RAM";
+case engine_type_e::EEPROM_BENCH_ENGINE:
+  return "EEPROM_BENCH_ENGINE";
+case engine_type_e::ETB_BENCH_ENGINE:
+  return "ETB_BENCH_ENGINE";
+case engine_type_e::ET_AUX_0:
+  return "ET_AUX_0";
+case engine_type_e::ET_AUX_1:
+  return "ET_AUX_1";
+case engine_type_e::ET_AUX_2:
+  return "ET_AUX_2";
+case engine_type_e::ET_AUX_3:
+  return "ET_AUX_3";
+case engine_type_e::ET_AUX_4:
+  return "ET_AUX_4";
+case engine_type_e::ET_AUX_5:
+  return "ET_AUX_5";
+case engine_type_e::ET_AUX_6:
+  return "ET_AUX_6";
+case engine_type_e::ET_AUX_7:
+  return "ET_AUX_7";
+case engine_type_e::ET_BOSCH_QUICK_START:
+  return "ET_BOSCH_QUICK_START";
+case engine_type_e::ET_LAST_UNUSED:
+  return "ET_LAST_UNUSED";
+case engine_type_e::ET_TEST_WITH_BOSCH_QUICK_START:
+  return "ET_TEST_WITH_BOSCH_QUICK_START";
+case engine_type_e::ET_UNUSED_55:
+  return "ET_UNUSED_55";
+case engine_type_e::ET_UNUSED_56:
+  return "ET_UNUSED_56";
+case engine_type_e::FERRARI_F136:
+  return "FERRARI_F136";
+case engine_type_e::FORD_ASPIRE_1996:
+  return "FORD_ASPIRE_1996";
+case engine_type_e::FORD_COYOTE:
+  return "FORD_COYOTE";
+case engine_type_e::FORD_ESCORT_GT:
+  return "FORD_ESCORT_GT";
+case engine_type_e::FORD_INLINE_6_1995:
+  return "FORD_INLINE_6_1995";
+case engine_type_e::FRANKENSO_BMW_M73_F:
+  return "FRANKENSO_BMW_M73_F";
+case engine_type_e::FRANKENSO_MIATA_NA6_MAP:
+  return "FRANKENSO_MIATA_NA6_MAP";
+case engine_type_e::FRANKENSO_TEST_33810:
+  return "FRANKENSO_TEST_33810";
+case engine_type_e::FUEL_BENCH:
+  return "FUEL_BENCH";
+case engine_type_e::GM_SBC:
+  return "GM_SBC";
+case engine_type_e::GY6_139QMB:
+  return "GY6_139QMB";
+case engine_type_e::HARLEY:
+  return "HARLEY";
+case engine_type_e::HELLEN_121_NISSAN_4_CYL:
+  return "HELLEN_121_NISSAN_4_CYL";
+case engine_type_e::HELLEN_121_NISSAN_6_CYL:
+  return "HELLEN_121_NISSAN_6_CYL";
+case engine_type_e::HELLEN_121_NISSAN_8_CYL:
+  return "HELLEN_121_NISSAN_8_CYL";
+case engine_type_e::HELLEN_121_NISSAN_ALMERA_N16:
+  return "HELLEN_121_NISSAN_ALMERA_N16";
+case engine_type_e::HELLEN_121_VAG_4_CYL:
+  return "HELLEN_121_VAG_4_CYL";
+case engine_type_e::HELLEN_121_VAG_8_CYL:
+  return "HELLEN_121_VAG_8_CYL";
+case engine_type_e::HELLEN_121_VAG_V6_CYL:
+  return "HELLEN_121_VAG_V6_CYL";
+case engine_type_e::HELLEN_121_VAG_VR6_CYL:
+  return "HELLEN_121_VAG_VR6_CYL";
+case engine_type_e::HELLEN_128_MERCEDES_4_CYL:
+  return "HELLEN_128_MERCEDES_4_CYL";
+case engine_type_e::HELLEN_128_MERCEDES_6_CYL:
+  return "HELLEN_128_MERCEDES_6_CYL";
+case engine_type_e::HELLEN_128_MERCEDES_8_CYL:
+  return "HELLEN_128_MERCEDES_8_CYL";
+case engine_type_e::HELLEN_154_HYUNDAI_COUPE_BK1:
+  return "HELLEN_154_HYUNDAI_COUPE_BK1";
+case engine_type_e::HELLEN_154_HYUNDAI_COUPE_BK2:
+  return "HELLEN_154_HYUNDAI_COUPE_BK2";
+case engine_type_e::HELLEN_154_VAG:
+  return "HELLEN_154_VAG";
+case engine_type_e::HELLEN_2CHAN_STIM_QC:
+  return "HELLEN_2CHAN_STIM_QC";
+case engine_type_e::HELLEN_4CHAN_STIM_QC:
+  return "HELLEN_4CHAN_STIM_QC";
+case engine_type_e::HELLEN_HONDA_BCM:
+  return "HELLEN_HONDA_BCM";
+case engine_type_e::HONDA_600:
+  return "HONDA_600";
+case engine_type_e::HONDA_K:
+  return "HONDA_K";
+case engine_type_e::HONDA_OBD1:
+  return "HONDA_OBD1";
+case engine_type_e::HONDA_OBD2A:
+  return "HONDA_OBD2A";
+case engine_type_e::HYUNDAI_PB:
+  return "HYUNDAI_PB";
+case engine_type_e::L9779_BENCH_ENGINE:
+  return "L9779_BENCH_ENGINE";
+case engine_type_e::MAVERICK_X3:
+  return "MAVERICK_X3";
+case engine_type_e::MAZDA_MIATA_NA6:
+  return "MAZDA_MIATA_NA6";
+case engine_type_e::MAZDA_MIATA_NA94:
+  return "MAZDA_MIATA_NA94";
+case engine_type_e::MAZDA_MIATA_NA96:
+  return "MAZDA_MIATA_NA96";
+case engine_type_e::MAZDA_MIATA_NB1:
+  return "MAZDA_MIATA_NB1";
+case engine_type_e::MAZDA_MIATA_NB2:
+  return "MAZDA_MIATA_NB2";
+case engine_type_e::MAZDA_MIATA_NB2_36:
+  return "MAZDA_MIATA_NB2_36";
+case engine_type_e::MAZDA_MIATA_NC:
+  return "MAZDA_MIATA_NC";
+case engine_type_e::ME17_9_MISC:
+  return "ME17_9_MISC";
+case engine_type_e::MERCEDES_M111:
+  return "MERCEDES_M111";
+case engine_type_e::MIATA_PROTEUS_TCU:
+  return "MIATA_PROTEUS_TCU";
+case engine_type_e::MINIMAL_PINS:
+  return "MINIMAL_PINS";
+case engine_type_e::MITSUBISHI_3A92:
+  return "MITSUBISHI_3A92";
+case engine_type_e::MITSUBISHI_4G93:
+  return "MITSUBISHI_4G93";
+case engine_type_e::MRE_BOARD_NEW_TEST:
+  return "MRE_BOARD_NEW_TEST";
+case engine_type_e::MRE_BODY_CONTROL:
+  return "MRE_BODY_CONTROL";
+case engine_type_e::MRE_SECONDARY_CAN:
+  return "MRE_SECONDARY_CAN";
+case engine_type_e::MRE_SUBARU_EJ18:
+  return "MRE_SUBARU_EJ18";
+case engine_type_e::MRE_VW_B6:
+  return "MRE_VW_B6";
+case engine_type_e::NISSAN_PRIMERA:
+  return "NISSAN_PRIMERA";
+case engine_type_e::POLARIS:
+  return "POLARIS";
+case engine_type_e::POLARIS_RZR:
+  return "POLARIS_RZR";
+case engine_type_e::PROTEUS_ANALOG_PWM_TEST:
+  return "PROTEUS_ANALOG_PWM_TEST";
+case engine_type_e::PROTEUS_BMW_M73:
+  return "PROTEUS_BMW_M73";
+case engine_type_e::PROTEUS_GM_LS_4:
+  return "PROTEUS_GM_LS_4";
+case engine_type_e::PROTEUS_LUA_DEMO:
+  return "PROTEUS_LUA_DEMO";
+case engine_type_e::PROTEUS_NISSAN_VQ35:
+  return "PROTEUS_NISSAN_VQ35";
+case engine_type_e::PROTEUS_QC_TEST_BOARD:
+  return "PROTEUS_QC_TEST_BOARD";
+case engine_type_e::PROTEUS_STIM_QC:
+  return "PROTEUS_STIM_QC";
+case engine_type_e::PROTEUS_VW_B6:
+  return "PROTEUS_VW_B6";
+case engine_type_e::SACHS:
+  return "SACHS";
+case engine_type_e::SIMULATOR_CONFIG:
+  return "SIMULATOR_CONFIG";
+case engine_type_e::SUBARU_EG33:
+  return "SUBARU_EG33";
+case engine_type_e::TCU_4R70W:
+  return "TCU_4R70W";
+case engine_type_e::TEST_100:
+  return "TEST_100";
+case engine_type_e::TEST_101:
+  return "TEST_101";
+case engine_type_e::TEST_33816:
+  return "TEST_33816";
+case engine_type_e::TEST_CRANK_ENGINE:
+  return "TEST_CRANK_ENGINE";
+case engine_type_e::TEST_DC_WASTEGATE_DISCOVERY:
+  return "TEST_DC_WASTEGATE_DISCOVERY";
+case engine_type_e::TEST_ENGINE:
+  return "TEST_ENGINE";
+case engine_type_e::TEST_ENGINE_VVT:
+  return "TEST_ENGINE_VVT";
+case engine_type_e::TEST_ISSUE_366_BOTH:
+  return "TEST_ISSUE_366_BOTH";
+case engine_type_e::TEST_ISSUE_366_RISE:
+  return "TEST_ISSUE_366_RISE";
+case engine_type_e::TEST_ISSUE_6451:
+  return "TEST_ISSUE_6451";
+case engine_type_e::TEST_ROTARY:
+  return "TEST_ROTARY";
+case engine_type_e::TOYOTA_1NZ_FE:
+  return "TOYOTA_1NZ_FE";
+case engine_type_e::TOYOTA_2JZ_GTE_VVTi:
+  return "TOYOTA_2JZ_GTE_VVTi";
+case engine_type_e::UNUSED102:
+  return "UNUSED102";
+case engine_type_e::UNUSED47:
+  return "UNUSED47";
+case engine_type_e::UNUSED49:
+  return "UNUSED49";
+case engine_type_e::UNUSED67:
+  return "UNUSED67";
+case engine_type_e::UNUSED94:
+  return "UNUSED94";
+case engine_type_e::UNUSED_65:
+  return "UNUSED_65";
+case engine_type_e::UNUSED_97:
+  return "UNUSED_97";
+case engine_type_e::VAG_5_CYL:
+  return "VAG_5_CYL";
+case engine_type_e::VW_ABA:
+  return "VW_ABA";
+case engine_type_e::WASTEGATE_PROTEUS_TEST:
+  return "WASTEGATE_PROTEUS_TEST";
+  }
+ return NULL;
+}

firmware/controllers/algo/auto_generated_engine_type_e.h

@@ -0,0 +1,10 @@
+// was generated automatically by rusEFI tool  from engine_type_e.h // by enum_to_string.jar tool on Mon Oct 07 14:49:42 EDT 2024
+// see also gen_config_and_enums.bat
+
+
+
+#include "engine_type_e.h"
+#pragma once
+#if __cplusplus
+const char *getEngine_type_e(engine_type_e value);
+#endif //__cplusplus

firmware/controllers/algo/auto_generated_enginetypes.cpp

@@ -1,6 +1,6 @@
 #include "global.h"
 #include "engine_types.h"
-// was generated automatically by rusEFI tool  from engine_types.h // by enum_to_string.jar tool on Mon Oct 07 17:37:56 UTC 2024
+// was generated automatically by rusEFI tool  from engine_types.h // by enum_to_string.jar tool on Mon Oct 07 14:49:42 EDT 2024
 // see also gen_config_and_enums.bat
 
 
@@ -173,241 +173,6 @@ case UNUSED23:
   }
  return NULL;
 }
-const char *getEngine_type_e(engine_type_e value){
-switch(value) {
-case engine_type_e::BMW_M52:
-  return "BMW_M52";
-case engine_type_e::BMW_M73_MRE:
-  return "BMW_M73_MRE";
-case engine_type_e::BMW_M73_MRE_SLAVE:
-  return "BMW_M73_MRE_SLAVE";
-case engine_type_e::DEFAULT_FRANKENSO:
-  return "DEFAULT_FRANKENSO";
-case engine_type_e::DISCOVERY_PDM:
-  return "DISCOVERY_PDM";
-case engine_type_e::DODGE_NEON_1995:
-  return "DODGE_NEON_1995";
-case engine_type_e::DODGE_NEON_2003_CRANK:
-  return "DODGE_NEON_2003_CRANK";
-case engine_type_e::DODGE_RAM:
-  return "DODGE_RAM";
-case engine_type_e::EEPROM_BENCH_ENGINE:
-  return "EEPROM_BENCH_ENGINE";
-case engine_type_e::ETB_BENCH_ENGINE:
-  return "ETB_BENCH_ENGINE";
-case engine_type_e::ET_AUX_0:
-  return "ET_AUX_0";
-case engine_type_e::ET_AUX_1:
-  return "ET_AUX_1";
-case engine_type_e::ET_AUX_2:
-  return "ET_AUX_2";
-case engine_type_e::ET_AUX_3:
-  return "ET_AUX_3";
-case engine_type_e::ET_AUX_4:
-  return "ET_AUX_4";
-case engine_type_e::ET_AUX_5:
-  return "ET_AUX_5";
-case engine_type_e::ET_AUX_6:
-  return "ET_AUX_6";
-case engine_type_e::ET_AUX_7:
-  return "ET_AUX_7";
-case engine_type_e::ET_BOSCH_QUICK_START:
-  return "ET_BOSCH_QUICK_START";
-case engine_type_e::ET_LAST_UNUSED:
-  return "ET_LAST_UNUSED";
-case engine_type_e::ET_TEST_WITH_BOSCH_QUICK_START:
-  return "ET_TEST_WITH_BOSCH_QUICK_START";
-case engine_type_e::ET_UNUSED_55:
-  return "ET_UNUSED_55";
-case engine_type_e::ET_UNUSED_56:
-  return "ET_UNUSED_56";
-case engine_type_e::FERRARI_F136:
-  return "FERRARI_F136";
-case engine_type_e::FORD_ASPIRE_1996:
-  return "FORD_ASPIRE_1996";
-case engine_type_e::FORD_COYOTE:
-  return "FORD_COYOTE";
-case engine_type_e::FORD_ESCORT_GT:
-  return "FORD_ESCORT_GT";
-case engine_type_e::FORD_INLINE_6_1995:
-  return "FORD_INLINE_6_1995";
-case engine_type_e::FRANKENSO_BMW_M73_F:
-  return "FRANKENSO_BMW_M73_F";
-case engine_type_e::FRANKENSO_MIATA_NA6_MAP:
-  return "FRANKENSO_MIATA_NA6_MAP";
-case engine_type_e::FRANKENSO_TEST_33810:
-  return "FRANKENSO_TEST_33810";
-case engine_type_e::FUEL_BENCH:
-  return "FUEL_BENCH";
-case engine_type_e::GM_SBC:
-  return "GM_SBC";
-case engine_type_e::GY6_139QMB:
-  return "GY6_139QMB";
-case engine_type_e::HARLEY:
-  return "HARLEY";
-case engine_type_e::HELLEN_121_NISSAN_4_CYL:
-  return "HELLEN_121_NISSAN_4_CYL";
-case engine_type_e::HELLEN_121_NISSAN_6_CYL:
-  return "HELLEN_121_NISSAN_6_CYL";
-case engine_type_e::HELLEN_121_NISSAN_8_CYL:
-  return "HELLEN_121_NISSAN_8_CYL";
-case engine_type_e::HELLEN_121_NISSAN_ALMERA_N16:
-  return "HELLEN_121_NISSAN_ALMERA_N16";
-case engine_type_e::HELLEN_121_VAG_4_CYL:
-  return "HELLEN_121_VAG_4_CYL";
-case engine_type_e::HELLEN_121_VAG_8_CYL:
-  return "HELLEN_121_VAG_8_CYL";
-case engine_type_e::HELLEN_121_VAG_V6_CYL:
-  return "HELLEN_121_VAG_V6_CYL";
-case engine_type_e::HELLEN_121_VAG_VR6_CYL:
-  return "HELLEN_121_VAG_VR6_CYL";
-case engine_type_e::HELLEN_128_MERCEDES_4_CYL:
-  return "HELLEN_128_MERCEDES_4_CYL";
-case engine_type_e::HELLEN_128_MERCEDES_6_CYL:
-  return "HELLEN_128_MERCEDES_6_CYL";
-case engine_type_e::HELLEN_128_MERCEDES_8_CYL:
-  return "HELLEN_128_MERCEDES_8_CYL";
-case engine_type_e::HELLEN_154_HYUNDAI_COUPE_BK1:
-  return "HELLEN_154_HYUNDAI_COUPE_BK1";
-case engine_type_e::HELLEN_154_HYUNDAI_COUPE_BK2:
-  return "HELLEN_154_HYUNDAI_COUPE_BK2";
-case engine_type_e::HELLEN_154_VAG:
-  return "HELLEN_154_VAG";
-case engine_type_e::HELLEN_2CHAN_STIM_QC:
-  return "HELLEN_2CHAN_STIM_QC";
-case engine_type_e::HELLEN_4CHAN_STIM_QC:
-  return "HELLEN_4CHAN_STIM_QC";
-case engine_type_e::HELLEN_HONDA_BCM:
-  return "HELLEN_HONDA_BCM";
-case engine_type_e::HONDA_600:
-  return "HONDA_600";
-case engine_type_e::HONDA_K:
-  return "HONDA_K";
-case engine_type_e::HONDA_OBD1:
-  return "HONDA_OBD1";
-case engine_type_e::HONDA_OBD2A:
-  return "HONDA_OBD2A";
-case engine_type_e::HYUNDAI_PB:
-  return "HYUNDAI_PB";
-case engine_type_e::L9779_BENCH_ENGINE:
-  return "L9779_BENCH_ENGINE";
-case engine_type_e::MAVERICK_X3:
-  return "MAVERICK_X3";
-case engine_type_e::MAZDA_MIATA_NA6:
-  return "MAZDA_MIATA_NA6";
-case engine_type_e::MAZDA_MIATA_NA94:
-  return "MAZDA_MIATA_NA94";
-case engine_type_e::MAZDA_MIATA_NA96:
-  return "MAZDA_MIATA_NA96";
-case engine_type_e::MAZDA_MIATA_NB1:
-  return "MAZDA_MIATA_NB1";
-case engine_type_e::MAZDA_MIATA_NB2:
-  return "MAZDA_MIATA_NB2";
-case engine_type_e::MAZDA_MIATA_NB2_36:
-  return "MAZDA_MIATA_NB2_36";
-case engine_type_e::MAZDA_MIATA_NC:
-  return "MAZDA_MIATA_NC";
-case engine_type_e::ME17_9_MISC:
-  return "ME17_9_MISC";
-case engine_type_e::MERCEDES_M111:
-  return "MERCEDES_M111";
-case engine_type_e::MIATA_PROTEUS_TCU:
-  return "MIATA_PROTEUS_TCU";
-case engine_type_e::MINIMAL_PINS:
-  return "MINIMAL_PINS";
-case engine_type_e::MITSUBISHI_3A92:
-  return "MITSUBISHI_3A92";
-case engine_type_e::MITSUBISHI_4G93:
-  return "MITSUBISHI_4G93";
-case engine_type_e::MRE_BOARD_NEW_TEST:
-  return "MRE_BOARD_NEW_TEST";
-case engine_type_e::MRE_BODY_CONTROL:
-  return "MRE_BODY_CONTROL";
-case engine_type_e::MRE_SECONDARY_CAN:
-  return "MRE_SECONDARY_CAN";
-case engine_type_e::MRE_SUBARU_EJ18:
-  return "MRE_SUBARU_EJ18";
-case engine_type_e::MRE_VW_B6:
-  return "MRE_VW_B6";
-case engine_type_e::NISSAN_PRIMERA:
-  return "NISSAN_PRIMERA";
-case engine_type_e::POLARIS:
-  return "POLARIS";
-case engine_type_e::POLARIS_RZR:
-  return "POLARIS_RZR";
-case engine_type_e::PROTEUS_ANALOG_PWM_TEST:
-  return "PROTEUS_ANALOG_PWM_TEST";
-case engine_type_e::PROTEUS_BMW_M73:
-  return "PROTEUS_BMW_M73";
-case engine_type_e::PROTEUS_GM_LS_4:
-  return "PROTEUS_GM_LS_4";
-case engine_type_e::PROTEUS_LUA_DEMO:
-  return "PROTEUS_LUA_DEMO";
-case engine_type_e::PROTEUS_NISSAN_VQ35:
-  return "PROTEUS_NISSAN_VQ35";
-case engine_type_e::PROTEUS_QC_TEST_BOARD:
-  return "PROTEUS_QC_TEST_BOARD";
-case engine_type_e::PROTEUS_STIM_QC:
-  return "PROTEUS_STIM_QC";
-case engine_type_e::PROTEUS_VW_B6:
-  return "PROTEUS_VW_B6";
-case engine_type_e::SACHS:
-  return "SACHS";
-case engine_type_e::SIMULATOR_CONFIG:
-  return "SIMULATOR_CONFIG";
-case engine_type_e::SUBARU_EG33:
-  return "SUBARU_EG33";
-case engine_type_e::TCU_4R70W:
-  return "TCU_4R70W";
-case engine_type_e::TEST_100:
-  return "TEST_100";
-case engine_type_e::TEST_101:
-  return "TEST_101";
-case engine_type_e::TEST_33816:
-  return "TEST_33816";
-case engine_type_e::TEST_CRANK_ENGINE:
-  return "TEST_CRANK_ENGINE";
-case engine_type_e::TEST_DC_WASTEGATE_DISCOVERY:
-  return "TEST_DC_WASTEGATE_DISCOVERY";
-case engine_type_e::TEST_ENGINE:
-  return "TEST_ENGINE";
-case engine_type_e::TEST_ENGINE_VVT:
-  return "TEST_ENGINE_VVT";
-case engine_type_e::TEST_ISSUE_366_BOTH:
-  return "TEST_ISSUE_366_BOTH";
-case engine_type_e::TEST_ISSUE_366_RISE:
-  return "TEST_ISSUE_366_RISE";
-case engine_type_e::TEST_ISSUE_6451:
-  return "TEST_ISSUE_6451";
-case engine_type_e::TEST_ROTARY:
-  return "TEST_ROTARY";
-case engine_type_e::TOYOTA_1NZ_FE:
-  return "TOYOTA_1NZ_FE";
-case engine_type_e::TOYOTA_2JZ_GTE_VVTi:
-  return "TOYOTA_2JZ_GTE_VVTi";
-case engine_type_e::UNUSED102:
-  return "UNUSED102";
-case engine_type_e::UNUSED47:
-  return "UNUSED47";
-case engine_type_e::UNUSED49:
-  return "UNUSED49";
-case engine_type_e::UNUSED67:
-  return "UNUSED67";
-case engine_type_e::UNUSED94:
-  return "UNUSED94";
-case engine_type_e::UNUSED_65:
-  return "UNUSED_65";
-case engine_type_e::UNUSED_97:
-  return "UNUSED_97";
-case engine_type_e::VAG_5_CYL:
-  return "VAG_5_CYL";
-case engine_type_e::VW_ABA:
-  return "VW_ABA";
-case engine_type_e::WASTEGATE_PROTEUS_TEST:
-  return "WASTEGATE_PROTEUS_TEST";
-  }
- return NULL;
-}
 const char *getTrigger_type_e(trigger_type_e value){
 switch(value) {
 case trigger_type_e::TT_12_TOOTH_CRANK:

firmware/controllers/algo/auto_generated_enginetypes.h

@@ -1,4 +1,4 @@
-// was generated automatically by rusEFI tool  from engine_types.h // by enum2string.jar tool on Thu Jun 01 14:29:50 UTC 2023
+// was generated automatically by rusEFI tool  from engine_types.h // by enum_to_string.jar tool on Mon Oct 07 14:49:42 EDT 2024
 // see also gen_config_and_enums.bat
 
 
@@ -8,9 +8,6 @@
 const char *getBench_mode_e(bench_mode_e value);
 const char *getDebug_mode_e(debug_mode_e value);
 #if __cplusplus
-const char *getEngine_type_e(engine_type_e value);
-#endif //__cplusplus
-#if __cplusplus
 const char *getTrigger_type_e(trigger_type_e value);
 #endif //__cplusplus
 const char *getTs_14_command(ts_14_command value);

firmware/controllers/algo/engine_type_e.h

@@ -0,0 +1,219 @@
+#pragma once
+
+/**
+ * https://github.com/rusefi/rusefi/wiki/Engine-Types
+ */
+enum class engine_type_e : uint16_t {
+	DEFAULT_FRANKENSO = 0,
+
+	MIATA_PROTEUS_TCU = 1,
+
+	/**
+	 * 1995 Dodge Neon
+	 * http://rusefi.com/forum/viewtopic.php?t=360
+	 */
+	DODGE_NEON_1995 = 2,
+	/**
+	 * 1996 1.3 Ford Aspire
+	 * http://rusefi.com/forum/viewtopic.php?t=375
+	 */
+	FORD_ASPIRE_1996 = 3,
+	/**
+	 * See also PROTEUS_LUA_DEMO
+	 */
+	MRE_SECONDARY_CAN = 4,
+
+	NISSAN_PRIMERA = 5,
+	HARLEY = 6,
+	FORD_INLINE_6_1995 = 7,
+	/**
+	 * one cylinder engine
+	 * 139qmb 50-90cc
+	 * http://rusefi.com/forum/viewtopic.php?f=3&t=332
+	 */
+	GY6_139QMB = 8,
+
+	POLARIS_RZR = 9,
+	MAZDA_MIATA_NA96 = 10,
+	FORD_COYOTE = 11,
+	MITSUBISHI_3A92 = 12,
+	TOYOTA_1NZ_FE = 13,
+
+	FORD_ESCORT_GT = 14,
+	FUEL_BENCH = 15,
+	MITSUBISHI_4G93 = 16,
+	TCU_4R70W = 17,
+
+	TEST_33816 = 18,
+
+	TEST_ROTARY = 19,
+	// Frankenso board
+	FRANKENSO_MIATA_NA6_MAP = 41,
+	MAZDA_MIATA_NC = 20,
+	ET_BOSCH_QUICK_START = 21,
+
+  // BMW e36 etc
+	BMW_M52 = 22,
+
+	/**
+	 * microRusEFI used as Body Control Module BCM BCU
+	 */
+	MRE_BODY_CONTROL = 23,
+	ET_TEST_WITH_BOSCH_QUICK_START = 24,
+
+	/**
+	 * See also MRE_SECONDARY_CAN
+	 */
+	PROTEUS_LUA_DEMO = 25,
+
+	TEST_ENGINE = 26,
+
+	PROTEUS_GM_LS_4 = 27,
+
+	TEST_CRANK_ENGINE = 28,
+
+  // two stroke
+	SACHS = 29,
+
+	PROTEUS_ANALOG_PWM_TEST = 30,
+
+	MRE_BOARD_NEW_TEST = 31,
+
+	VW_ABA = 32,
+
+	ME17_9_MISC = 33,
+
+	MAZDA_MIATA_NA6 = 34,
+
+	POLARIS = 35,
+
+	HELLEN_128_MERCEDES_4_CYL = 36,
+
+	MRE_SUBARU_EJ18 = 37,
+
+	DISCOVERY_PDM = 38,
+
+	PROTEUS_VW_B6 = 39,
+
+  // used by unit tests and HW CI
+	FRANKENSO_BMW_M73_F = 40,
+
+	PROTEUS_QC_TEST_BOARD = 42,
+
+	HONDA_600 = 43,
+
+	TOYOTA_2JZ_GTE_VVTi = 44,
+
+	TEST_ENGINE_VVT = 45,
+
+	DODGE_NEON_2003_CRANK = 46,
+
+	UNUSED47 = 47,
+
+    // todo: add wastegate case into HW CI
+	TEST_DC_WASTEGATE_DISCOVERY = 48,
+
+	UNUSED49 = 49,
+
+	BMW_M73_MRE = 50,
+
+	BMW_M73_MRE_SLAVE = 51,
+
+
+	TEST_ISSUE_366_BOTH = 52,
+	TEST_ISSUE_366_RISE = 53,
+	MAVERICK_X3 = 54,
+	ET_UNUSED_55 = 55,
+	ET_UNUSED_56 = 56,
+	HELLEN_HONDA_BCM = 57,
+	ETB_BENCH_ENGINE = 58,
+	FRANKENSO_TEST_33810 = 59,
+
+	L9779_BENCH_ENGINE = 60,
+	EEPROM_BENCH_ENGINE = 61,
+	MRE_VW_B6 = 62,
+	PROTEUS_BMW_M73 = 63,
+	DODGE_RAM = 64,
+	UNUSED_65 = 65,
+	HONDA_OBD1 = 66,
+	UNUSED67 = 67,
+	MERCEDES_M111 = 68,
+
+	MAZDA_MIATA_NB2 = 69,
+
+	SUBARU_EG33 = 70,
+
+	HELLEN_121_VAG_4_CYL = 71,
+	HELLEN_121_NISSAN_6_CYL = 72,
+	PROTEUS_STIM_QC = 73,
+	HELLEN_4CHAN_STIM_QC = 74,
+	HELLEN_2CHAN_STIM_QC = 75,
+	HELLEN_154_VAG = 76,
+
+	VAG_5_CYL = 77,
+	HELLEN_121_VAG_V6_CYL = 78,
+	HELLEN_121_VAG_VR6_CYL = 79,
+	HELLEN_121_VAG_8_CYL = 81,
+
+	MAZDA_MIATA_NA94 = 80,
+
+    // 82
+	HELLEN_154_HYUNDAI_COUPE_BK1 = 82,
+	MAZDA_MIATA_NB1 = 83,
+	// 84
+	HELLEN_121_NISSAN_4_CYL = 84,
+
+    HELLEN_121_NISSAN_8_CYL = 85,
+
+	MAZDA_MIATA_NB2_36 = 86,
+
+	HELLEN_121_NISSAN_ALMERA_N16  = 87,
+
+	HELLEN_128_MERCEDES_6_CYL = 88,
+
+	HELLEN_128_MERCEDES_8_CYL = 89,
+
+	HONDA_K = 90,
+
+	HONDA_OBD2A = 91,
+
+	SIMULATOR_CONFIG = 92,
+
+	TEST_ISSUE_6451 = 93,
+
+  UNUSED94 = 94,
+
+	HELLEN_154_HYUNDAI_COUPE_BK2 = 95,
+
+    WASTEGATE_PROTEUS_TEST = 96,
+    UNUSED_97 = 97,
+    GM_SBC = 98,
+
+	/**
+	 * this configuration has as few pins configured as possible
+	 */
+	MINIMAL_PINS = 99,
+
+    // use this in case of emergency without github actions? :)
+	TEST_100 = 100,
+	TEST_101 = 101,
+	UNUSED102 = 102,
+
+	PROTEUS_NISSAN_VQ35 = 103,
+
+    // both Proteus and 4chan/8chan
+	HYUNDAI_PB = 104,
+  FERRARI_F136 = 105,
+
+  ET_AUX_0 = 106,
+  ET_AUX_1 = 107,
+  ET_AUX_2 = 108,
+  ET_AUX_3 = 109,
+  ET_AUX_4 = 110,
+  ET_AUX_5 = 111,
+  ET_AUX_6 = 112,
+  ET_AUX_7 = 113,
+
+  // [CannedTunes] please keep this always last always unused
+  ET_LAST_UNUSED = 114,
+};

firmware/controllers/algo/engine_types.h

@@ -12,224 +12,6 @@
 
 #include "generated_lookup_meta.h"
 
-/**
- * https://github.com/rusefi/rusefi/wiki/Engine-Types
- */
-enum class engine_type_e : uint16_t {
-	DEFAULT_FRANKENSO = 0,
-
-	MIATA_PROTEUS_TCU = 1,
-
-	/**
-	 * 1995 Dodge Neon
-	 * http://rusefi.com/forum/viewtopic.php?t=360
-	 */
-	DODGE_NEON_1995 = 2,
-	/**
-	 * 1996 1.3 Ford Aspire
-	 * http://rusefi.com/forum/viewtopic.php?t=375
-	 */
-	FORD_ASPIRE_1996 = 3,
-	/**
-	 * See also PROTEUS_LUA_DEMO
-	 */
-	MRE_SECONDARY_CAN = 4,
-
-	NISSAN_PRIMERA = 5,
-	HARLEY = 6,
-	FORD_INLINE_6_1995 = 7,
-	/**
-	 * one cylinder engine
-	 * 139qmb 50-90cc
-	 * http://rusefi.com/forum/viewtopic.php?f=3&t=332
-	 */
-	GY6_139QMB = 8,
-
-	POLARIS_RZR = 9,
-	MAZDA_MIATA_NA96 = 10,
-	FORD_COYOTE = 11,
-	MITSUBISHI_3A92 = 12,
-	TOYOTA_1NZ_FE = 13,
-
-	FORD_ESCORT_GT = 14,
-	FUEL_BENCH = 15,
-	MITSUBISHI_4G93 = 16,
-	TCU_4R70W = 17,
-
-	TEST_33816 = 18,
-
-	TEST_ROTARY = 19,
-	// Frankenso board
-	FRANKENSO_MIATA_NA6_MAP = 41,
-	MAZDA_MIATA_NC = 20,
-	ET_BOSCH_QUICK_START = 21,
-
-  // BMW e36 etc
-	BMW_M52 = 22,
-
-	/**
-	 * microRusEFI used as Body Control Module BCM BCU
-	 */
-	MRE_BODY_CONTROL = 23,
-	ET_TEST_WITH_BOSCH_QUICK_START = 24,
-
-	/**
-	 * See also MRE_SECONDARY_CAN
-	 */
-	PROTEUS_LUA_DEMO = 25,
-
-	TEST_ENGINE = 26,
-
-	PROTEUS_GM_LS_4 = 27,
-
-	TEST_CRANK_ENGINE = 28,
-
-  // two stroke
-	SACHS = 29,
-
-	PROTEUS_ANALOG_PWM_TEST = 30,
-
-	MRE_BOARD_NEW_TEST = 31,
-
-	VW_ABA = 32,
-
-	ME17_9_MISC = 33,
-
-	MAZDA_MIATA_NA6 = 34,
-
-	POLARIS = 35,
-
-	HELLEN_128_MERCEDES_4_CYL = 36,
-
-	MRE_SUBARU_EJ18 = 37,
-
-	DISCOVERY_PDM = 38,
-
-	PROTEUS_VW_B6 = 39,
-
-  // used by unit tests and HW CI
-	FRANKENSO_BMW_M73_F = 40,
-
-	PROTEUS_QC_TEST_BOARD = 42,
-
-	HONDA_600 = 43,
-
-	TOYOTA_2JZ_GTE_VVTi = 44,
-
-	TEST_ENGINE_VVT = 45,
-
-	DODGE_NEON_2003_CRANK = 46,
-
-	UNUSED47 = 47,
-
-    // todo: add wastegate case into HW CI
-	TEST_DC_WASTEGATE_DISCOVERY = 48,
-
-	UNUSED49 = 49,
-
-	BMW_M73_MRE = 50,
-
-	BMW_M73_MRE_SLAVE = 51,
-
-
-	TEST_ISSUE_366_BOTH = 52,
-	TEST_ISSUE_366_RISE = 53,
-	MAVERICK_X3 = 54,
-	ET_UNUSED_55 = 55,
-	ET_UNUSED_56 = 56,
-	HELLEN_HONDA_BCM = 57,
-	ETB_BENCH_ENGINE = 58,
-	FRANKENSO_TEST_33810 = 59,
-
-	L9779_BENCH_ENGINE = 60,
-	EEPROM_BENCH_ENGINE = 61,
-	MRE_VW_B6 = 62,
-	PROTEUS_BMW_M73 = 63,
-	DODGE_RAM = 64,
-	UNUSED_65 = 65,
-	HONDA_OBD1 = 66,
-	UNUSED67 = 67,
-	MERCEDES_M111 = 68,
-
-	MAZDA_MIATA_NB2 = 69,
-
-	SUBARU_EG33 = 70,
-
-	HELLEN_121_VAG_4_CYL = 71,
-	HELLEN_121_NISSAN_6_CYL = 72,
-	PROTEUS_STIM_QC = 73,
-	HELLEN_4CHAN_STIM_QC = 74,
-	HELLEN_2CHAN_STIM_QC = 75,
-	HELLEN_154_VAG = 76,
-
-	VAG_5_CYL = 77,
-	HELLEN_121_VAG_V6_CYL = 78,
-	HELLEN_121_VAG_VR6_CYL = 79,
-	HELLEN_121_VAG_8_CYL = 81,
-
-	MAZDA_MIATA_NA94 = 80,
-
-    // 82
-	HELLEN_154_HYUNDAI_COUPE_BK1 = 82,
-	MAZDA_MIATA_NB1 = 83,
-	// 84
-	HELLEN_121_NISSAN_4_CYL = 84,
-
-    HELLEN_121_NISSAN_8_CYL = 85,
-
-	MAZDA_MIATA_NB2_36 = 86,
-
-	HELLEN_121_NISSAN_ALMERA_N16  = 87,
-
-	HELLEN_128_MERCEDES_6_CYL = 88,
-
-	HELLEN_128_MERCEDES_8_CYL = 89,
-
-	HONDA_K = 90,
-
-	HONDA_OBD2A = 91,
-
-	SIMULATOR_CONFIG = 92,
-
-	TEST_ISSUE_6451 = 93,
-
-  UNUSED94 = 94,
-
-	HELLEN_154_HYUNDAI_COUPE_BK2 = 95,
-
-    WASTEGATE_PROTEUS_TEST = 96,
-    UNUSED_97 = 97,
-    GM_SBC = 98,
-
-	/**
-	 * this configuration has as few pins configured as possible
-	 */
-	MINIMAL_PINS = 99,
-
-    // use this in case of emergency without github actions? :)
-	TEST_100 = 100,
-	TEST_101 = 101,
-	UNUSED102 = 102,
-
-	PROTEUS_NISSAN_VQ35 = 103,
-
-    // both Proteus and 4chan/8chan
-	HYUNDAI_PB = 104,
-  FERRARI_F136 = 105,
-
-  ET_AUX_0 = 106,
-  ET_AUX_1 = 107,
-  ET_AUX_2 = 108,
-  ET_AUX_3 = 109,
-  ET_AUX_4 = 110,
-  ET_AUX_5 = 111,
-  ET_AUX_6 = 112,
-  ET_AUX_7 = 113,
-
-  // [CannedTunes] please keep this always last always unused
-  ET_LAST_UNUSED = 114,
-};
-
 /**
  * https://rusefi.com//wiki/index.php?title=Manual:Debug_fields
  */

firmware/controllers/algo/rusefi_enums.h

@@ -17,6 +17,7 @@
 #include "efifeatures.h"
 #include "obd_error_codes.h"
 #include "engine_types.h"
+#include "engine_type_e.h"
 // we do not want to start the search for header from current folder so we use brackets here
 // https://stackoverflow.com/questions/21593/what-is-the-difference-between-include-filename-and-include-filename
 #include <rusefi_hw_enums.h>

firmware/controllers/core/common_headers.h

@@ -27,6 +27,7 @@
 #include "auto_generated_enums.h"
 #include "auto_generated_commonenum.h"
 #include "auto_generated_enginetypes.h"
+#include "auto_generated_engine_type_e.h"
 #include "efilib.h"
 #include "efitime.h"
 

firmware/docs_enums.mk

@@ -5,6 +5,7 @@ DOCS_ENUMS_INPUTS = \
   $(PROJECT_DIR)/controllers/sensors/sensor_type.h \
   $(PROJECT_DIR)/controllers/trigger/decoders/sync_edge.h \
   $(PROJECT_DIR)/controllers/algo/engine_types.h \
+  $(PROJECT_DIR)/controllers/algo/engine_type_e.h \
   $(PROJECT_DIR)/controllers/algo/rusefi_enums.h \
   $(PROJECT_DIR)/controllers/algo/rusefi_hw_enums.h \
   $(PROJECT_DIR)/libfirmware/can/can_common.h \

firmware/gen_enum_to_string.sh

@@ -15,6 +15,9 @@ java -DSystemOut.name=logs/gen_java_enum -cp ${ENUM_JAR} com.rusefi.ToJavaEnum -
 java -DSystemOut.name=logs/gen_java_enum -cp ${ENUM_JAR} com.rusefi.ToJavaEnum -enumInputFile controllers/algo/engine_types.h   -outputPath ../java_console/models/src/main/java/com/rusefi/enums -definition integration/rusefi_config.txt
 [ $? -eq 0 ] || { echo "ERROR generating types"; exit 1; }
 
+java -DSystemOut.name=logs/gen_java_enum -cp ${ENUM_JAR} com.rusefi.ToJavaEnum -enumInputFile controllers/algo/engine_type_e.h   -outputPath ../java_console/models/src/main/java/com/rusefi/enums -definition integration/rusefi_config.txt
+[ $? -eq 0 ] || { echo "ERROR generating engine_type_e"; exit 1; }
+
 java -DSystemOut.name=logs/gen_java_enum \
 	-Denum_with_values=true \
 	-cp ${ENUM_JAR} com.rusefi.ToJavaEnum \
@@ -55,6 +58,14 @@ java -DSystemOut.name=logs/gen_enum_to_string \
 
 [ $? -eq 0 ] || { echo "ERROR generating enums"; exit 1; }
 
+java -DSystemOut.name=logs/gen_enum_to_string \
+	-jar ${ENUM_JAR} \
+	-outputPath controllers/algo \
+	-generatedFile engine_type_e \
+	-enumInputFile controllers/algo/engine_type_e.h
+
+[ $? -eq 0 ] || { echo "ERROR generating enums"; exit 1; }
+
 # TODO: rearrange enums so that we have WAY less duplicated generated code? at the moment too many enums are generated 4 times
 
 java -DSystemOut.name=logs/gen_enum_to_string \

java_console/models/src/main/java/com/rusefi/enums/engine_type_e.java

@@ -1,5 +1,5 @@
 package com.rusefi.enums;
-// based on ./controllers/algo/engine_types.h
+// based on ./controllers/algo/engine_type_e.h
 //auto-generated by ToJavaEnum.java
 
 

java_tools/configuration_definition/src/main/resources/config_definition.options

@@ -1,6 +1,8 @@
 -enumInputFile
 controllers/algo/engine_types.h
 -enumInputFile
+controllers/algo/engine_type_e.h
+-enumInputFile
 controllers/algo/rusefi_enums.h
 -definition
 integration/rusefi_config.txt

java_tools/configuration_definition/src/test/java/com/rusefi/test/ConfigDefinitionTest.java

@@ -18,7 +18,7 @@ public class ConfigDefinitionTest {
     @Test
     public void testEnumIntoType() throws IOException {
         EnumsReader enumsReader = new EnumsReader();
-        enumsReader.read(new FileReader(FIRMWARE + File.separator + "controllers/algo/engine_types.h"));
+        enumsReader.read(new FileReader(FIRMWARE + File.separator + "controllers/algo/engine_type_e.h"));
 
         VariableRegistry variableRegistry = readRealConfig();