From 4801feeabc9009145fa135fa06ad64ca2cc3f48c Mon Sep 17 00:00:00 2001 From: rusefillc Date: Fri, 24 Jan 2025 17:44:49 -0500 Subject: [PATCH] GM only:alphax-8chan --- .../boards/hellen/alphax-8chan/connectors/8chan-A-B.yaml | 4 ++-- firmware/config/engines/gm_sbc.cpp | 8 ++++++-- .../controllers/algo/defaults/default_base_engine.cpp | 5 +++++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/firmware/config/boards/hellen/alphax-8chan/connectors/8chan-A-B.yaml b/firmware/config/boards/hellen/alphax-8chan/connectors/8chan-A-B.yaml index 479d035b96..ea2c359ebb 100644 --- a/firmware/config/boards/hellen/alphax-8chan/connectors/8chan-A-B.yaml +++ b/firmware/config/boards/hellen/alphax-8chan/connectors/8chan-A-B.yaml @@ -20,14 +20,14 @@ pins: function: Aux Analog 4 class: analog_inputs ts_name: 2A - MAP / Aux Analog 4 - color: blue + color: violet - pin: 3A meta: MM176_IN_O2S_ANALOG function: Aux Analog 2 class: analog_inputs ts_name: 3A - Aux Analog 2 - color: blue + color: yellow - pin: 4A meta: MM176_IN_AUX2_ANALOG diff --git a/firmware/config/engines/gm_sbc.cpp b/firmware/config/engines/gm_sbc.cpp index e5155b5ce9..8b1dc7fa49 100644 --- a/firmware/config/engines/gm_sbc.cpp +++ b/firmware/config/engines/gm_sbc.cpp @@ -184,6 +184,7 @@ static void set4CylGmEcotec3() { void setGmLcv() { set4CylGmEcotec3(); engineConfiguration->displacement = 2.5; + engineConfiguration->map.sensor.type = MT_GM_1_BAR; strcpy(engineConfiguration->engineCode, "LCV"); } @@ -198,6 +199,7 @@ void setGmSbcGen5() { engineConfiguration->displacement = 5.3; engineConfiguration->cylindersCount = 8; engineConfiguration->firingOrder = FO_1_8_7_2_6_5_4_3; + engineConfiguration->map.sensor.type = MT_GM_1_BAR; #ifdef HW_HELLEN_8CHAN engineConfiguration->injectionPins[4] = Gpio::MM176_INJ5; @@ -215,10 +217,12 @@ void setGmSbcGen5() { engineConfiguration->vvtMode[1] = VVT_INACTIVE; engineConfiguration->camInputs[1] = Gpio::Unassigned; + engineConfiguration->fuelPumpPin = Gpio::MM176_OUT_IO2; // 6C - High Side 2 + engineConfiguration->oilPressure.hwChannel = MM176_IN_MAP1_ANALOG; // 2A Aux Analog 4 / External MAP engineConfiguration->fuelLevelSensor = MM176_IN_O2S_ANALOG; // 3A - Aux Analog 2 - // engineConfiguration->lowPressureFuel.hwChannel = - // engineConfiguration->acPressure.hwChannel + engineConfiguration->lowPressureFuel.hwChannel = MM176_IN_AUX2_ANALOG; // 4A - Aux Analog 7 + engineConfiguration->acPressure.hwChannel = MM176_IN_MAP2_ANALOG;// 10A - Aux Analog 5 engineConfiguration->flexSensorPin = Gpio::MM176_IN_SENS3; engineConfiguration->map.sensor.hwChannel = MM176_IN_CRANK_ANALOG; // 1A Aux Analog 1. Important to use analog without muxing! #endif // HW_HELLEN_8CHAN diff --git a/firmware/controllers/algo/defaults/default_base_engine.cpp b/firmware/controllers/algo/defaults/default_base_engine.cpp index a9fab6e789..5b13cbae64 100644 --- a/firmware/controllers/algo/defaults/default_base_engine.cpp +++ b/firmware/controllers/algo/defaults/default_base_engine.cpp @@ -107,6 +107,11 @@ void setDefaultBaseEngine() { engineConfiguration->magicNumberAvailableForDevTricks = 1; engineConfiguration->acrRevolutions = 5; + engineConfiguration->acPressure.v2 = 5; + engineConfiguration->acPressure.value2 = 100; + + engineConfiguration->lowPressureFuel.v2 = 5; + engineConfiguration->lowPressureFuel.value2 = 100; engineConfiguration->fuelLevelAveragingAlpha = engine_configuration_defaults::FUEL_LEVEL_AVERAGING_ALPHA; engineConfiguration->fuelLevelUpdatePeriodSec = engine_configuration_defaults::FUEL_LEVEL_UPDATE_PERIOD_SEC;