diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.cpp b/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.cpp index 18694f9d28..a92b93803b 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.cpp +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.cpp @@ -1,7 +1,7 @@ #include "global.h" #include "rusefi_enums.h" #include "rusefi_hw_enums.h" -// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Fri Dec 18 08:54:10 EST 2020 +// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Tue Dec 22 10:13:02 EST 2020 // see also gen_config_and_enums.bat @@ -935,10 +935,12 @@ case NISSAN_PRIMERA: return "NISSAN_PRIMERA"; case PROMETHEUS_DEFAULTS: return "PROMETHEUS_DEFAULTS"; -case PROTEUS: - return "PROTEUS"; +case PROTEUS_DEFAULTS: + return "PROTEUS_DEFAULTS"; case PROTEUS_MIATA_NB2: return "PROTEUS_MIATA_NB2"; +case PROTEUS_QC_TEST_BOARD: + return "PROTEUS_QC_TEST_BOARD"; case SACHS: return "SACHS"; case SUBARUEJ20G_DEFAULTS: @@ -979,8 +981,6 @@ case VW_ABA: return "VW_ABA"; case VW_B6: return "VW_B6"; -case ZIL_130: - return "ZIL_130"; } return NULL; } diff --git a/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp b/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp index 515ccd160a..d0ae114ebe 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp +++ b/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp @@ -1,7 +1,7 @@ #include "global.h" #include "rusefi_enums.h" #include "rusefi_hw_enums.h" -// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Fri Dec 18 08:54:09 EST 2020 +// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Tue Dec 22 10:13:02 EST 2020 // see also gen_config_and_enums.bat @@ -731,10 +731,12 @@ case NISSAN_PRIMERA: return "NISSAN_PRIMERA"; case PROMETHEUS_DEFAULTS: return "PROMETHEUS_DEFAULTS"; -case PROTEUS: - return "PROTEUS"; +case PROTEUS_DEFAULTS: + return "PROTEUS_DEFAULTS"; case PROTEUS_MIATA_NB2: return "PROTEUS_MIATA_NB2"; +case PROTEUS_QC_TEST_BOARD: + return "PROTEUS_QC_TEST_BOARD"; case SACHS: return "SACHS"; case SUBARUEJ20G_DEFAULTS: @@ -775,8 +777,6 @@ case VW_ABA: return "VW_ABA"; case VW_B6: return "VW_B6"; -case ZIL_130: - return "ZIL_130"; } return NULL; } diff --git a/firmware/controllers/algo/auto_generated_enums.cpp b/firmware/controllers/algo/auto_generated_enums.cpp index 6259a9f071..94717c9c09 100644 --- a/firmware/controllers/algo/auto_generated_enums.cpp +++ b/firmware/controllers/algo/auto_generated_enums.cpp @@ -1,7 +1,7 @@ #include "global.h" #include "rusefi_enums.h" #include "rusefi_hw_enums.h" -// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Fri Dec 18 08:54:09 EST 2020 +// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Tue Dec 22 10:13:01 EST 2020 // see also gen_config_and_enums.bat @@ -877,10 +877,12 @@ case NISSAN_PRIMERA: return "NISSAN_PRIMERA"; case PROMETHEUS_DEFAULTS: return "PROMETHEUS_DEFAULTS"; -case PROTEUS: - return "PROTEUS"; +case PROTEUS_DEFAULTS: + return "PROTEUS_DEFAULTS"; case PROTEUS_MIATA_NB2: return "PROTEUS_MIATA_NB2"; +case PROTEUS_QC_TEST_BOARD: + return "PROTEUS_QC_TEST_BOARD"; case SACHS: return "SACHS"; case SUBARUEJ20G_DEFAULTS: @@ -921,8 +923,6 @@ case VW_ABA: return "VW_ABA"; case VW_B6: return "VW_B6"; -case ZIL_130: - return "ZIL_130"; } return NULL; } diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 2ad034a2fc..aa096439b0 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -1155,9 +1155,8 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb switch (engineType) { case MICRO_RUS_EFI: // todo: is it time to replace MICRO_RUS_EFI, PROTEUS, PROMETHEUS_DEFAULTS with MINIMAL_PINS? maybe rename MINIMAL_PINS to DEFAULT? - case PROTEUS: + case PROTEUS_DEFAULTS: case PROMETHEUS_DEFAULTS: - case ZIL_130: case MINIMAL_PINS: // all basic settings are already set in prepareVoidConfiguration(), no need to set anything here // nothing to do - we do it all in setBoardConfigurationOverrides @@ -1190,6 +1189,7 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb break; #endif // EFI_UNIT_TEST #if HW_PROTEUS + case PROTEUS_QC_TEST_BOARD: case BMW_M73_PROTEUS: setEngineBMW_M73_Proteus(PASS_CONFIG_PARAMETER_SIGNATURE); break; diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h index a07e7c7cb9..38230a2a67 100644 --- a/firmware/controllers/algo/rusefi_enums.h +++ b/firmware/controllers/algo/rusefi_enums.h @@ -127,8 +127,7 @@ typedef enum { BMW_M73_F = ET_BMW_M73_F, - - ZIL_130 = 42, + PROTEUS_QC_TEST_BOARD = ET_PROTEUS_QC_TEST_BOARD, HONDA_600 = 43, @@ -180,7 +179,7 @@ typedef enum { MICRO_RUS_EFI = ET_MRE_DEFAULTS, - PROTEUS = 61, + PROTEUS_DEFAULTS = 61, VW_B6 = ET_VW_B6,