From 21f9ed97aa2bc2bb94f9eef244577a2afbe035cf Mon Sep 17 00:00:00 2001 From: rusefillc Date: Thu, 20 Apr 2023 21:43:58 -0400 Subject: [PATCH] only:proteus_f7 --- firmware/config/engines/bmw_m73.cpp | 6 ++---- firmware/config/engines/hyundai.cpp | 12 ++++++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/firmware/config/engines/bmw_m73.cpp b/firmware/config/engines/bmw_m73.cpp index d2a8b05b7e..baee78d5ce 100644 --- a/firmware/config/engines/bmw_m73.cpp +++ b/firmware/config/engines/bmw_m73.cpp @@ -271,10 +271,8 @@ void setEngineBMW_M73_Proteus() { engineConfiguration->clt.adcChannel = PROTEUS_IN_ANALOG_TEMP_4; - // Gpio::E0: "Lowside 14" - engineConfiguration->starterControlPin = Gpio::E0; - // Gpio::E12: "Digital 3" - engineConfiguration->startStopButtonPin = Gpio::E12; + engineConfiguration->starterControlPin = PROTEUS_LS_14; + engineConfiguration->startStopButtonPin = PROTEUS_DIGITAL_3; engineConfiguration->startStopButtonMode = PI_PULLUP; // tps and pps diff --git a/firmware/config/engines/hyundai.cpp b/firmware/config/engines/hyundai.cpp index 9b3093ab9c..cc9c54ea03 100644 --- a/firmware/config/engines/hyundai.cpp +++ b/firmware/config/engines/hyundai.cpp @@ -16,12 +16,24 @@ void setHyundaiPb() { engineConfiguration->specs.displacement = 1.6; strcpy(engineConfiguration->engineMake, ENGINE_MAKE_Hyundai); strcpy(engineConfiguration->engineCode, "Gamma"); + + engineConfiguration->globalTriggerAngleOffset = 90; + + engineConfiguration->ignitionMode = IM_INDIVIDUAL_COILS; } void setProteusHyundaiPb() { engineConfiguration->triggerInputPins[0] = PROTEUS_VR_1; engineConfiguration->camInputs[0] = PROTEUS_DIGITAL_1; engineConfiguration->camInputs[1] = PROTEUS_DIGITAL_2; + + engineConfiguration->tps1_2AdcChannel = PROTEUS_IN_TPS1_2; + setPPSInputs(PROTEUS_IN_PPS, PROTEUS_IN_PPS2); + + +// engineConfiguration->starterControlPin = PROTEUS_LS_14; + engineConfiguration->startStopButtonPin = PROTEUS_DIGITAL_3; + engineConfiguration->startStopButtonMode = PI_PULLUP; } static void commonGenesisCoupe() {