From a5f3413816d53e30509a10e28eace91bda50156c Mon Sep 17 00:00:00 2001
From: rusefi <rusefillc@gmail.com>
Date: Sun, 6 Nov 2022 22:29:35 -0500
Subject: [PATCH] merging E67

---
 .../connectors/gm-e67-black.yaml              | 258 ------------
 .../hellen-gm-e67/connectors/gm-e67-grey.yaml |  90 -----
 .../hellen/hellen-gm-e67/connectors/main.yaml | 375 ++++++++++++++++++
 3 files changed, 375 insertions(+), 348 deletions(-)
 delete mode 100644 firmware/config/boards/hellen/hellen-gm-e67/connectors/gm-e67-black.yaml
 delete mode 100644 firmware/config/boards/hellen/hellen-gm-e67/connectors/gm-e67-grey.yaml

diff --git a/firmware/config/boards/hellen/hellen-gm-e67/connectors/gm-e67-black.yaml b/firmware/config/boards/hellen/hellen-gm-e67/connectors/gm-e67-black.yaml
deleted file mode 100644
index b221cb9612..0000000000
--- a/firmware/config/boards/hellen/hellen-gm-e67/connectors/gm-e67-black.yaml
+++ /dev/null
@@ -1,258 +0,0 @@
-pins:
-  - pin: J4_4
-    # H144_OUT_PWM5
-    id: C9
-    class: outputs
-    ts_name: J4_4 Wastegate Solenoid
-    function: Wastegate Solenoid
-
-  - pin: J4_4
-    # H144_OUT_IO1
-    id: D3
-    class: outputs
-    ts_name: J4_5 Error Light
-    function: Error Light Output
-
-  - pin: J7_1
-    # H_SPI3_MOSI
-    id: C12
-    class: outputs
-    ts_name: J7_1 AUX
-    function: J7_1 AUX
-
-  - pin: J7_2
-    # H_SPI3_MISO
-    id: C11
-    class: outputs
-    ts_name: J7_2 AUX
-    function: J7_2 AUX
-
-  - pin: J7_3
-    # H_SPI3_SCK
-    id: C10
-    class: outputs
-    ts_name: J7_3 AUX
-    function: J7_3 AUX
-
-  - pin: J7_4
-    # H_SPI3_CS
-    id: A15
-    class: outputs
-    ts_name: J7_4 AUX
-    function: J7_4 AUX
-
-  - pin: J7_5
-    # H144_UART2_TX
-    id: D5
-    class: outputs
-    ts_name: J7_5 AUX
-    function: J7_5 AUX
-
-  - pin: J7_6
-    # H144_UART2_RX
-    id: D6
-    class: outputs
-    ts_name: J7_6 AUX
-    function: J7_6 AUX
-
-  - pin: J7_7
-    # H144_UART1_RX
-    id: E0
-    class: outputs
-    ts_name: J7_7 AUX
-    function: J7_7 AUX
-
-  - pin: J7_8
-    # H144_UART1_TX
-    id: E1
-    class: outputs
-    ts_name: J7_8 AUX
-    function: J7_8 AUX
-
-  - pin: K1
-    # H144_IGN_1
-    id: C13
-    class: outputs
-    type: ign
-    ts_name: C2-1 - IGN 1
-    function: Coil 1
-
-
-
-  - pin: K16
-    # H144_LS_3
-    id: D11
-    class: outputs
-    ts_name: C2-16 INJ 3
-    function: injector output 3
-    type: inj
-
-  - pin: K17
-    # H144_IGN_8
-    id: E6
-    class: outputs
-    ts_name: C2-17 - IGN 8
-    function: igniter
-    type: ign
-
-  - pin: K18
-    # H144_IGN_4
-    id: E3
-    class: outputs
-    ts_name: C2-18 - IGN 4
-    function: igniter
-    type: ign
-
-  - pin: K32
-    # H144_LS_2
-    id: G8
-    class: outputs
-    ts_name: C2-32 INJ 2
-    function: injector output 2
-    type: inj
-
-  - pin: K33
-    # H144_IGN_7
-    id: B9
-    class: outputs
-    ts_name: C2-33 - IGN 7
-    function: igniter
-    type: ign
-
-  - pin: K34
-    # H144_IGN_5
-    id: E2
-    class: outputs
-    ts_name: C2-34 - IGN 5
-    function: igniter
-    type: ign
-
-  - pin: K48
-    # H144_LS_8
-    id: F14
-    class: outputs
-    ts_name: C2-48 INJ 8
-    function: injector output 8
-    type: inj
-
-  - pin: K49
-    # H144_LS_5
-    id: D9
-    class: outputs
-    ts_name: C2-49 INJ 5
-    function: injector output 5
-    type: inj
-
-  - pin: K52
-    # H144_LS_6
-    id: F12
-    class: outputs
-    ts_name: C2-52 INJ 6
-    function: injector output 6
-    type: inj
-
-  - pin: K53
-    # H144_IGN_2
-    id: E5
-    class: outputs
-    ts_name: C2-53 - IGN 2
-    function: igniter
-    type: ign
-
-  - pin: K54
-    # H144_IGN_6
-    id: B8
-    class: outputs
-    ts_name: C2-54 - IGN 6
-    function: igniter
-    type: ign
-
-  - pin: K55
-    # H144_IGN_3
-    id: E4
-    class: outputs
-    ts_name: C2-55 - IGN 3
-    function: igniter
-    type: ign
-
-  - pin: K59
-    # H144_IN_SENS4
-    id: F6
-    class: event_inputs
-    ts_name: C2-59 - Cam
-    function: Cam Sensor Input
-    type: ls
-    color: purple
-
-  - pin: K60
-    # H144_IN_O2S2
-    id: EFI_ADC_1
-    class: analog_inputs
-    ts_name: C2-60 - Oil Pressure
-    function: Oil Pressure
-    type: av
-    color: purple
-
-  - pin: K63
-    # H144_IN_SENS2
-    id: F4
-    class: event_inputs
-    ts_name: C2-63 - Crank
-    function: Crank Input
-    type: ls
-    color: purple
-
-  - pin: K64
-    # H144_IN_TPS
-    id: EFI_ADC_4
-    class: analog_inputs
-    ts_name: C2-64 - TPS1
-    function: TPS1
-    type: av
-    color: purple
-
-  - pin: K65
-    # H144_IN_MAP1
-    id: EFI_ADC_10
-    class: analog_inputs
-    ts_name: C2-65 - Trans Fluids
-    function: Trans Fluids Temperature
-    type: av
-    color: purple
-
-  - pin: K66
-    # H144_IN_AUX1
-    id: EFI_ADC_8
-    class: analog_inputs
-    ts_name: C2-66 - TPS2
-    function: TPS2
-    type: av
-    color: purple
-
-  - pin: K70
-    # H144_LS_4
-    id: D10
-    class: outputs
-    ts_name: C2-70 INJ 4
-    function: injector output 4
-    type: inj
-
-  - pin: K71
-    # H144_LS_7
-    id: F13
-    class: outputs
-    ts_name: C2-71 INJ 7
-    function: injector output 7
-    type: inj
-
-  - pin: K72
-    # H144_LS_1
-    id: G7
-    class: outputs
-    ts_name: C2-72 INJ 1
-    function: injectpr output 1
-    type: inj
-
-  - pin: K73
-    function: GND
-    type: GND
diff --git a/firmware/config/boards/hellen/hellen-gm-e67/connectors/gm-e67-grey.yaml b/firmware/config/boards/hellen/hellen-gm-e67/connectors/gm-e67-grey.yaml
deleted file mode 100644
index 57492b0ecc..0000000000
--- a/firmware/config/boards/hellen/hellen-gm-e67/connectors/gm-e67-grey.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
-pins:
-  - pin: G7
-    # H144_OUT_PWM1
-    id: D13
-    class: outputs
-    function: Alternator Enable
-    type: hs
-    ts_name: C3-7 - Alternator Enable
-
-  - pin: G16
-    # H144_OUT_IO9
-    id: G13
-    class: outputs
-    function: Coolant Pump
-    type: hs
-    ts_name: C3-16 - Coolant Pump
-
-  - pin: G33
-    function: CAN bus low
-    type: can
-
-  - pin: G49
-    # H144_OUT_IO12
-    id: A8
-    class: outputs
-    function: Radiator Fan Relay
-    type: hs
-    ts_name: C3-49 - Fan Relay
-
-  - pin: G53
-    function: CAN bus high
-    type: can
-
-  - pin: G55
-    # H144_IN_CLT
-    id: EFI_ADC_12
-    type: av
-    class: analog_inputs
-    ts_name: C3-55 - CLT
-    function: CLT
-    color: purple
-
-  - pin: G56
-    # H144_IN_IAT
-    id: EFI_ADC_13
-    type: av
-    class: analog_inputs
-    ts_name: C3-56 - IAT
-    function: IAT
-    color: purple
-
-  - pin: G57
-    # H144_IN_AUX4
-    id: EFI_ADC_7
-    type: av
-    class: analog_inputs
-    ts_name: C3-57 - A/C Pressure
-    function: A/C Pressure
-    color: purple
-
-  - pin: G58
-    # H144_IN_MAP3
-    id: EFI_ADC_2
-    type: av
-    class: analog_inputs
-    ts_name: C3-58 - Baro
-    function: Baro Pressure
-    color: purple
-
-  - pin: G59
-    # H144_IN_MAP2
-    id: EFI_ADC_11
-    type: av
-    class: analog_inputs
-    ts_name: C3-59 - MAP
-    function: MAP
-    color: purple
-
-  - pin: G66
-    # H144_IN_VSS
-    id: F11
-    class: switch_inputs
-    function: Vehicle Speed Sensor Input Pos
-    type: hall
-    ts_name: C3-66 - VSS Input
-    color: gray
-
-  - pin: G67
-    function: Vehicle Speed Sensor Input Neg
-    color: gray
\ No newline at end of file
diff --git a/firmware/config/boards/hellen/hellen-gm-e67/connectors/main.yaml b/firmware/config/boards/hellen/hellen-gm-e67/connectors/main.yaml
index e7e8f83042..c82d1a26d4 100644
--- a/firmware/config/boards/hellen/hellen-gm-e67/connectors/main.yaml
+++ b/firmware/config/boards/hellen/hellen-gm-e67/connectors/main.yaml
@@ -1,4 +1,376 @@
 pins:
+
+#
+# some AUX apparently?
+#
+  - pin: J4_4
+    # H144_OUT_PWM5
+    id: C9
+    class: outputs
+    ts_name: J4_4 Wastegate Solenoid
+    function: Wastegate Solenoid
+
+  - pin: J4_4
+    # H144_OUT_IO1
+    id: D3
+    class: outputs
+    ts_name: J4_5 Error Light
+    function: Error Light Output
+
+  - pin: J7_1
+    # H_SPI3_MOSI
+    id: C12
+    class: outputs
+    ts_name: J7_1 AUX
+    function: J7_1 AUX
+
+  - pin: J7_2
+    # H_SPI3_MISO
+    id: C11
+    class: outputs
+    ts_name: J7_2 AUX
+    function: J7_2 AUX
+
+  - pin: J7_3
+    # H_SPI3_SCK
+    id: C10
+    class: outputs
+    ts_name: J7_3 AUX
+    function: J7_3 AUX
+
+  - pin: J7_4
+    # H_SPI3_CS
+    id: A15
+    class: outputs
+    ts_name: J7_4 AUX
+    function: J7_4 AUX
+
+  - pin: J7_5
+    # H144_UART2_TX
+    id: D5
+    class: outputs
+    ts_name: J7_5 AUX
+    function: J7_5 AUX
+
+  - pin: J7_6
+    # H144_UART2_RX
+    id: D6
+    class: outputs
+    ts_name: J7_6 AUX
+    function: J7_6 AUX
+
+  - pin: J7_7
+    # H144_UART1_RX
+    id: E0
+    class: outputs
+    ts_name: J7_7 AUX
+    function: J7_7 AUX
+
+  - pin: J7_8
+    # H144_UART1_TX
+    id: E1
+    class: outputs
+    ts_name: J7_8 AUX
+    function: J7_8 AUX
+
+  #
+  # start of BLACK
+  #
+
+  - pin: K1
+    # H144_IGN_1
+    id: C13
+    class: outputs
+    type: ign
+    ts_name: C2-1 - IGN 1
+    function: Coil 1
+
+
+
+  - pin: K16
+    # H144_LS_3
+    id: D11
+    class: outputs
+    ts_name: C2-16 INJ 3
+    function: injector output 3
+    type: inj
+
+  - pin: K17
+    # H144_IGN_8
+    id: E6
+    class: outputs
+    ts_name: C2-17 - IGN 8
+    function: igniter
+    type: ign
+
+  - pin: K18
+    # H144_IGN_4
+    id: E3
+    class: outputs
+    ts_name: C2-18 - IGN 4
+    function: igniter
+    type: ign
+
+  - pin: K32
+    # H144_LS_2
+    id: G8
+    class: outputs
+    ts_name: C2-32 INJ 2
+    function: injector output 2
+    type: inj
+
+  - pin: K33
+    # H144_IGN_7
+    id: B9
+    class: outputs
+    ts_name: C2-33 - IGN 7
+    function: igniter
+    type: ign
+
+  - pin: K34
+    # H144_IGN_5
+    id: E2
+    class: outputs
+    ts_name: C2-34 - IGN 5
+    function: igniter
+    type: ign
+
+  - pin: K48
+    # H144_LS_8
+    id: F14
+    class: outputs
+    ts_name: C2-48 INJ 8
+    function: injector output 8
+    type: inj
+
+  - pin: K49
+    # H144_LS_5
+    id: D9
+    class: outputs
+    ts_name: C2-49 INJ 5
+    function: injector output 5
+    type: inj
+
+  - pin: K52
+    # H144_LS_6
+    id: F12
+    class: outputs
+    ts_name: C2-52 INJ 6
+    function: injector output 6
+    type: inj
+
+  - pin: K53
+    # H144_IGN_2
+    id: E5
+    class: outputs
+    ts_name: C2-53 - IGN 2
+    function: igniter
+    type: ign
+
+  - pin: K54
+    # H144_IGN_6
+    id: B8
+    class: outputs
+    ts_name: C2-54 - IGN 6
+    function: igniter
+    type: ign
+
+  - pin: K55
+    # H144_IGN_3
+    id: E4
+    class: outputs
+    ts_name: C2-55 - IGN 3
+    function: igniter
+    type: ign
+
+  - pin: K59
+    # H144_IN_SENS4
+    id: F6
+    class: event_inputs
+    ts_name: C2-59 - Cam
+    function: Cam Sensor Input
+    type: ls
+    color: purple
+
+  - pin: K60
+    # H144_IN_O2S2
+    id: EFI_ADC_1
+    class: analog_inputs
+    ts_name: C2-60 - Oil Pressure
+    function: Oil Pressure
+    type: av
+    color: purple
+
+  - pin: K63
+    # H144_IN_SENS2
+    id: F4
+    class: event_inputs
+    ts_name: C2-63 - Crank
+    function: Crank Input
+    type: ls
+    color: purple
+
+  - pin: K64
+    # H144_IN_TPS
+    id: EFI_ADC_4
+    class: analog_inputs
+    ts_name: C2-64 - TPS1
+    function: TPS1
+    type: av
+    color: purple
+
+  - pin: K65
+    # H144_IN_MAP1
+    id: EFI_ADC_10
+    class: analog_inputs
+    ts_name: C2-65 - Trans Fluids
+    function: Trans Fluids Temperature
+    type: av
+    color: purple
+
+  - pin: K66
+    # H144_IN_AUX1
+    id: EFI_ADC_8
+    class: analog_inputs
+    ts_name: C2-66 - TPS2
+    function: TPS2
+    type: av
+    color: purple
+
+  - pin: K70
+    # H144_LS_4
+    id: D10
+    class: outputs
+    ts_name: C2-70 INJ 4
+    function: injector output 4
+    type: inj
+
+  - pin: K71
+    # H144_LS_7
+    id: F13
+    class: outputs
+    ts_name: C2-71 INJ 7
+    function: injector output 7
+    type: inj
+
+  - pin: K72
+    # H144_LS_1
+    id: G7
+    class: outputs
+    ts_name: C2-72 INJ 1
+    function: injectpr output 1
+    type: inj
+
+  - pin: K73
+    function: GND
+    type: GND
+
+#
+# end of BLACK
+#
+
+#
+# start of GREY
+#
+  - pin: G7
+    # H144_OUT_PWM1
+    id: D13
+    class: outputs
+    function: Alternator Enable
+    type: hs
+    ts_name: C3-7 - Alternator Enable
+
+  - pin: G16
+    # H144_OUT_IO9
+    id: G13
+    class: outputs
+    function: Coolant Pump
+    type: hs
+    ts_name: C3-16 - Coolant Pump
+
+  - pin: G33
+    function: CAN bus low
+    type: can
+
+  - pin: G49
+    # H144_OUT_IO12
+    id: A8
+    class: outputs
+    function: Radiator Fan Relay
+    type: hs
+    ts_name: C3-49 - Fan Relay
+
+  - pin: G53
+    function: CAN bus high
+    type: can
+
+  - pin: G55
+    # H144_IN_CLT
+    id: EFI_ADC_12
+    type: av
+    class: analog_inputs
+    ts_name: C3-55 - CLT
+    function: CLT
+    color: purple
+
+  - pin: G56
+    # H144_IN_IAT
+    id: EFI_ADC_13
+    type: av
+    class: analog_inputs
+    ts_name: C3-56 - IAT
+    function: IAT
+    color: purple
+
+  - pin: G57
+    # H144_IN_AUX4
+    id: EFI_ADC_7
+    type: av
+    class: analog_inputs
+    ts_name: C3-57 - A/C Pressure
+    function: A/C Pressure
+    color: purple
+
+  - pin: G58
+    # H144_IN_MAP3
+    id: EFI_ADC_2
+    type: av
+    class: analog_inputs
+    ts_name: C3-58 - Baro
+    function: Baro Pressure
+    color: purple
+
+  - pin: G59
+    # H144_IN_MAP2
+    id: EFI_ADC_11
+    type: av
+    class: analog_inputs
+    ts_name: C3-59 - MAP
+    function: MAP
+    color: purple
+
+  - pin: G66
+    # H144_IN_VSS
+    id: F11
+    class: switch_inputs
+    function: Vehicle Speed Sensor Input Pos
+    type: hall
+    ts_name: C3-66 - VSS Input
+    color: gray
+
+  - pin: G67
+    function: Vehicle Speed Sensor Input Neg
+    color: gray
+
+#
+# end of GREY
+#
+
+
+
+#
+# start of BLUE
+#
   - pin: U7
 #H144_IN_RES2
     id: F10
@@ -114,6 +486,9 @@ pins:
     function: Starter Enable
     type: ls
     color: purple
+#
+# end of BLUE
+#
 
 info:
   id: GM-E67