From 83be45b83baa05b3650a8dad1590cfd226ce289f Mon Sep 17 00:00:00 2001
From: rusefi <rusefillc@gmail.com>
Date: Tue, 28 May 2019 22:24:29 -0400
Subject: [PATCH] board-specific usability #808 extracting enum reader

---
 .../controllers/algo/auto_generated_enums.cpp | 1284 ++++++++---------
 .../controllers/algo/auto_generated_enums.h   |   66 +-
 java_tools/enum2string.jar                    |  Bin 7233 -> 9041 bytes
 java_tools/enum_to_string/enum_to_string.iml  |    2 +-
 .../src/com/rusefi/EnumToString.java          |   63 +-
 .../src/com/rusefi/EnumToStringTest.java      |    2 +-
 .../src/com/rusefi/EnumsReader.java           |   55 +
 7 files changed, 746 insertions(+), 726 deletions(-)
 create mode 100644 java_tools/enum_to_string/src/com/rusefi/EnumsReader.java

diff --git a/firmware/controllers/algo/auto_generated_enums.cpp b/firmware/controllers/algo/auto_generated_enums.cpp
index 51814a87ce..cf35a3bc65 100644
--- a/firmware/controllers/algo/auto_generated_enums.cpp
+++ b/firmware/controllers/algo/auto_generated_enums.cpp
@@ -1,496 +1,39 @@
 // auto-generated from.\controllers/algo/rusefi_enums.h
 // by enum2string.jar tool
-// on Sat May 11 10:22:02 EDT 2019
+// on Tue May 28 22:08:21 EDT 2019
 // see also gen_config_and_enums.bat
 
 
 
 #include "global.h"
 #include "rusefi_enums.h"
-const char *getEngine_type_e(engine_type_e value){
+const char *getPidAutoTune_AutoTunerState(PidAutoTune_AutoTunerState value){
 switch(value) {
-case ACURA_RSX:
-  return "ACURA_RSX";
-case AUDI_AAN:
-  return "AUDI_AAN";
-case BMW_E34:
-  return "BMW_E34";
-case CAMARO_4:
-  return "CAMARO_4";
-case CHEVY_C20_1973:
-  return "CHEVY_C20_1973";
-case CITROEN_TU3JP:
-  return "CITROEN_TU3JP";
-case CUSTOM_ENGINE:
-  return "CUSTOM_ENGINE";
-case DAIHATSU:
-  return "DAIHATSU";
-case DODGE_NEON_1995:
-  return "DODGE_NEON_1995";
-case DODGE_NEON_2003_CAM:
-  return "DODGE_NEON_2003_CAM";
-case DODGE_NEON_2003_CRANK:
-  return "DODGE_NEON_2003_CRANK";
-case DODGE_RAM:
-  return "DODGE_RAM";
-case DODGE_STRATUS:
-  return "DODGE_STRATUS";
-case ETB_BENCH_ENGINE:
-  return "ETB_BENCH_ENGINE";
-case FORD_ASPIRE_1996:
-  return "FORD_ASPIRE_1996";
-case FORD_ESCORT_GT:
-  return "FORD_ESCORT_GT";
-case FORD_FIESTA:
-  return "FORD_FIESTA";
-case FORD_INLINE_6_1995:
-  return "FORD_INLINE_6_1995";
-case FRANKENSO_QA_ENGINE:
-  return "FRANKENSO_QA_ENGINE";
-case Force_4_bytes_size_engine_type:
-  return "Force_4_bytes_size_engine_type";
-case GEO_STORM:
-  return "GEO_STORM";
-case GM_2_2:
-  return "GM_2_2";
-case GY6_139QMB:
-  return "GY6_139QMB";
-case HONDA_600:
-  return "HONDA_600";
-case HONDA_ACCORD_1_24_SHIFTED:
-  return "HONDA_ACCORD_1_24_SHIFTED";
-case HONDA_ACCORD_CD:
-  return "HONDA_ACCORD_CD";
-case HONDA_ACCORD_CD_DIP:
-  return "HONDA_ACCORD_CD_DIP";
-case HONDA_ACCORD_CD_TWO_WIRES:
-  return "HONDA_ACCORD_CD_TWO_WIRES";
-case LADA_KALINA:
-  return "LADA_KALINA";
-case MAZDA_323:
-  return "MAZDA_323";
-case MAZDA_626:
-  return "MAZDA_626";
-case MAZDA_MIATA_2003:
-  return "MAZDA_MIATA_2003";
-case MAZDA_MIATA_2003_BOARD_TEST:
-  return "MAZDA_MIATA_2003_BOARD_TEST";
-case MAZDA_MIATA_2003_NA_RAIL:
-  return "MAZDA_MIATA_2003_NA_RAIL";
-case MAZDA_MIATA_NA8:
-  return "MAZDA_MIATA_NA8";
-case MAZDA_MIATA_NB1:
-  return "MAZDA_MIATA_NB1";
-case MIATA_1990:
-  return "MIATA_1990";
-case MIATA_1994_DEVIATOR:
-  return "MIATA_1994_DEVIATOR";
-case MIATA_1994_SPAGS:
-  return "MIATA_1994_SPAGS";
-case MIATA_1996:
-  return "MIATA_1996";
-case MIATA_NA6_MAP:
-  return "MIATA_NA6_MAP";
-case MIATA_NA6_VAF:
-  return "MIATA_NA6_VAF";
-case MINIMAL_PINS:
-  return "MINIMAL_PINS";
-case MINI_COOPER_R50:
-  return "MINI_COOPER_R50";
-case MITSU_4G93:
-  return "MITSU_4G93";
-case NISSAN_PRIMERA:
-  return "NISSAN_PRIMERA";
-case PROMETHEUS_DEFAULTS:
-  return "PROMETHEUS_DEFAULTS";
-case ROVER_V8:
-  return "ROVER_V8";
-case SACHS:
-  return "SACHS";
-case SATURN_ION_2004:
-  return "SATURN_ION_2004";
-case SUBARUEJ20G_DEFAULTS:
-  return "SUBARUEJ20G_DEFAULTS";
-case SUBARU_2003_WRX:
-  return "SUBARU_2003_WRX";
-case SUZUKI_VITARA:
-  return "SUZUKI_VITARA";
-case TEST_CIVIC_4_0_BOTH:
-  return "TEST_CIVIC_4_0_BOTH";
-case TEST_CIVIC_4_0_RISE:
-  return "TEST_CIVIC_4_0_RISE";
-case TEST_ENGINE:
-  return "TEST_ENGINE";
-case TEST_ENGINE_VVT:
-  return "TEST_ENGINE_VVT";
-case TEST_ISSUE_366_BOTH:
-  return "TEST_ISSUE_366_BOTH";
-case TEST_ISSUE_366_RISE:
-  return "TEST_ISSUE_366_RISE";
-case TLE8888_BENCH_ENGINE:
-  return "TLE8888_BENCH_ENGINE";
-case TOYOTA_2JZ_GTE_VVTi:
-  return "TOYOTA_2JZ_GTE_VVTi";
-case TOYOTA_JZS147:
-  return "TOYOTA_JZS147";
-case VAG_18_TURBO:
-  return "VAG_18_TURBO";
-case VW_ABA:
-  return "VW_ABA";
-case ZIL_130:
-  return "ZIL_130";
+case AUTOTUNER_OFF:
+  return "AUTOTUNER_OFF";
+case CONVERGED:
+  return "CONVERGED";
+case FAILED:
+  return "FAILED";
+case RELAY_STEP_DOWN:
+  return "RELAY_STEP_DOWN";
+case RELAY_STEP_UP:
+  return "RELAY_STEP_UP";
+case STEADY_STATE_AFTER_STEP_UP:
+  return "STEADY_STATE_AFTER_STEP_UP";
+case STEADY_STATE_AT_BASELINE:
+  return "STEADY_STATE_AT_BASELINE";
   }
  return NULL;
 }
-const char *getTrigger_type_e(trigger_type_e value){
+const char *getPidAutoTune_Peak(PidAutoTune_Peak value){
 switch(value) {
-case Force_4_bytes_size_trigger_type:
-  return "Force_4_bytes_size_trigger_type";
-case TT_2JZ_1_12:
-  return "TT_2JZ_1_12";
-case TT_2JZ_3_34:
-  return "TT_2JZ_3_34";
-case TT_36_2_2_2:
-  return "TT_36_2_2_2";
-case TT_3_1_CAM:
-  return "TT_3_1_CAM";
-case TT_60_2_VW:
-  return "TT_60_2_VW";
-case TT_DODGE_NEON_1995:
-  return "TT_DODGE_NEON_1995";
-case TT_DODGE_NEON_1995_ONLY_CRANK:
-  return "TT_DODGE_NEON_1995_ONLY_CRANK";
-case TT_DODGE_NEON_2003_CAM:
-  return "TT_DODGE_NEON_2003_CAM";
-case TT_DODGE_NEON_2003_CRANK:
-  return "TT_DODGE_NEON_2003_CRANK";
-case TT_DODGE_RAM:
-  return "TT_DODGE_RAM";
-case TT_DODGE_STRATUS:
-  return "TT_DODGE_STRATUS";
-case TT_FIAT_IAW_P8:
-  return "TT_FIAT_IAW_P8";
-case TT_FORD_ASPIRE:
-  return "TT_FORD_ASPIRE";
-case TT_GM_7X:
-  return "TT_GM_7X";
-case TT_GM_LS_24:
-  return "TT_GM_LS_24";
-case TT_HONDA_1_24:
-  return "TT_HONDA_1_24";
-case TT_HONDA_1_4_24:
-  return "TT_HONDA_1_4_24";
-case TT_HONDA_4_24:
-  return "TT_HONDA_4_24";
-case TT_HONDA_4_24_1:
-  return "TT_HONDA_4_24_1";
-case TT_HONDA_ACCORD_1_24_SHIFTED:
-  return "TT_HONDA_ACCORD_1_24_SHIFTED";
-case TT_HONDA_CBR_600:
-  return "TT_HONDA_CBR_600";
-case TT_HONDA_CBR_600_CUSTOM:
-  return "TT_HONDA_CBR_600_CUSTOM";
-case TT_JEEP_18_2_2_2:
-  return "TT_JEEP_18_2_2_2";
-case TT_JEEP_4_CYL:
-  return "TT_JEEP_4_CYL";
-case TT_MAZDA_DOHC_1_4:
-  return "TT_MAZDA_DOHC_1_4";
-case TT_MAZDA_MIATA_NA:
-  return "TT_MAZDA_MIATA_NA";
-case TT_MAZDA_MIATA_NB1:
-  return "TT_MAZDA_MIATA_NB1";
-case TT_MAZDA_MIATA_VVT_TEST:
-  return "TT_MAZDA_MIATA_VVT_TEST";
-case TT_MAZDA_SOHC_4:
-  return "TT_MAZDA_SOHC_4";
-case TT_MAZDA_Z5:
-  return "TT_MAZDA_Z5";
-case TT_MIATA_VVT:
-  return "TT_MIATA_VVT";
-case TT_MINI_COOPER_R50:
-  return "TT_MINI_COOPER_R50";
-case TT_MITSUBISHI:
-  return "TT_MITSUBISHI";
-case TT_NISSAN_SR20VE:
-  return "TT_NISSAN_SR20VE";
-case TT_NISSAN_SR20VE_360:
-  return "TT_NISSAN_SR20VE_360";
-case TT_ONE:
-  return "TT_ONE";
-case TT_ONE_PLUS_ONE:
-  return "TT_ONE_PLUS_ONE";
-case TT_ONE_PLUS_TOOTHED_WHEEL_60_2:
-  return "TT_ONE_PLUS_TOOTHED_WHEEL_60_2";
-case TT_ROVER_K:
-  return "TT_ROVER_K";
-case TT_SUBARU_7_6:
-  return "TT_SUBARU_7_6";
-case TT_TOOTHED_WHEEL:
-  return "TT_TOOTHED_WHEEL";
-case TT_TOOTHED_WHEEL_36_1:
-  return "TT_TOOTHED_WHEEL_36_1";
-case TT_TOOTHED_WHEEL_60_2:
-  return "TT_TOOTHED_WHEEL_60_2";
-case TT_UNUSED:
-  return "TT_UNUSED";
-  }
- return NULL;
-}
-const char *getAdc_channel_mode_e(adc_channel_mode_e value){
-switch(value) {
-case ADC_FAST:
-  return "ADC_FAST";
-case ADC_OFF:
-  return "ADC_OFF";
-case ADC_SLOW:
-  return "ADC_SLOW";
-case Force_4_bytes_size_adc_channel_mode:
-  return "Force_4_bytes_size_adc_channel_mode";
-  }
- return NULL;
-}
-const char *getTrigger_value_e(trigger_value_e value){
-switch(value) {
-case TV_FALL:
-  return "TV_FALL";
-case TV_RISE:
-  return "TV_RISE";
-  }
- return NULL;
-}
-const char *getTrigger_wheel_e(trigger_wheel_e value){
-switch(value) {
-case T_CHANNEL_3:
-  return "T_CHANNEL_3";
-case T_NONE:
-  return "T_NONE";
-case T_PRIMARY:
-  return "T_PRIMARY";
-case T_SECONDARY:
-  return "T_SECONDARY";
-  }
- return NULL;
-}
-const char *getTrigger_event_e(trigger_event_e value){
-switch(value) {
-case SHAFT_3RD_FALLING:
-  return "SHAFT_3RD_FALLING";
-case SHAFT_3RD_RISING:
-  return "SHAFT_3RD_RISING";
-case SHAFT_PRIMARY_FALLING:
-  return "SHAFT_PRIMARY_FALLING";
-case SHAFT_PRIMARY_RISING:
-  return "SHAFT_PRIMARY_RISING";
-case SHAFT_SECONDARY_FALLING:
-  return "SHAFT_SECONDARY_FALLING";
-case SHAFT_SECONDARY_RISING:
-  return "SHAFT_SECONDARY_RISING";
-  }
- return NULL;
-}
-const char *getVvt_mode_e(vvt_mode_e value){
-switch(value) {
-case Force_4_bytes_size_vvt_mode:
-  return "Force_4_bytes_size_vvt_mode";
-case MIATA_NB2:
-  return "MIATA_NB2";
-case VVT_2GZ:
-  return "VVT_2GZ";
-case VVT_FIRST_HALF:
-  return "VVT_FIRST_HALF";
-case VVT_SECOND_HALF:
-  return "VVT_SECOND_HALF";
-  }
- return NULL;
-}
-const char *getEngine_load_mode_e(engine_load_mode_e value){
-switch(value) {
-case Force_4_bytes_size_engine_load_mode:
-  return "Force_4_bytes_size_engine_load_mode";
-case LM_ALPHA_N:
-  return "LM_ALPHA_N";
-case LM_MAP:
-  return "LM_MAP";
-case LM_PLAIN_MAF:
-  return "LM_PLAIN_MAF";
-case LM_REAL_MAF:
-  return "LM_REAL_MAF";
-case LM_SPEED_DENSITY:
-  return "LM_SPEED_DENSITY";
-  }
- return NULL;
-}
-const char *getDisplay_mode_e(display_mode_e value){
-switch(value) {
-case DM_HD44780:
-  return "DM_HD44780";
-case DM_HD44780_OVER_PCF8574:
-  return "DM_HD44780_OVER_PCF8574";
-case DM_NONE:
-  return "DM_NONE";
-case Force_4_bytes_size_display_mode:
-  return "Force_4_bytes_size_display_mode";
-  }
- return NULL;
-}
-const char *getLog_format_e(log_format_e value){
-switch(value) {
-case Force_4_bytes_size_log_format:
-  return "Force_4_bytes_size_log_format";
-case LF_NATIVE:
-  return "LF_NATIVE";
-case LM_MLV:
-  return "LM_MLV";
-  }
- return NULL;
-}
-const char *getIdle_mode_e(idle_mode_e value){
-switch(value) {
-case Force_4_bytes_size_idle_mode:
-  return "Force_4_bytes_size_idle_mode";
-case IM_AUTO:
-  return "IM_AUTO";
-case IM_MANUAL:
-  return "IM_MANUAL";
-  }
- return NULL;
-}
-const char *getPin_output_mode_e(pin_output_mode_e value){
-switch(value) {
-case OM_DEFAULT:
-  return "OM_DEFAULT";
-case OM_INVERTED:
-  return "OM_INVERTED";
-case OM_OPENDRAIN:
-  return "OM_OPENDRAIN";
-case OM_OPENDRAIN_INVERTED:
-  return "OM_OPENDRAIN_INVERTED";
-  }
- return NULL;
-}
-const char *getPin_mode_e(pin_mode_e value){
-switch(value) {
-case PO_DEFAULT:
-  return "PO_DEFAULT";
-case PO_OPENDRAIN:
-  return "PO_OPENDRAIN";
-case PO_PULLDOWN:
-  return "PO_PULLDOWN";
-case PO_PULLUP:
-  return "PO_PULLUP";
-  }
- return NULL;
-}
-const char *getPin_input_mode_e(pin_input_mode_e value){
-switch(value) {
-case PI_DEFAULT:
-  return "PI_DEFAULT";
-case PI_PULLDOWN:
-  return "PI_PULLDOWN";
-case PI_PULLUP:
-  return "PI_PULLUP";
-  }
- return NULL;
-}
-const char *getOperation_mode_e(operation_mode_e value){
-switch(value) {
-case FOUR_STROKE_CAM_SENSOR:
-  return "FOUR_STROKE_CAM_SENSOR";
-case FOUR_STROKE_CRANK_SENSOR:
-  return "FOUR_STROKE_CRANK_SENSOR";
-case FOUR_STROKE_SYMMETRICAL_CRANK_SENSOR:
-  return "FOUR_STROKE_SYMMETRICAL_CRANK_SENSOR";
-case Force_4_bytes_size_operation_mode_e:
-  return "Force_4_bytes_size_operation_mode_e";
-case OM_NONE:
-  return "OM_NONE";
-case TWO_STROKE:
-  return "TWO_STROKE";
-  }
- return NULL;
-}
-const char *getIgnition_mode_e(ignition_mode_e value){
-switch(value) {
-case Force_4_bytes_size_ignition_mode:
-  return "Force_4_bytes_size_ignition_mode";
-case IM_INDIVIDUAL_COILS:
-  return "IM_INDIVIDUAL_COILS";
-case IM_ONE_COIL:
-  return "IM_ONE_COIL";
-case IM_TWO_COILS:
-  return "IM_TWO_COILS";
-case IM_WASTED_SPARK:
-  return "IM_WASTED_SPARK";
-  }
- return NULL;
-}
-const char *getInjection_mode_e(injection_mode_e value){
-switch(value) {
-case Force_4_bytes_size_injection_mode:
-  return "Force_4_bytes_size_injection_mode";
-case IM_BATCH:
-  return "IM_BATCH";
-case IM_SEQUENTIAL:
-  return "IM_SEQUENTIAL";
-case IM_SIMULTANEOUS:
-  return "IM_SIMULTANEOUS";
-case IM_SINGLE_POINT:
-  return "IM_SINGLE_POINT";
-  }
- return NULL;
-}
-const char *getCranking_ignition_mode_e(cranking_ignition_mode_e value){
-switch(value) {
-case CIM_DEFAULT:
-  return "CIM_DEFAULT";
-case CIM_FIXED_ANGLE:
-  return "CIM_FIXED_ANGLE";
-case Force_4_bytes_size_cranking_ignition_mode:
-  return "Force_4_bytes_size_cranking_ignition_mode";
-  }
- return NULL;
-}
-const char *getUart_device_e(uart_device_e value){
-switch(value) {
-case UART_DEVICE_1:
-  return "UART_DEVICE_1";
-case UART_DEVICE_2:
-  return "UART_DEVICE_2";
-case UART_DEVICE_3:
-  return "UART_DEVICE_3";
-case UART_DEVICE_4:
-  return "UART_DEVICE_4";
-case UART_NONE:
-  return "UART_NONE";
-  }
- return NULL;
-}
-const char *getSpi_speed_e(spi_speed_e value){
-switch(value) {
-case _150KHz:
-  return "_150KHz";
-case _1_25MHz:
-  return "_1_25MHz";
-case _2_5MHz:
-  return "_2_5MHz";
-case _5MHz:
-  return "_5MHz";
-  }
- return NULL;
-}
-const char *getSpi_device_e(spi_device_e value){
-switch(value) {
-case SPI_DEVICE_1:
-  return "SPI_DEVICE_1";
-case SPI_DEVICE_2:
-  return "SPI_DEVICE_2";
-case SPI_DEVICE_3:
-  return "SPI_DEVICE_3";
-case SPI_DEVICE_4:
-  return "SPI_DEVICE_4";
-case SPI_NONE:
-  return "SPI_NONE";
+case MAXIMUM:
+  return "MAXIMUM";
+case MINIMUM:
+  return "MINIMUM";
+case NOT_A_PEAK:
+  return "NOT_A_PEAK";
   }
  return NULL;
 }
@@ -535,37 +78,43 @@ case EFI_ADC_NONE:
   }
  return NULL;
 }
-const char *getMass_storage_e(mass_storage_e value){
+const char *getAdc_channel_mode_e(adc_channel_mode_e value){
 switch(value) {
-case Force_4_bytes_size_mass_storage:
-  return "Force_4_bytes_size_mass_storage";
-case MS_ALWAYS:
-  return "MS_ALWAYS";
-case MS_AUTO:
-  return "MS_AUTO";
-case MS_NEVER:
-  return "MS_NEVER";
+case ADC_FAST:
+  return "ADC_FAST";
+case ADC_OFF:
+  return "ADC_OFF";
+case ADC_SLOW:
+  return "ADC_SLOW";
+case Force_4_bytes_size_adc_channel_mode:
+  return "Force_4_bytes_size_adc_channel_mode";
   }
  return NULL;
 }
-const char *getEgo_sensor_e(ego_sensor_e value){
+const char *getAir_pressure_sensor_type_e(air_pressure_sensor_type_e value){
 switch(value) {
-case ES_14Point7_Free:
-  return "ES_14Point7_Free";
-case ES_AEM:
-  return "ES_AEM";
-case ES_BPSX_D1:
-  return "ES_BPSX_D1";
-case ES_Custom:
-  return "ES_Custom";
-case ES_Innovate_MTX_L:
-  return "ES_Innovate_MTX_L";
-case ES_NarrowBand:
-  return "ES_NarrowBand";
-case ES_PLX:
-  return "ES_PLX";
-case Force_4_bytes_size_ego_sensor:
-  return "Force_4_bytes_size_ego_sensor";
+case Force_4_bytes_size_cranking_map_type:
+  return "Force_4_bytes_size_cranking_map_type";
+case MT_CUSTOM:
+  return "MT_CUSTOM";
+case MT_DENSO183:
+  return "MT_DENSO183";
+case MT_DODGE_NEON_2003:
+  return "MT_DODGE_NEON_2003";
+case MT_GM_3_BAR:
+  return "MT_GM_3_BAR";
+case MT_HONDA3BAR:
+  return "MT_HONDA3BAR";
+case MT_MPX4100:
+  return "MT_MPX4100";
+case MT_MPX4250:
+  return "MT_MPX4250";
+case MT_MPX4250A:
+  return "MT_MPX4250A";
+case MT_SUBY_DENSO:
+  return "MT_SUBY_DENSO";
+case MT_TOYOTA_89420_02010:
+  return "MT_TOYOTA_89420_02010";
   }
  return NULL;
 }
@@ -928,6 +477,58 @@ case TLE8888_PIN_9:
   }
  return NULL;
 }
+const char *getCan_device_mode_e(can_device_mode_e value){
+switch(value) {
+case CD_OFF:
+  return "CD_OFF";
+case CD_USE_CAN1:
+  return "CD_USE_CAN1";
+case CD_USE_CAN2:
+  return "CD_USE_CAN2";
+case Internal_ForceMyEnumIntSize_can_device_mode:
+  return "Internal_ForceMyEnumIntSize_can_device_mode";
+  }
+ return NULL;
+}
+const char *getCan_nbc_e(can_nbc_e value){
+switch(value) {
+case CAN_BUS_MAZDA_RX8:
+  return "CAN_BUS_MAZDA_RX8";
+case CAN_BUS_NBC_BMW:
+  return "CAN_BUS_NBC_BMW";
+case CAN_BUS_NBC_FIAT:
+  return "CAN_BUS_NBC_FIAT";
+case CAN_BUS_NBC_VAG:
+  return "CAN_BUS_NBC_VAG";
+case Internal_ForceMyEnumIntSize_can_nbc:
+  return "Internal_ForceMyEnumIntSize_can_nbc";
+  }
+ return NULL;
+}
+const char *getChamber_style_e(chamber_style_e value){
+switch(value) {
+case CS_CLOSED:
+  return "CS_CLOSED";
+case CS_OPEN:
+  return "CS_OPEN";
+case CS_SWIRL_TUMBLE:
+  return "CS_SWIRL_TUMBLE";
+case Internal_ForceMyEnumIntSize_chamber_stype:
+  return "Internal_ForceMyEnumIntSize_chamber_stype";
+  }
+ return NULL;
+}
+const char *getCranking_ignition_mode_e(cranking_ignition_mode_e value){
+switch(value) {
+case CIM_DEFAULT:
+  return "CIM_DEFAULT";
+case CIM_FIXED_ANGLE:
+  return "CIM_FIXED_ANGLE";
+case Force_4_bytes_size_cranking_ignition_mode:
+  return "Force_4_bytes_size_cranking_ignition_mode";
+  }
+ return NULL;
+}
 const char *getDebug_mode_e(debug_mode_e value){
 switch(value) {
 case DBG_35:
@@ -1011,60 +612,189 @@ case Force_4_bytes_size_debug_mode_e:
   }
  return NULL;
 }
-const char *getAir_pressure_sensor_type_e(air_pressure_sensor_type_e value){
+const char *getDisplay_mode_e(display_mode_e value){
 switch(value) {
-case Force_4_bytes_size_cranking_map_type:
-  return "Force_4_bytes_size_cranking_map_type";
-case MT_CUSTOM:
-  return "MT_CUSTOM";
-case MT_DENSO183:
-  return "MT_DENSO183";
-case MT_DODGE_NEON_2003:
-  return "MT_DODGE_NEON_2003";
-case MT_GM_3_BAR:
-  return "MT_GM_3_BAR";
-case MT_HONDA3BAR:
-  return "MT_HONDA3BAR";
-case MT_MPX4100:
-  return "MT_MPX4100";
-case MT_MPX4250:
-  return "MT_MPX4250";
-case MT_MPX4250A:
-  return "MT_MPX4250A";
-case MT_SUBY_DENSO:
-  return "MT_SUBY_DENSO";
-case MT_TOYOTA_89420_02010:
-  return "MT_TOYOTA_89420_02010";
+case DM_HD44780:
+  return "DM_HD44780";
+case DM_HD44780_OVER_PCF8574:
+  return "DM_HD44780_OVER_PCF8574";
+case DM_NONE:
+  return "DM_NONE";
+case Force_4_bytes_size_display_mode:
+  return "Force_4_bytes_size_display_mode";
   }
  return NULL;
 }
-const char *getCan_device_mode_e(can_device_mode_e value){
+const char *getEgo_sensor_e(ego_sensor_e value){
 switch(value) {
-case CD_OFF:
-  return "CD_OFF";
-case CD_USE_CAN1:
-  return "CD_USE_CAN1";
-case CD_USE_CAN2:
-  return "CD_USE_CAN2";
-case Internal_ForceMyEnumIntSize_can_device_mode:
-  return "Internal_ForceMyEnumIntSize_can_device_mode";
+case ES_14Point7_Free:
+  return "ES_14Point7_Free";
+case ES_AEM:
+  return "ES_AEM";
+case ES_BPSX_D1:
+  return "ES_BPSX_D1";
+case ES_Custom:
+  return "ES_Custom";
+case ES_Innovate_MTX_L:
+  return "ES_Innovate_MTX_L";
+case ES_NarrowBand:
+  return "ES_NarrowBand";
+case ES_PLX:
+  return "ES_PLX";
+case Force_4_bytes_size_ego_sensor:
+  return "Force_4_bytes_size_ego_sensor";
   }
  return NULL;
 }
-const char *getSensor_chart_e(sensor_chart_e value){
+const char *getEngine_load_mode_e(engine_load_mode_e value){
 switch(value) {
-case Internal_ForceMyEnumIntSize_sensor_chart:
-  return "Internal_ForceMyEnumIntSize_sensor_chart";
-case SC_DETAILED_RPM:
-  return "SC_DETAILED_RPM";
-case SC_MAP:
-  return "SC_MAP";
-case SC_OFF:
-  return "SC_OFF";
-case SC_RPM_ACCEL:
-  return "SC_RPM_ACCEL";
-case SC_TRIGGER:
-  return "SC_TRIGGER";
+case Force_4_bytes_size_engine_load_mode:
+  return "Force_4_bytes_size_engine_load_mode";
+case LM_ALPHA_N:
+  return "LM_ALPHA_N";
+case LM_MAP:
+  return "LM_MAP";
+case LM_PLAIN_MAF:
+  return "LM_PLAIN_MAF";
+case LM_REAL_MAF:
+  return "LM_REAL_MAF";
+case LM_SPEED_DENSITY:
+  return "LM_SPEED_DENSITY";
+  }
+ return NULL;
+}
+const char *getEngine_type_e(engine_type_e value){
+switch(value) {
+case ACURA_RSX:
+  return "ACURA_RSX";
+case AUDI_AAN:
+  return "AUDI_AAN";
+case BMW_E34:
+  return "BMW_E34";
+case CAMARO_4:
+  return "CAMARO_4";
+case CHEVY_C20_1973:
+  return "CHEVY_C20_1973";
+case CITROEN_TU3JP:
+  return "CITROEN_TU3JP";
+case CUSTOM_ENGINE:
+  return "CUSTOM_ENGINE";
+case DAIHATSU:
+  return "DAIHATSU";
+case DODGE_NEON_1995:
+  return "DODGE_NEON_1995";
+case DODGE_NEON_2003_CAM:
+  return "DODGE_NEON_2003_CAM";
+case DODGE_NEON_2003_CRANK:
+  return "DODGE_NEON_2003_CRANK";
+case DODGE_RAM:
+  return "DODGE_RAM";
+case DODGE_STRATUS:
+  return "DODGE_STRATUS";
+case ETB_BENCH_ENGINE:
+  return "ETB_BENCH_ENGINE";
+case FORD_ASPIRE_1996:
+  return "FORD_ASPIRE_1996";
+case FORD_ESCORT_GT:
+  return "FORD_ESCORT_GT";
+case FORD_FIESTA:
+  return "FORD_FIESTA";
+case FORD_INLINE_6_1995:
+  return "FORD_INLINE_6_1995";
+case FRANKENSO_QA_ENGINE:
+  return "FRANKENSO_QA_ENGINE";
+case Force_4_bytes_size_engine_type:
+  return "Force_4_bytes_size_engine_type";
+case GEO_STORM:
+  return "GEO_STORM";
+case GM_2_2:
+  return "GM_2_2";
+case GY6_139QMB:
+  return "GY6_139QMB";
+case HONDA_600:
+  return "HONDA_600";
+case HONDA_ACCORD_1_24_SHIFTED:
+  return "HONDA_ACCORD_1_24_SHIFTED";
+case HONDA_ACCORD_CD:
+  return "HONDA_ACCORD_CD";
+case HONDA_ACCORD_CD_DIP:
+  return "HONDA_ACCORD_CD_DIP";
+case HONDA_ACCORD_CD_TWO_WIRES:
+  return "HONDA_ACCORD_CD_TWO_WIRES";
+case LADA_KALINA:
+  return "LADA_KALINA";
+case MAZDA_323:
+  return "MAZDA_323";
+case MAZDA_626:
+  return "MAZDA_626";
+case MAZDA_MIATA_2003:
+  return "MAZDA_MIATA_2003";
+case MAZDA_MIATA_2003_BOARD_TEST:
+  return "MAZDA_MIATA_2003_BOARD_TEST";
+case MAZDA_MIATA_2003_NA_RAIL:
+  return "MAZDA_MIATA_2003_NA_RAIL";
+case MAZDA_MIATA_NA8:
+  return "MAZDA_MIATA_NA8";
+case MAZDA_MIATA_NB1:
+  return "MAZDA_MIATA_NB1";
+case MIATA_1990:
+  return "MIATA_1990";
+case MIATA_1994_DEVIATOR:
+  return "MIATA_1994_DEVIATOR";
+case MIATA_1994_SPAGS:
+  return "MIATA_1994_SPAGS";
+case MIATA_1996:
+  return "MIATA_1996";
+case MIATA_NA6_MAP:
+  return "MIATA_NA6_MAP";
+case MIATA_NA6_VAF:
+  return "MIATA_NA6_VAF";
+case MINIMAL_PINS:
+  return "MINIMAL_PINS";
+case MINI_COOPER_R50:
+  return "MINI_COOPER_R50";
+case MITSU_4G93:
+  return "MITSU_4G93";
+case NISSAN_PRIMERA:
+  return "NISSAN_PRIMERA";
+case PROMETHEUS_DEFAULTS:
+  return "PROMETHEUS_DEFAULTS";
+case ROVER_V8:
+  return "ROVER_V8";
+case SACHS:
+  return "SACHS";
+case SATURN_ION_2004:
+  return "SATURN_ION_2004";
+case SUBARUEJ20G_DEFAULTS:
+  return "SUBARUEJ20G_DEFAULTS";
+case SUBARU_2003_WRX:
+  return "SUBARU_2003_WRX";
+case SUZUKI_VITARA:
+  return "SUZUKI_VITARA";
+case TEST_CIVIC_4_0_BOTH:
+  return "TEST_CIVIC_4_0_BOTH";
+case TEST_CIVIC_4_0_RISE:
+  return "TEST_CIVIC_4_0_RISE";
+case TEST_ENGINE:
+  return "TEST_ENGINE";
+case TEST_ENGINE_VVT:
+  return "TEST_ENGINE_VVT";
+case TEST_ISSUE_366_BOTH:
+  return "TEST_ISSUE_366_BOTH";
+case TEST_ISSUE_366_RISE:
+  return "TEST_ISSUE_366_RISE";
+case TLE8888_BENCH_ENGINE:
+  return "TLE8888_BENCH_ENGINE";
+case TOYOTA_2JZ_GTE_VVTi:
+  return "TOYOTA_2JZ_GTE_VVTi";
+case TOYOTA_JZS147:
+  return "TOYOTA_JZS147";
+case VAG_18_TURBO:
+  return "VAG_18_TURBO";
+case VW_ABA:
+  return "VW_ABA";
+case ZIL_130:
+  return "ZIL_130";
   }
  return NULL;
 }
@@ -1083,60 +813,6 @@ case NEUTRAL:
   }
  return NULL;
 }
-const char *getMaf_sensor_type_e(maf_sensor_type_e value){
-switch(value) {
-case Bosch0280218004:
-  return "Bosch0280218004";
-case Bosch0280218037:
-  return "Bosch0280218037";
-case CUSTOM:
-  return "CUSTOM";
-case DensoTODO:
-  return "DensoTODO";
-case Internal_ForceMyEnumIntSize_maf_sensor:
-  return "Internal_ForceMyEnumIntSize_maf_sensor";
-  }
- return NULL;
-}
-const char *getTiming_mode_e(timing_mode_e value){
-switch(value) {
-case Internal_ForceMyEnumIntSize_timing_mode:
-  return "Internal_ForceMyEnumIntSize_timing_mode";
-case TM_DYNAMIC:
-  return "TM_DYNAMIC";
-case TM_FIXED:
-  return "TM_FIXED";
-  }
- return NULL;
-}
-const char *getChamber_style_e(chamber_style_e value){
-switch(value) {
-case CS_CLOSED:
-  return "CS_CLOSED";
-case CS_OPEN:
-  return "CS_OPEN";
-case CS_SWIRL_TUMBLE:
-  return "CS_SWIRL_TUMBLE";
-case Internal_ForceMyEnumIntSize_chamber_stype:
-  return "Internal_ForceMyEnumIntSize_chamber_stype";
-  }
- return NULL;
-}
-const char *getCan_nbc_e(can_nbc_e value){
-switch(value) {
-case CAN_BUS_MAZDA_RX8:
-  return "CAN_BUS_MAZDA_RX8";
-case CAN_BUS_NBC_BMW:
-  return "CAN_BUS_NBC_BMW";
-case CAN_BUS_NBC_FIAT:
-  return "CAN_BUS_NBC_FIAT";
-case CAN_BUS_NBC_VAG:
-  return "CAN_BUS_NBC_VAG";
-case Internal_ForceMyEnumIntSize_can_nbc:
-  return "Internal_ForceMyEnumIntSize_can_nbc";
-  }
- return NULL;
-}
 const char *getHip_state_e(hip_state_e value){
 switch(value) {
 case IS_INTEGRATING:
@@ -1154,44 +830,14 @@ case WAITING_FOR_RESULT_ADC:
   }
  return NULL;
 }
-const char *getTChargeMode_e(tChargeMode_e value){
+const char *getIdle_mode_e(idle_mode_e value){
 switch(value) {
-case Force_4bytes_size_tChargeMode_e:
-  return "Force_4bytes_size_tChargeMode_e";
-case TCHARGE_MODE_AIR_INTERP:
-  return "TCHARGE_MODE_AIR_INTERP";
-case TCHARGE_MODE_RPM_TPS:
-  return "TCHARGE_MODE_RPM_TPS";
-  }
- return NULL;
-}
-const char *getPidAutoTune_Peak(PidAutoTune_Peak value){
-switch(value) {
-case MAXIMUM:
-  return "MAXIMUM";
-case MINIMUM:
-  return "MINIMUM";
-case NOT_A_PEAK:
-  return "NOT_A_PEAK";
-  }
- return NULL;
-}
-const char *getPidAutoTune_AutoTunerState(PidAutoTune_AutoTunerState value){
-switch(value) {
-case AUTOTUNER_OFF:
-  return "AUTOTUNER_OFF";
-case CONVERGED:
-  return "CONVERGED";
-case FAILED:
-  return "FAILED";
-case RELAY_STEP_DOWN:
-  return "RELAY_STEP_DOWN";
-case RELAY_STEP_UP:
-  return "RELAY_STEP_UP";
-case STEADY_STATE_AFTER_STEP_UP:
-  return "STEADY_STATE_AFTER_STEP_UP";
-case STEADY_STATE_AT_BASELINE:
-  return "STEADY_STATE_AT_BASELINE";
+case Force_4_bytes_size_idle_mode:
+  return "Force_4_bytes_size_idle_mode";
+case IM_AUTO:
+  return "IM_AUTO";
+case IM_MANUAL:
+  return "IM_MANUAL";
   }
  return NULL;
 }
@@ -1216,3 +862,357 @@ case TPS_THRESHOLD:
   }
  return NULL;
 }
+const char *getIgnition_mode_e(ignition_mode_e value){
+switch(value) {
+case Force_4_bytes_size_ignition_mode:
+  return "Force_4_bytes_size_ignition_mode";
+case IM_INDIVIDUAL_COILS:
+  return "IM_INDIVIDUAL_COILS";
+case IM_ONE_COIL:
+  return "IM_ONE_COIL";
+case IM_TWO_COILS:
+  return "IM_TWO_COILS";
+case IM_WASTED_SPARK:
+  return "IM_WASTED_SPARK";
+  }
+ return NULL;
+}
+const char *getInjection_mode_e(injection_mode_e value){
+switch(value) {
+case Force_4_bytes_size_injection_mode:
+  return "Force_4_bytes_size_injection_mode";
+case IM_BATCH:
+  return "IM_BATCH";
+case IM_SEQUENTIAL:
+  return "IM_SEQUENTIAL";
+case IM_SIMULTANEOUS:
+  return "IM_SIMULTANEOUS";
+case IM_SINGLE_POINT:
+  return "IM_SINGLE_POINT";
+  }
+ return NULL;
+}
+const char *getLog_format_e(log_format_e value){
+switch(value) {
+case Force_4_bytes_size_log_format:
+  return "Force_4_bytes_size_log_format";
+case LF_NATIVE:
+  return "LF_NATIVE";
+case LM_MLV:
+  return "LM_MLV";
+  }
+ return NULL;
+}
+const char *getMaf_sensor_type_e(maf_sensor_type_e value){
+switch(value) {
+case Bosch0280218004:
+  return "Bosch0280218004";
+case Bosch0280218037:
+  return "Bosch0280218037";
+case CUSTOM:
+  return "CUSTOM";
+case DensoTODO:
+  return "DensoTODO";
+case Internal_ForceMyEnumIntSize_maf_sensor:
+  return "Internal_ForceMyEnumIntSize_maf_sensor";
+  }
+ return NULL;
+}
+const char *getMass_storage_e(mass_storage_e value){
+switch(value) {
+case Force_4_bytes_size_mass_storage:
+  return "Force_4_bytes_size_mass_storage";
+case MS_ALWAYS:
+  return "MS_ALWAYS";
+case MS_AUTO:
+  return "MS_AUTO";
+case MS_NEVER:
+  return "MS_NEVER";
+  }
+ return NULL;
+}
+const char *getOperation_mode_e(operation_mode_e value){
+switch(value) {
+case FOUR_STROKE_CAM_SENSOR:
+  return "FOUR_STROKE_CAM_SENSOR";
+case FOUR_STROKE_CRANK_SENSOR:
+  return "FOUR_STROKE_CRANK_SENSOR";
+case FOUR_STROKE_SYMMETRICAL_CRANK_SENSOR:
+  return "FOUR_STROKE_SYMMETRICAL_CRANK_SENSOR";
+case Force_4_bytes_size_operation_mode_e:
+  return "Force_4_bytes_size_operation_mode_e";
+case OM_NONE:
+  return "OM_NONE";
+case TWO_STROKE:
+  return "TWO_STROKE";
+  }
+ return NULL;
+}
+const char *getPin_input_mode_e(pin_input_mode_e value){
+switch(value) {
+case PI_DEFAULT:
+  return "PI_DEFAULT";
+case PI_PULLDOWN:
+  return "PI_PULLDOWN";
+case PI_PULLUP:
+  return "PI_PULLUP";
+  }
+ return NULL;
+}
+const char *getPin_mode_e(pin_mode_e value){
+switch(value) {
+case PO_DEFAULT:
+  return "PO_DEFAULT";
+case PO_OPENDRAIN:
+  return "PO_OPENDRAIN";
+case PO_PULLDOWN:
+  return "PO_PULLDOWN";
+case PO_PULLUP:
+  return "PO_PULLUP";
+  }
+ return NULL;
+}
+const char *getPin_output_mode_e(pin_output_mode_e value){
+switch(value) {
+case OM_DEFAULT:
+  return "OM_DEFAULT";
+case OM_INVERTED:
+  return "OM_INVERTED";
+case OM_OPENDRAIN:
+  return "OM_OPENDRAIN";
+case OM_OPENDRAIN_INVERTED:
+  return "OM_OPENDRAIN_INVERTED";
+  }
+ return NULL;
+}
+const char *getSensor_chart_e(sensor_chart_e value){
+switch(value) {
+case Internal_ForceMyEnumIntSize_sensor_chart:
+  return "Internal_ForceMyEnumIntSize_sensor_chart";
+case SC_DETAILED_RPM:
+  return "SC_DETAILED_RPM";
+case SC_MAP:
+  return "SC_MAP";
+case SC_OFF:
+  return "SC_OFF";
+case SC_RPM_ACCEL:
+  return "SC_RPM_ACCEL";
+case SC_TRIGGER:
+  return "SC_TRIGGER";
+  }
+ return NULL;
+}
+const char *getSpi_device_e(spi_device_e value){
+switch(value) {
+case SPI_DEVICE_1:
+  return "SPI_DEVICE_1";
+case SPI_DEVICE_2:
+  return "SPI_DEVICE_2";
+case SPI_DEVICE_3:
+  return "SPI_DEVICE_3";
+case SPI_DEVICE_4:
+  return "SPI_DEVICE_4";
+case SPI_NONE:
+  return "SPI_NONE";
+  }
+ return NULL;
+}
+const char *getSpi_speed_e(spi_speed_e value){
+switch(value) {
+case _150KHz:
+  return "_150KHz";
+case _1_25MHz:
+  return "_1_25MHz";
+case _2_5MHz:
+  return "_2_5MHz";
+case _5MHz:
+  return "_5MHz";
+  }
+ return NULL;
+}
+const char *getTChargeMode_e(tChargeMode_e value){
+switch(value) {
+case Force_4bytes_size_tChargeMode_e:
+  return "Force_4bytes_size_tChargeMode_e";
+case TCHARGE_MODE_AIR_INTERP:
+  return "TCHARGE_MODE_AIR_INTERP";
+case TCHARGE_MODE_RPM_TPS:
+  return "TCHARGE_MODE_RPM_TPS";
+  }
+ return NULL;
+}
+const char *getTiming_mode_e(timing_mode_e value){
+switch(value) {
+case Internal_ForceMyEnumIntSize_timing_mode:
+  return "Internal_ForceMyEnumIntSize_timing_mode";
+case TM_DYNAMIC:
+  return "TM_DYNAMIC";
+case TM_FIXED:
+  return "TM_FIXED";
+  }
+ return NULL;
+}
+const char *getTrigger_event_e(trigger_event_e value){
+switch(value) {
+case SHAFT_3RD_FALLING:
+  return "SHAFT_3RD_FALLING";
+case SHAFT_3RD_RISING:
+  return "SHAFT_3RD_RISING";
+case SHAFT_PRIMARY_FALLING:
+  return "SHAFT_PRIMARY_FALLING";
+case SHAFT_PRIMARY_RISING:
+  return "SHAFT_PRIMARY_RISING";
+case SHAFT_SECONDARY_FALLING:
+  return "SHAFT_SECONDARY_FALLING";
+case SHAFT_SECONDARY_RISING:
+  return "SHAFT_SECONDARY_RISING";
+  }
+ return NULL;
+}
+const char *getTrigger_type_e(trigger_type_e value){
+switch(value) {
+case Force_4_bytes_size_trigger_type:
+  return "Force_4_bytes_size_trigger_type";
+case TT_2JZ_1_12:
+  return "TT_2JZ_1_12";
+case TT_2JZ_3_34:
+  return "TT_2JZ_3_34";
+case TT_36_2_2_2:
+  return "TT_36_2_2_2";
+case TT_3_1_CAM:
+  return "TT_3_1_CAM";
+case TT_60_2_VW:
+  return "TT_60_2_VW";
+case TT_DODGE_NEON_1995:
+  return "TT_DODGE_NEON_1995";
+case TT_DODGE_NEON_1995_ONLY_CRANK:
+  return "TT_DODGE_NEON_1995_ONLY_CRANK";
+case TT_DODGE_NEON_2003_CAM:
+  return "TT_DODGE_NEON_2003_CAM";
+case TT_DODGE_NEON_2003_CRANK:
+  return "TT_DODGE_NEON_2003_CRANK";
+case TT_DODGE_RAM:
+  return "TT_DODGE_RAM";
+case TT_DODGE_STRATUS:
+  return "TT_DODGE_STRATUS";
+case TT_FIAT_IAW_P8:
+  return "TT_FIAT_IAW_P8";
+case TT_FORD_ASPIRE:
+  return "TT_FORD_ASPIRE";
+case TT_GM_7X:
+  return "TT_GM_7X";
+case TT_GM_LS_24:
+  return "TT_GM_LS_24";
+case TT_HONDA_1_24:
+  return "TT_HONDA_1_24";
+case TT_HONDA_1_4_24:
+  return "TT_HONDA_1_4_24";
+case TT_HONDA_4_24:
+  return "TT_HONDA_4_24";
+case TT_HONDA_4_24_1:
+  return "TT_HONDA_4_24_1";
+case TT_HONDA_ACCORD_1_24_SHIFTED:
+  return "TT_HONDA_ACCORD_1_24_SHIFTED";
+case TT_HONDA_CBR_600:
+  return "TT_HONDA_CBR_600";
+case TT_HONDA_CBR_600_CUSTOM:
+  return "TT_HONDA_CBR_600_CUSTOM";
+case TT_JEEP_18_2_2_2:
+  return "TT_JEEP_18_2_2_2";
+case TT_JEEP_4_CYL:
+  return "TT_JEEP_4_CYL";
+case TT_MAZDA_DOHC_1_4:
+  return "TT_MAZDA_DOHC_1_4";
+case TT_MAZDA_MIATA_NA:
+  return "TT_MAZDA_MIATA_NA";
+case TT_MAZDA_MIATA_NB1:
+  return "TT_MAZDA_MIATA_NB1";
+case TT_MAZDA_MIATA_VVT_TEST:
+  return "TT_MAZDA_MIATA_VVT_TEST";
+case TT_MAZDA_SOHC_4:
+  return "TT_MAZDA_SOHC_4";
+case TT_MAZDA_Z5:
+  return "TT_MAZDA_Z5";
+case TT_MIATA_VVT:
+  return "TT_MIATA_VVT";
+case TT_MINI_COOPER_R50:
+  return "TT_MINI_COOPER_R50";
+case TT_MITSUBISHI:
+  return "TT_MITSUBISHI";
+case TT_NISSAN_SR20VE:
+  return "TT_NISSAN_SR20VE";
+case TT_NISSAN_SR20VE_360:
+  return "TT_NISSAN_SR20VE_360";
+case TT_ONE:
+  return "TT_ONE";
+case TT_ONE_PLUS_ONE:
+  return "TT_ONE_PLUS_ONE";
+case TT_ONE_PLUS_TOOTHED_WHEEL_60_2:
+  return "TT_ONE_PLUS_TOOTHED_WHEEL_60_2";
+case TT_ROVER_K:
+  return "TT_ROVER_K";
+case TT_SUBARU_7_6:
+  return "TT_SUBARU_7_6";
+case TT_TOOTHED_WHEEL:
+  return "TT_TOOTHED_WHEEL";
+case TT_TOOTHED_WHEEL_36_1:
+  return "TT_TOOTHED_WHEEL_36_1";
+case TT_TOOTHED_WHEEL_60_2:
+  return "TT_TOOTHED_WHEEL_60_2";
+case TT_UNUSED:
+  return "TT_UNUSED";
+  }
+ return NULL;
+}
+const char *getTrigger_value_e(trigger_value_e value){
+switch(value) {
+case TV_FALL:
+  return "TV_FALL";
+case TV_RISE:
+  return "TV_RISE";
+  }
+ return NULL;
+}
+const char *getTrigger_wheel_e(trigger_wheel_e value){
+switch(value) {
+case T_CHANNEL_3:
+  return "T_CHANNEL_3";
+case T_NONE:
+  return "T_NONE";
+case T_PRIMARY:
+  return "T_PRIMARY";
+case T_SECONDARY:
+  return "T_SECONDARY";
+  }
+ return NULL;
+}
+const char *getUart_device_e(uart_device_e value){
+switch(value) {
+case UART_DEVICE_1:
+  return "UART_DEVICE_1";
+case UART_DEVICE_2:
+  return "UART_DEVICE_2";
+case UART_DEVICE_3:
+  return "UART_DEVICE_3";
+case UART_DEVICE_4:
+  return "UART_DEVICE_4";
+case UART_NONE:
+  return "UART_NONE";
+  }
+ return NULL;
+}
+const char *getVvt_mode_e(vvt_mode_e value){
+switch(value) {
+case Force_4_bytes_size_vvt_mode:
+  return "Force_4_bytes_size_vvt_mode";
+case MIATA_NB2:
+  return "MIATA_NB2";
+case VVT_2GZ:
+  return "VVT_2GZ";
+case VVT_FIRST_HALF:
+  return "VVT_FIRST_HALF";
+case VVT_SECOND_HALF:
+  return "VVT_SECOND_HALF";
+  }
+ return NULL;
+}
diff --git a/firmware/controllers/algo/auto_generated_enums.h b/firmware/controllers/algo/auto_generated_enums.h
index 2e1a5ea598..c9f38322cb 100644
--- a/firmware/controllers/algo/auto_generated_enums.h
+++ b/firmware/controllers/algo/auto_generated_enums.h
@@ -1,6 +1,6 @@
 // auto-generated from.\controllers/algo/rusefi_enums.h
 // by enum2string.jar tool
-// on Sat May 11 10:22:02 EDT 2019
+// on Tue May 28 22:08:21 EDT 2019
 // see also gen_config_and_enums.bat
 
 
@@ -8,43 +8,43 @@
 #ifndef _A_H_HEADER_
 #define _A_H_HEADER_
 #include "rusefi_enums.h"
-const char *getEngine_type_e(engine_type_e value);
-const char *getTrigger_type_e(trigger_type_e value);
+const char *getPidAutoTune_AutoTunerState(PidAutoTune_AutoTunerState value);
+const char *getPidAutoTune_Peak(PidAutoTune_Peak value);
+const char *getAdc_channel_e(adc_channel_e value);
 const char *getAdc_channel_mode_e(adc_channel_mode_e value);
-const char *getTrigger_value_e(trigger_value_e value);
-const char *getTrigger_wheel_e(trigger_wheel_e value);
-const char *getTrigger_event_e(trigger_event_e value);
-const char *getVvt_mode_e(vvt_mode_e value);
-const char *getEngine_load_mode_e(engine_load_mode_e value);
+const char *getAir_pressure_sensor_type_e(air_pressure_sensor_type_e value);
+const char *getBrain_pin_e(brain_pin_e value);
+const char *getCan_device_mode_e(can_device_mode_e value);
+const char *getCan_nbc_e(can_nbc_e value);
+const char *getChamber_style_e(chamber_style_e value);
+const char *getCranking_ignition_mode_e(cranking_ignition_mode_e value);
+const char *getDebug_mode_e(debug_mode_e value);
 const char *getDisplay_mode_e(display_mode_e value);
-const char *getLog_format_e(log_format_e value);
+const char *getEgo_sensor_e(ego_sensor_e value);
+const char *getEngine_load_mode_e(engine_load_mode_e value);
+const char *getEngine_type_e(engine_type_e value);
+const char *getGear_e(gear_e value);
+const char *getHip_state_e(hip_state_e value);
 const char *getIdle_mode_e(idle_mode_e value);
-const char *getPin_output_mode_e(pin_output_mode_e value);
-const char *getPin_mode_e(pin_mode_e value);
-const char *getPin_input_mode_e(pin_input_mode_e value);
-const char *getOperation_mode_e(operation_mode_e value);
+const char *getIdle_state_e(idle_state_e value);
 const char *getIgnition_mode_e(ignition_mode_e value);
 const char *getInjection_mode_e(injection_mode_e value);
-const char *getCranking_ignition_mode_e(cranking_ignition_mode_e value);
-const char *getUart_device_e(uart_device_e value);
-const char *getSpi_speed_e(spi_speed_e value);
-const char *getSpi_device_e(spi_device_e value);
-const char *getAdc_channel_e(adc_channel_e value);
-const char *getMass_storage_e(mass_storage_e value);
-const char *getEgo_sensor_e(ego_sensor_e value);
-const char *getBrain_pin_e(brain_pin_e value);
-const char *getDebug_mode_e(debug_mode_e value);
-const char *getAir_pressure_sensor_type_e(air_pressure_sensor_type_e value);
-const char *getCan_device_mode_e(can_device_mode_e value);
-const char *getSensor_chart_e(sensor_chart_e value);
-const char *getGear_e(gear_e value);
+const char *getLog_format_e(log_format_e value);
 const char *getMaf_sensor_type_e(maf_sensor_type_e value);
-const char *getTiming_mode_e(timing_mode_e value);
-const char *getChamber_style_e(chamber_style_e value);
-const char *getCan_nbc_e(can_nbc_e value);
-const char *getHip_state_e(hip_state_e value);
+const char *getMass_storage_e(mass_storage_e value);
+const char *getOperation_mode_e(operation_mode_e value);
+const char *getPin_input_mode_e(pin_input_mode_e value);
+const char *getPin_mode_e(pin_mode_e value);
+const char *getPin_output_mode_e(pin_output_mode_e value);
+const char *getSensor_chart_e(sensor_chart_e value);
+const char *getSpi_device_e(spi_device_e value);
+const char *getSpi_speed_e(spi_speed_e value);
 const char *getTChargeMode_e(tChargeMode_e value);
-const char *getPidAutoTune_Peak(PidAutoTune_Peak value);
-const char *getPidAutoTune_AutoTunerState(PidAutoTune_AutoTunerState value);
-const char *getIdle_state_e(idle_state_e value);
+const char *getTiming_mode_e(timing_mode_e value);
+const char *getTrigger_event_e(trigger_event_e value);
+const char *getTrigger_type_e(trigger_type_e value);
+const char *getTrigger_value_e(trigger_value_e value);
+const char *getTrigger_wheel_e(trigger_wheel_e value);
+const char *getUart_device_e(uart_device_e value);
+const char *getVvt_mode_e(vvt_mode_e value);
 #endif /*_A_H_HEADER_ */
diff --git a/java_tools/enum2string.jar b/java_tools/enum2string.jar
index ad8e266fcd4922de0379b5a9272ddafd081c9051..ccfe9e0b2157a274c8353a26a8c951e75ee01de8 100644
GIT binary patch
literal 9041
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

literal 7233
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

diff --git a/java_tools/enum_to_string/enum_to_string.iml b/java_tools/enum_to_string/enum_to_string.iml
index 2d6846244d..8e1b626b59 100644
--- a/java_tools/enum_to_string/enum_to_string.iml
+++ b/java_tools/enum_to_string/enum_to_string.iml
@@ -7,6 +7,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="TEST" name="junit" level="project" />
+    <orderEntry type="library" name="junit" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/java_tools/enum_to_string/src/com/rusefi/EnumToString.java b/java_tools/enum_to_string/src/com/rusefi/EnumToString.java
index 25f41bac96..eaa8719e21 100644
--- a/java_tools/enum_to_string/src/com/rusefi/EnumToString.java
+++ b/java_tools/enum_to_string/src/com/rusefi/EnumToString.java
@@ -2,8 +2,8 @@ package com.rusefi;
 
 import java.io.*;
 import java.util.Date;
+import java.util.Map;
 import java.util.Set;
-import java.util.TreeSet;
 
 /**
  * (c) Andrey Belomutskiy
@@ -12,8 +12,6 @@ import java.util.TreeSet;
  */
 @SuppressWarnings("StringConcatenationInsideStringBufferAppend")
 public class EnumToString {
-    private final static Set<String> currentValues = new TreeSet<>();
-
     public final static StringBuilder cppFileContent = new StringBuilder();
     private final static StringBuilder headerFileContent = new StringBuilder();
 
@@ -28,7 +26,7 @@ public class EnumToString {
         headerFileContent.append("#ifndef _A_H_HEADER_\r\n");
         headerFileContent.append("#define _A_H_HEADER_\r\n");
 
-        process(inputPath + File.separator + "controllers/algo/rusefi_enums.h");
+        processFile(inputPath + File.separator + "controllers/algo/rusefi_enums.h");
 
         headerFileContent.append("#endif /*_A_H_HEADER_ */\r\n");
 
@@ -45,8 +43,7 @@ public class EnumToString {
         bw.close();
     }
 
-    private static void process(String inFileName) throws IOException {
-
+    private static void processFile(String inFileName) throws IOException {
         String header = "// auto-generated from" + inFileName + "\r\n" +
                 "// by enum2string.jar tool\r\n" +
                 "// on " + new Date() +"\r\n" +
@@ -70,58 +67,26 @@ public class EnumToString {
         process(new FileReader(inFileName));
     }
 
+    public static void process(Reader reader) throws IOException {
+        EnumsReader.process(reader);
+        for (Map.Entry<String, Set<String>> e : EnumsReader.enums.entrySet()) {
+            String enumName = e.getKey();
+            cppFileContent.append(makeCode(enumName, e.getValue()));
+            EnumToString.headerFileContent.append(getMethodSignature(enumName) + ";\r\n");
+        }
+    }
+
     public static void clear() {
         cppFileContent.setLength(0);
     }
 
-    public static void process(Reader in) throws IOException {
-        boolean isInsideEnum = false;
-        BufferedReader reader = new BufferedReader(in);
-        String line;
-        while ((line = reader.readLine()) != null) {
-            line = removeSpaces(line);
-
-            if (line.startsWith("typedefenum{") || line.startsWith("typedefenum__attribute__")) {
-                System.out.println("Entering enum");
-                currentValues.clear();
-                isInsideEnum = true;
-            } else if (line.startsWith("}") && line.endsWith(";")) {
-                isInsideEnum = false;
-                line = line.substring(1, line.length() - 1);
-                System.out.println("Ending enum " + line);
-                cppFileContent.append(makeCode(line));
-                EnumToString.headerFileContent.append(getMethodSignature(line) + ";\r\n");
-            } else {
-                line = line.replaceAll("//.+", "");
-                if (isInsideEnum) {
-                    if (isKeyValueLine(line)) {
-                        line = line.replace(",", "");
-                        int index = line.indexOf('=');
-                        if (index != -1)
-                            line = line.substring(0, index);
-                        System.out.println("Line " + line);
-                        currentValues.add(line);
-                    }
-                }
-            }
-        }
-    }
-
-    static String removeSpaces(String line) {
-        return line.replaceAll("\\s+", "");
-    }
-
-    static boolean isKeyValueLine(String line) {
-        return removeSpaces(line).matches("[a-zA-Z_$][a-zA-Z\\d_$]*[=-a-zA-Z\\d_*]*,?");
-    }
-
-    private static String makeCode(String enumName) {
+    private static String makeCode(String enumName, Set<String> values) {
         StringBuilder sb = new StringBuilder();
         sb.append(getMethodSignature(enumName) + "{\r\n");
 
         sb.append("switch(value) {\r\n");
 
-        for (String e : currentValues) {
+        for (String e : values) {
             sb.append("case " + e + ":\r\n");
             sb.append("  return \"" + e + "\";\r\n");
         }
diff --git a/java_tools/enum_to_string/src/com/rusefi/EnumToStringTest.java b/java_tools/enum_to_string/src/com/rusefi/EnumToStringTest.java
index ea6b95c315..b1e350d9eb 100644
--- a/java_tools/enum_to_string/src/com/rusefi/EnumToStringTest.java
+++ b/java_tools/enum_to_string/src/com/rusefi/EnumToStringTest.java
@@ -5,7 +5,7 @@ import org.junit.Test;
 import java.io.IOException;
 import java.io.StringReader;
 
-import static com.rusefi.EnumToString.isKeyValueLine;
+import static com.rusefi.EnumsReader.isKeyValueLine;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
diff --git a/java_tools/enum_to_string/src/com/rusefi/EnumsReader.java b/java_tools/enum_to_string/src/com/rusefi/EnumsReader.java
new file mode 100644
index 0000000000..5f5215430a
--- /dev/null
+++ b/java_tools/enum_to_string/src/com/rusefi/EnumsReader.java
@@ -0,0 +1,55 @@
+package com.rusefi;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.Reader;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.TreeSet;
+
+public class EnumsReader {
+    private final static Set<String> currentValues = new TreeSet<>();
+
+    public final static Map<String, Set<String>> enums = new TreeMap<>();
+
+    public static void process(Reader in) throws IOException {
+        boolean isInsideEnum = false;
+        BufferedReader reader = new BufferedReader(in);
+        String line;
+        while ((line = reader.readLine()) != null) {
+            line = removeSpaces(line);
+
+            if (line.startsWith("typedefenum{") || line.startsWith("typedefenum__attribute__")) {
+                System.out.println("Entering enum");
+                currentValues.clear();
+                isInsideEnum = true;
+            } else if (line.startsWith("}") && line.endsWith(";")) {
+                isInsideEnum = false;
+                line = line.substring(1, line.length() - 1);
+                System.out.println("Ending enum " + line);
+                enums.put(line, new TreeSet<>(currentValues));
+            } else {
+                line = line.replaceAll("//.+", "");
+                if (isInsideEnum) {
+                    if (isKeyValueLine(line)) {
+                        line = line.replace(",", "");
+                        int index = line.indexOf('=');
+                        if (index != -1)
+                            line = line.substring(0, index);
+                        System.out.println("Line " + line);
+                        currentValues.add(line);
+                    }
+                }
+            }
+        }
+    }
+
+    static String removeSpaces(String line) {
+        return line.replaceAll("\\s+", "");
+    }
+
+    static boolean isKeyValueLine(String line) {
+        return removeSpaces(line).matches("[a-zA-Z_$][a-zA-Z\\d_$]*[=-a-zA-Z\\d_*]*,?");
+    }
+}