From 7f65e95a65bb4f7ee2b81e7704ef9bed8d1c5ba0 Mon Sep 17 00:00:00 2001
From: rusefi <rusefillc@gmail.com>
Date: Sun, 13 Dec 2020 11:39:10 -0500
Subject: [PATCH] subi

---
 firmware/config/engines/subaru.cpp             | 18 ++++++++++--------
 .../controllers/algo/engine_configuration.cpp  |  4 +---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/firmware/config/engines/subaru.cpp b/firmware/config/engines/subaru.cpp
index ed6a807901..93a7075844 100644
--- a/firmware/config/engines/subaru.cpp
+++ b/firmware/config/engines/subaru.cpp
@@ -35,14 +35,6 @@ void setSubaru2003Wrx(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
 	engineConfiguration->triggerSimulatorPins[2] = GPIO_UNASSIGNED;
 }
 
-/*
- * Subaru WRX <=1996 Turbo.
- */
-
-void setSubaruEJ20GDefaults(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
-	engineConfiguration->trigger.type = TT_SUBARU_7_6;
-}
-
 /**
  * MRE_SUBARU_EJ18
  * set engine_type 37
@@ -52,4 +44,14 @@ void setSubaruEJ18_MRE(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
 
 	CONFIG(isDoubleSolenoidIdle) = true;
 
+	engineConfiguration->specs.displacement = 1.8;
+	strcpy(CONFIG(engineMake), ENGINE_MAKE_SUBARU);
+	strcpy(CONFIG(engineCode), "EJ18");
+
+	engineConfiguration->specs.firingOrder = FO_1_3_2_4;
+
+	// TLE8888_PIN_23: "33 - GP Out 3"
+	engineConfiguration->malfunctionIndicatorPin = TLE8888_PIN_23;
+
+
 }
diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp
index 77f6941573..0c50baf5e2 100644
--- a/firmware/controllers/algo/engine_configuration.cpp
+++ b/firmware/controllers/algo/engine_configuration.cpp
@@ -1183,6 +1183,7 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb
 	case TEST_ENGINE:
 		setTestEngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
 		break;
+	case SUBARUEJ20G_DEFAULTS:
 	case MRE_SUBARU_EJ18:
 		setSubaruEJ18_MRE(PASS_CONFIG_PARAMETER_SIGNATURE);
 		break;
@@ -1346,9 +1347,6 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb
 	case MAZDA_MIATA_2003_BOARD_TEST:
 		setMazdaMiata2003EngineConfigurationBoardTest(PASS_CONFIG_PARAMETER_SIGNATURE);
 		break;
-	case SUBARUEJ20G_DEFAULTS:
-		setSubaruEJ20GDefaults(PASS_CONFIG_PARAMETER_SIGNATURE);
-		break;
 	case TEST_ENGINE_VVT:
 		setTestVVTEngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
 		break;