From 9f13d39003b6d68d5fe90a88385ec2b886eac1cf Mon Sep 17 00:00:00 2001
From: rusefillc <sdfsdfqsf2334234234>
Date: Sun, 6 Dec 2020 14:16:40 -0500
Subject: [PATCH] MRE_SUBARU_EJ18

---
 firmware/config/engines/subaru.cpp                 | 11 +++++++++++
 firmware/config/engines/subaru.h                   |  1 +
 firmware/controllers/algo/engine_configuration.cpp |  4 +++-
 firmware/integration/rusefi_config.txt             |  1 +
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/firmware/config/engines/subaru.cpp b/firmware/config/engines/subaru.cpp
index 1cb24e0f34..ed6a807901 100644
--- a/firmware/config/engines/subaru.cpp
+++ b/firmware/config/engines/subaru.cpp
@@ -42,3 +42,14 @@ void setSubaru2003Wrx(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
 void setSubaruEJ20GDefaults(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
 	engineConfiguration->trigger.type = TT_SUBARU_7_6;
 }
+
+/**
+ * MRE_SUBARU_EJ18
+ * set engine_type 37
+ */
+void setSubaruEJ18_MRE(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
+	engineConfiguration->trigger.type = TT_SUBARU_7_6;
+
+	CONFIG(isDoubleSolenoidIdle) = true;
+
+}
diff --git a/firmware/config/engines/subaru.h b/firmware/config/engines/subaru.h
index d2a80494ed..951ceaea0d 100644
--- a/firmware/config/engines/subaru.h
+++ b/firmware/config/engines/subaru.h
@@ -9,3 +9,4 @@
 
 void setSubaru2003Wrx(DECLARE_CONFIG_PARAMETER_SIGNATURE);
 void setSubaruEJ20GDefaults(DECLARE_CONFIG_PARAMETER_SIGNATURE);
+void setSubaruEJ18_MRE(DECLARE_CONFIG_PARAMETER_SIGNATURE);
diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp
index dbe39207a9..46381d80bf 100644
--- a/firmware/controllers/algo/engine_configuration.cpp
+++ b/firmware/controllers/algo/engine_configuration.cpp
@@ -1166,7 +1166,6 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb
 // todo: is it time to replace MICRO_RUS_EFI, PROTEUS, PROMETHEUS_DEFAULTS with MINIMAL_PINS? maybe rename MINIMAL_PINS to DEFAULT?
 	case PROTEUS:
 	case PROMETHEUS_DEFAULTS:
-	case MRE_SUBARU_EJ18:
 	case ZIL_130:
 	case MINIMAL_PINS:
 		// all basic settings are already set in prepareVoidConfiguration(), no need to set anything here
@@ -1184,6 +1183,9 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb
 	case TEST_ENGINE:
 		setTestEngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
 		break;
+	case MRE_SUBARU_EJ18:
+		setSubaruEJ18_MRE(PASS_CONFIG_PARAMETER_SIGNATURE);
+		break;
 #if EFI_UNIT_TEST
 	case TEST_ISSUE_366_BOTH:
 		setTestEngineIssue366both(PASS_CONFIG_PARAMETER_SIGNATURE);
diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt
index 77a8eb863a..92367ae285 100644
--- a/firmware/integration/rusefi_config.txt
+++ b/firmware/integration/rusefi_config.txt
@@ -434,6 +434,7 @@ end_struct
 #define ET_SACHS 29
 #define ET_VW_ABA 32
 #define ET_CAMARO 35
+#define ET_MRE_SUBARU_EJ18 37
 #define ET_BMW_M73_F 40
 #define ET_DODGE_NEON_2003_CRANK 46