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 ec9f5dd345..7f010f7bc4 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 Mon Dec 14 15:04:34 EET 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 Mon Dec 14 23:31:45 EST 2020 // see also gen_config_and_enums.bat @@ -917,6 +917,8 @@ case MRE_BOARD_OLD_TEST: return "MRE_BOARD_OLD_TEST"; case MRE_BODY_CONTROL: return "MRE_BODY_CONTROL"; +case MRE_M111: + return "MRE_M111"; case MRE_MIATA_94_MAP: return "MRE_MIATA_94_MAP"; case MRE_MIATA_NA6_MAP: @@ -937,6 +939,8 @@ case PROMETHEUS_DEFAULTS: return "PROMETHEUS_DEFAULTS"; case PROTEUS: return "PROTEUS"; +case PROTEUS_MIATA_NB2: + return "PROTEUS_MIATA_NB2"; case ROVER_V8: return "ROVER_V8"; case SACHS: 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 6aa7b32ed4..6df0a341ef 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 Mon Dec 14 15:04:34 EET 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 Mon Dec 14 23:31:45 EST 2020 // see also gen_config_and_enums.bat @@ -713,6 +713,8 @@ case MRE_BOARD_OLD_TEST: return "MRE_BOARD_OLD_TEST"; case MRE_BODY_CONTROL: return "MRE_BODY_CONTROL"; +case MRE_M111: + return "MRE_M111"; case MRE_MIATA_94_MAP: return "MRE_MIATA_94_MAP"; case MRE_MIATA_NA6_MAP: @@ -733,6 +735,8 @@ case PROMETHEUS_DEFAULTS: return "PROMETHEUS_DEFAULTS"; case PROTEUS: return "PROTEUS"; +case PROTEUS_MIATA_NB2: + return "PROTEUS_MIATA_NB2"; case ROVER_V8: return "ROVER_V8"; case SACHS: diff --git a/firmware/config/engines/engines.mk b/firmware/config/engines/engines.mk index d42e3adba8..35cdebefa1 100644 --- a/firmware/config/engines/engines.mk +++ b/firmware/config/engines/engines.mk @@ -27,6 +27,7 @@ ENGINES_SRC_CPP = $(PROJECT_DIR)/config/engines/ford_aspire.cpp \ $(PROJECT_DIR)/config/engines/test_engine.cpp \ $(PROJECT_DIR)/config/engines/mitsubishi.cpp \ $(PROJECT_DIR)/config/engines/dodge_ram.cpp \ + $(PROJECT_DIR)/config/engines/m111.cpp \ $(PROJECT_DIR)/config/engines/vw.cpp \ $(PROJECT_DIR)/config/engines/vw_b6.cpp \ $(PROJECT_DIR)/config/engines/chevrolet_camaro_4.cpp \ diff --git a/firmware/config/engines/m111.cpp b/firmware/config/engines/m111.cpp new file mode 100644 index 0000000000..94b2152e35 --- /dev/null +++ b/firmware/config/engines/m111.cpp @@ -0,0 +1,15 @@ +/* + * m111.cpp + * + * @date Dec 14, 2020 + * @author Andrey Belomutskiy, (c) 2012-2020 + */ + + +#include "m111.h" + +EXTERN_CONFIG; + +void setM111EngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { + +} diff --git a/firmware/config/engines/m111.h b/firmware/config/engines/m111.h new file mode 100644 index 0000000000..e9b9289afd --- /dev/null +++ b/firmware/config/engines/m111.h @@ -0,0 +1,15 @@ +/* + * m111.h + * + * @date Dec 14, 2020 + * @author Andrey Belomutskiy, (c) 2012-2020 + */ + +#pragma once + +#include "engine_configuration.h" + +/** + * set engine_type 68 + */ +void setM111EngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE); diff --git a/firmware/config/engines/mazda_miata_vvt.cpp b/firmware/config/engines/mazda_miata_vvt.cpp index 8f976572a9..d3280e9467 100644 --- a/firmware/config/engines/mazda_miata_vvt.cpp +++ b/firmware/config/engines/mazda_miata_vvt.cpp @@ -748,3 +748,6 @@ void setMiataNB2_Proteus_TCU(DECLARE_CONFIG_PARAMETER_SIGNATURE) { } +void setMiataNB2_ProteusEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { + +} diff --git a/firmware/config/engines/mazda_miata_vvt.h b/firmware/config/engines/mazda_miata_vvt.h index 6227f96f40..9c93808e13 100644 --- a/firmware/config/engines/mazda_miata_vvt.h +++ b/firmware/config/engines/mazda_miata_vvt.h @@ -47,3 +47,9 @@ void setMiataNB2_MRE_MAF(DECLARE_CONFIG_PARAMETER_SIGNATURE); */ void setMiataNB2_Proteus_TCU(DECLARE_CONFIG_PARAMETER_SIGNATURE); +/** + * set engine_type 67 + */ +void setMiataNB2_ProteusEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE); + + diff --git a/firmware/controllers/algo/auto_generated_enums.cpp b/firmware/controllers/algo/auto_generated_enums.cpp index 4915359a43..a645d56549 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 Mon Dec 14 15:04:33 EET 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 Mon Dec 14 23:31:45 EST 2020 // see also gen_config_and_enums.bat @@ -859,6 +859,8 @@ case MRE_BOARD_OLD_TEST: return "MRE_BOARD_OLD_TEST"; case MRE_BODY_CONTROL: return "MRE_BODY_CONTROL"; +case MRE_M111: + return "MRE_M111"; case MRE_MIATA_94_MAP: return "MRE_MIATA_94_MAP"; case MRE_MIATA_NA6_MAP: @@ -879,6 +881,8 @@ case PROMETHEUS_DEFAULTS: return "PROMETHEUS_DEFAULTS"; case PROTEUS: return "PROTEUS"; +case PROTEUS_MIATA_NB2: + return "PROTEUS_MIATA_NB2"; case ROVER_V8: return "ROVER_V8"; case SACHS: diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 0c50baf5e2..200062d5e5 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -58,6 +58,7 @@ #include "mazda_miata_nb.h" #include "mazda_miata_vvt.h" #include "mazda_626.h" +#include "m111.h" #include "citroenBerlingoTU3JP.h" #include "rover_v8.h" @@ -1174,6 +1175,12 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb case MIATA_PROTEUS_TCU: setMiataNB2_Proteus_TCU(PASS_CONFIG_PARAMETER_SIGNATURE); break; + case PROTEUS_MIATA_NB2: + setMiataNB2_ProteusEngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); + break; + case MRE_M111: + setM111EngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); + break; case MRE_BOARD_OLD_TEST: mreBoardOldTest(PASS_CONFIG_PARAMETER_SIGNATURE); break; diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h index 7530877ef8..51a96a1149 100644 --- a/firmware/controllers/algo/rusefi_enums.h +++ b/firmware/controllers/algo/rusefi_enums.h @@ -187,11 +187,15 @@ typedef enum { VW_B6 = ET_VW_B6, - BMW_M73_PROTEUS = ET_BMW_M73_PROTEUS, + BMW_M73_PROTEUS = ET_PROTEUS_BMW_M73, DODGE_RAM = 64, CITROEN_TU3JP = ET_CITROEN_TU3JP, + MRE_M111 = ET_MRE_M111, + + PROTEUS_MIATA_NB2 = ET_PROTEUS_MIATA_NB2, + /** * this configuration has as few pins configured as possible diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 98886d3773..8c69fe74b0 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -459,7 +459,6 @@ end_struct #define ET_FRANKENSO_MIATA_NA6_VAF 57 #define ET_PROTEUS_BMW_M73 63 #define ET_PROTEUS_MIATA_NB2 67 -#define ET_BMW_M73_PROTEUS 63 #define ET_MIATA_TCU_PROTEUS 1 #define ET_CITROEN_TU3JP 65