From a6fb12911d82312cf917b7ac5dbf1f50f0aa9f66 Mon Sep 17 00:00:00 2001
From: Andrey G <dron0gus@gmail.com>
Date: Fri, 27 Aug 2021 12:50:36 +0300
Subject: [PATCH] Board subaru: fix pinout. again and again (#3203)

---
 .../boards/subaru_eg33/board_configuration.cpp       | 12 +++++++-----
 .../config/boards/subaru_eg33/connectors/D-B62.yaml  | 12 ++++++------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/firmware/config/boards/subaru_eg33/board_configuration.cpp b/firmware/config/boards/subaru_eg33/board_configuration.cpp
index 39fe3dea38..ecea000663 100644
--- a/firmware/config/boards/subaru_eg33/board_configuration.cpp
+++ b/firmware/config/boards/subaru_eg33/board_configuration.cpp
@@ -265,6 +265,7 @@ void setBoardDefaultConfiguration(void) {
 		setAlgorithm(LM_ALPHA_N PASS_CONFIG_PARAMETER_SUFFIX);
 }
 
+/* Schematic RefDef DA3 */
 static const struct mc33810_config mc33810_odd = {
 	.spi_bus = &SPID5,
 	.spi_config = {
@@ -291,7 +292,7 @@ static const struct mc33810_config mc33810_odd = {
 		[2] = {.port = GPIOI, .pad = 4},	/* INJ 5 */
 		[3] = {.port = GPIOB, .pad = 9},	/* INJ 7 */
 		/* ignition pre-dirvers */
-		[4] = {.port = GPIOB, .pad = 3},	/* IGN 1 */
+		[4] = {.port = GPIOB, .pad = 3},	/* IGN 4 */
 		[5] = {.port = GPIOB, .pad = 4},	/* IGN 3 */
 		[6] = {.port = GPIOB, .pad = 5},	/* IGN 7 */
 		[7] = {.port = GPIOB, .pad = 8},	/* IGN 5 */
@@ -300,6 +301,7 @@ static const struct mc33810_config mc33810_odd = {
 	.en = {.port = GPIOI, .pad = 7}
 };
 
+/* Schematic RefDef DA22 */
 static const struct mc33810_config mc33810_even = {
 	.spi_bus = &SPID5,
 	.spi_config = {
@@ -326,10 +328,10 @@ static const struct mc33810_config mc33810_even = {
 		[2] = {.port = GPIOE, .pad = 5},	/* INJ 6 */
 		[3] = {.port = GPIOE, .pad = 6},	/* INJ 8 */
 		/* ignition pre-dirvers */
-		[4] = {.port = GPIOC, .pad = 14},	/* IGN 2 */
-		[5] = {.port = GPIOC, .pad = 13},	/* IGN 4 */
-		[6] = {.port = GPIOC, .pad = 15},	/* IGN 6 */
-		[7] = {.port = GPIOI, .pad = 9},	/* IGN 8 */
+		[4] = {.port = GPIOI, .pad = 9},	/* IGN 8 */
+		[5] = {.port = GPIOC, .pad = 15},	/* IGN 6 */
+		[6] = {.port = GPIOC, .pad = 14},	/* IGN 2 */
+		[7] = {.port = GPIOC, .pad = 13},	/* IGN 1 */
 	},
 	/* en shared between two chips */
 	.en = {.port = nullptr, .pad = 0}
diff --git a/firmware/config/boards/subaru_eg33/connectors/D-B62.yaml b/firmware/config/boards/subaru_eg33/connectors/D-B62.yaml
index 10aa915f81..84eb10d840 100644
--- a/firmware/config/boards/subaru_eg33/connectors/D-B62.yaml
+++ b/firmware/config/boards/subaru_eg33/connectors/D-B62.yaml
@@ -54,8 +54,8 @@ pins:
   - pin: 8
     id: MC33810_1_GD_2
     class: outputs
-    function: Ignition 6
-    ts_name: D08 - Ignition Cyl 6
+    function: Ignition 2
+    ts_name: D08 - Ignition Cyl 2
     type: ign
 
   - pin: 9
@@ -68,8 +68,8 @@ pins:
   - pin: 10
     id: MC33810_1_GD_3
     class: outputs
-    function: Ignition 2
-    ts_name: D10 - Ignition Cyl 2
+    function: Ignition 1
+    ts_name: D10 - Ignition Cyl 1
     type: ign
 
   - pin: 11
@@ -104,8 +104,8 @@ pins:
   - pin: 16
     id: MC33810_1_GD_1
     class: outputs
-    function: Ignition 1
-    ts_name: D16 - Ignition Cyl 1
+    function: Ignition 6
+    ts_name: D16 - Ignition Cyl 6
     type: ign
 
   - pin: 17