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 ad8e266fcd..ccfe9e0b21 100644 Binary files a/java_tools/enum2string.jar and b/java_tools/enum2string.jar differ 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 @@ - + \ 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 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> 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 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 currentValues = new TreeSet<>(); + + public final static Map> 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_*]*,?"); + } +}