diff --git a/firmware/config/engines/custom_engine.cpp b/firmware/config/engines/custom_engine.cpp index ab1dd40c92..1073724251 100644 --- a/firmware/config/engines/custom_engine.cpp +++ b/firmware/config/engines/custom_engine.cpp @@ -418,4 +418,50 @@ void setTle8888TestConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { engineConfiguration->tpsMax = 799; } +/** + * set engine_type 30 + */ +void mreBoardTest(DECLARE_CONFIG_PARAMETER_SIGNATURE) { + + // EFI_ADC_1: "23 - AN temp 2" + // test harness: Red/Green, 2K PD. expected 2.0v + // iat in microrusefi/board_configuration.cpp + + // EFI_ADC_2: "24 - AN temp 3" + // test harness: Blue/White, 2K PD. expected 2.0v + + + // EFI_ADC_10: "27 - AN volt 1" + // test harness: Blue/Red, 3.84K PD / 5.3 PU. expected 1.6v + engineConfiguration->mafAdcChannel = EFI_ADC_10; + + // EFI_ADC_14: "32 - AN volt 6" + // test harness: Red/White 3.6K PD / 5.2 PU. expected 1.6v + engineConfiguration->throttlePedalPositionAdcChannel = EFI_ADC_14; + + + // EFI_ADC_4: "28 - AN volt 10" + // test harness: Red/Yellow + engineConfiguration->afr.hwChannel = EFI_ADC_4; + + + // EFI_ADC_7: "31 - AN volt 3" + // test harness: White/Red + engineConfiguration->map.sensor.hwChannel = EFI_ADC_7; + + + //engineConfiguration->baroSensor.hwChannel + //engineConfiguration->oilPressure.hwChannel + //engineConfiguration->fuelLevelSensor + + // TPS tps1_1AdcChannel EFI_ADC_13 + + engineConfiguration->specs.cylindersCount = 6; + engineConfiguration->specs.firingOrder = FO_1_5_3_6_2_4; + // fix res boardConfiguration->ignitionPins[4] = GPIOD_6; + // fix res boardConfiguration->ignitionPins[5] = GPIOD_7; + + +} + #endif /* CONFIG_ENGINES_CUSTOM_ENGINE_CPP_ */ diff --git a/firmware/config/engines/custom_engine.h b/firmware/config/engines/custom_engine.h index f1a582fe22..c4527b28ed 100644 --- a/firmware/config/engines/custom_engine.h +++ b/firmware/config/engines/custom_engine.h @@ -17,4 +17,6 @@ void setFrankensoBoardTestConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE); void setEtbTestConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE); void setTle8888TestConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE); + +void mreBoardTest(DECLARE_CONFIG_PARAMETER_SIGNATURE); #endif /* CONFIG_ENGINES_CUSTOM_ENGINE_H_ */ diff --git a/firmware/controllers/algo/auto_generated_enums.cpp b/firmware/controllers/algo/auto_generated_enums.cpp index afed7725dc..dc75a6738e 100644 --- a/firmware/controllers/algo/auto_generated_enums.cpp +++ b/firmware/controllers/algo/auto_generated_enums.cpp @@ -709,8 +709,8 @@ 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 MRE_BOARD_TEST: + return "MRE_BOARD_TEST"; case GY6_139QMB: return "GY6_139QMB"; case HONDA_600: diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 55fe1b6b14..dcf40901f4 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -1053,10 +1053,12 @@ void resetConfigurationExt(Logging * logger, engine_type_e engineType DECLARE_EN case MRE_MIATA_NA6: case ACURA_RSX: case MINI_COOPER_R50: - case GM_2_2: case MINIMAL_PINS: // all basic settings are already set in prepareVoidConfiguration(), no need to set anything here break; + case MRE_BOARD_TEST: + mreBoardTest(PASS_ENGINE_PARAMETER_SIGNATURE); + break; #if EFI_SUPPORT_DODGE_NEON case DODGE_NEON_1995: setDefaultFrankensoConfiguration(PASS_ENGINE_PARAMETER_SIGNATURE); diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h index 96efe6507d..309ffcbb4d 100644 --- a/firmware/controllers/algo/rusefi_enums.h +++ b/firmware/controllers/algo/rusefi_enums.h @@ -112,7 +112,7 @@ typedef enum { SACHS = 29, - GM_2_2 = 30, + MRE_BOARD_TEST = 30, DODGE_RAM = 31, diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp index 851166209f..59facaac5f 100644 --- a/firmware/controllers/engine_controller.cpp +++ b/firmware/controllers/engine_controller.cpp @@ -812,6 +812,6 @@ int getRusEfiVersion(void) { if (initBootloader() != 0) return 123; #endif /* EFI_BOOTLOADER_INCLUDE_CODE */ - return 20190804; + return 20190805; } #endif /* EFI_UNIT_TEST */ diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp index 8452989197..a3996e899c 100644 --- a/firmware/controllers/settings.cpp +++ b/firmware/controllers/settings.cpp @@ -193,8 +193,8 @@ const char* getConfigurationName(engine_type_e engineType) { return "CAMARO_4"; case CHEVY_C20_1973: return "CHEVY C20"; - case GM_2_2: - return "GM_2_2"; + case MRE_BOARD_TEST: + return "MRE_TEST"; case DODGE_RAM: return "DODGE_RAM"; default: