From d64d22ae3536ecd203377b1140793043d0354319 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Mon, 23 May 2022 00:20:48 -0400 Subject: [PATCH] GM --- .../hellen-gm-e67/board_configuration.cpp | 20 ++++--- .../connectors/gm-e67-black.yaml | 55 +++++++++++++++++++ 2 files changed, 68 insertions(+), 7 deletions(-) diff --git a/firmware/config/boards/hellen/hellen-gm-e67/board_configuration.cpp b/firmware/config/boards/hellen/hellen-gm-e67/board_configuration.cpp index 70604e7b91..115902b59f 100644 --- a/firmware/config/boards/hellen/hellen-gm-e67/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen-gm-e67/board_configuration.cpp @@ -35,9 +35,13 @@ static void setInjectorPins() { static void setIgnitionPins() { engineConfiguration->ignitionPins[0] = H144_IGN_1; - engineConfiguration->ignitionPins[1] = Gpio::Unassigned; - engineConfiguration->ignitionPins[2] = H144_IGN_2; - engineConfiguration->ignitionPins[3] = Gpio::Unassigned; + engineConfiguration->ignitionPins[1] = H144_IGN_2; + engineConfiguration->ignitionPins[2] = H144_IGN_3; + engineConfiguration->ignitionPins[3] = H144_IGN_4; + engineConfiguration->ignitionPins[4] = H144_IGN_5; + engineConfiguration->ignitionPins[5] = H144_IGN_6; + engineConfiguration->ignitionPins[6] = H144_IGN_7; + engineConfiguration->ignitionPins[7] = H144_IGN_8; // disable remainder for (int i = 4; i < MAX_CYLINDER_COUNT; i++) { @@ -131,12 +135,14 @@ void setBoardDefaultConfiguration() { // "required" hardware is done - set some reasonable defaults setupDefaultSensorInputs(); - engineConfiguration->specs.cylindersCount = 4; - engineConfiguration->specs.firingOrder = FO_1_3_4_2; + engineConfiguration->specs.cylindersCount = 8; + engineConfiguration->specs.firingOrder = FO_1_8_7_2_6_5_4_3; - engineConfiguration->ignitionMode = IM_INDIVIDUAL_COILS; // IM_WASTED_SPARK + engineConfiguration->enableSoftwareKnock = true; + + engineConfiguration->ignitionMode = IM_INDIVIDUAL_COILS; engineConfiguration->crankingInjectionMode = IM_SIMULTANEOUS; - engineConfiguration->injectionMode = IM_SIMULTANEOUS;//IM_BATCH;// IM_SEQUENTIAL; + engineConfiguration->injectionMode = IM_SEQUENTIAL; engineConfiguration->clutchDownPin = H144_IN_D_2; engineConfiguration->clutchDownPinMode = PI_PULLDOWN; 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 index 21d8999ba4..ad2ac10080 100644 --- 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 @@ -17,6 +17,22 @@ pins: function: injector output 3 type: inj + - pin: 17 + # H144_IGN_8 + id: E6 + class: outputs + ts_name: C2-17 - IGN 8 + function: igniter + type: ign + + - pin: 18 + # H144_IGN_4 + id: E3 + class: outputs + ts_name: C2-18 - IGN 4 + function: igniter + type: ign + - pin: 32 # H144_LS_2 id: G8 @@ -25,6 +41,21 @@ pins: function: injector output 2 type: inj + - pin: 33 + # H144_IGN_7 + id: B9 + class: outputs + ts_name: C2-33 - IGN 7 + function: igniter + type: ign + + - pin: 34 + # H144_IGN_5 + id: E2 + class: outputs + ts_name: C2-34 - IGN 5 + function: igniter + type: ign - pin: 48 # H144_LS_8 @@ -50,6 +81,30 @@ pins: function: injector output 6 type: inj + - pin: 53 + # H144_IGN_2 + id: E5 + class: outputs + ts_name: C2-53 - IGN 2 + function: igniter + type: ign + + - pin: 54 + # H144_IGN_6 + id: B8 + class: outputs + ts_name: C2-54 - IGN 6 + function: igniter + type: ign + + - pin: 55 + # H144_IGN_3 + id: E4 + class: outputs + ts_name: C2-55 - IGN 3 + function: igniter + type: ign + - pin: 70 # H144_LS_4 id: D10