diff --git a/firmware/config/engines/citroenBerlingoTU3JP.cpp b/firmware/config/engines/citroenBerlingoTU3JP.cpp index ba92f6cc44..f28c3465bc 100644 --- a/firmware/config/engines/citroenBerlingoTU3JP.cpp +++ b/firmware/config/engines/citroenBerlingoTU3JP.cpp @@ -78,7 +78,7 @@ void setCitroenBerlingoTU3JPConfiguration() { engineConfiguration->fuelPumpPin = Gpio::B9; engineConfiguration->fuelPumpPinMode = OM_DEFAULT; - setFrankenso_01_LCD(engineConfiguration); + setFrankenso_01_LCD(); // engineConfiguration->o2heaterPin = Gpio::C13; diff --git a/firmware/config/engines/custom_engine.cpp b/firmware/config/engines/custom_engine.cpp index 99601db0db..730c5b54e2 100644 --- a/firmware/config/engines/custom_engine.cpp +++ b/firmware/config/engines/custom_engine.cpp @@ -61,7 +61,7 @@ void runSchedulingPrecisionTestIfNeeded(void) { } #endif /* EFI_PROD_CODE */ -void setFrankenso_01_LCD(engine_configuration_s *engineConfiguration) { +void setFrankenso_01_LCD() { engineConfiguration->HD44780_rs = Gpio::E7; engineConfiguration->HD44780_e = Gpio::E9; engineConfiguration->HD44780_db4 = Gpio::E11; @@ -70,7 +70,7 @@ void setFrankenso_01_LCD(engine_configuration_s *engineConfiguration) { engineConfiguration->HD44780_db7 = Gpio::B10; } -void disableLCD(engine_configuration_s *engineConfiguration) { +void disableLCD() { engineConfiguration->HD44780_rs = Gpio::Unassigned; engineConfiguration->HD44780_e = Gpio::Unassigned; engineConfiguration->HD44780_db4 = Gpio::Unassigned; @@ -83,10 +83,10 @@ void disableLCD(engine_configuration_s *engineConfiguration) { void setFrankensoConfiguration() { engineConfiguration->trigger.type = TT_ONE_PLUS_ONE; - setFrankenso_01_LCD(engineConfiguration); + setFrankenso_01_LCD(); engineConfiguration->displayMode = DM_HD44780; - commonFrankensoAnalogInputs(engineConfiguration); - setFrankenso0_1_joystick(engineConfiguration); + commonFrankensoAnalogInputs(); + setFrankenso0_1_joystick(); /** * Frankenso analog #1 PC2 ADC12 CLT diff --git a/firmware/config/engines/custom_engine.h b/firmware/config/engines/custom_engine.h index 8caeaf7828..dba4afe524 100644 --- a/firmware/config/engines/custom_engine.h +++ b/firmware/config/engines/custom_engine.h @@ -9,8 +9,8 @@ #include "engine_configuration.h" void setFrankensoConfiguration(); -void setFrankenso_01_LCD(engine_configuration_s *engineConfiguration); -void disableLCD(engine_configuration_s *engineConfiguration); +void setFrankenso_01_LCD(); +void disableLCD(); void runSchedulingPrecisionTestIfNeeded(void); void setFrankensoBoardTestConfiguration(); void setEtbTestConfiguration(); @@ -19,8 +19,6 @@ void setL9779TestConfiguration(); void setEepromTestConfiguration(); -void setTestQuadCam(); - void mreBoardNewTest(); void mreSecondaryCan(); void mreBCM(); @@ -35,7 +33,7 @@ void proteusHarley(); void setTest33816EngineConfiguration(); void setBoschHDEV_5_injectors(); -void setHellen72etb(); + void setRotary(); void setVrThresholdTest(); diff --git a/firmware/config/engines/dodge_neon.cpp b/firmware/config/engines/dodge_neon.cpp index 8ef16b074b..ee5aac5419 100644 --- a/firmware/config/engines/dodge_neon.cpp +++ b/firmware/config/engines/dodge_neon.cpp @@ -109,8 +109,8 @@ void setDodgeNeon1995EngineConfiguration() { void setDodgeNeonNGCEngineConfiguration() { engineConfiguration->trigger.type = TT_DODGE_NEON_2003_CAM; - setFrankenso_01_LCD(engineConfiguration); - setFrankenso0_1_joystick(engineConfiguration); + setFrankenso_01_LCD(); + setFrankenso0_1_joystick(); // set global_trigger_offset_angle 38 engineConfiguration->globalTriggerAngleOffset = 38; @@ -157,7 +157,7 @@ void setDodgeNeonNGCEngineConfiguration() { */ engineConfiguration->afr.hwChannel = EFI_ADC_4; - commonFrankensoAnalogInputs(engineConfiguration); + commonFrankensoAnalogInputs(); engineConfiguration->vbattDividerCoeff = 9.75;// ((float) (8.2 + 33)) / 8.2 * 2; /** diff --git a/firmware/config/engines/ford_festiva.cpp b/firmware/config/engines/ford_festiva.cpp index 9f2145cfe7..73bc286593 100644 --- a/firmware/config/engines/ford_festiva.cpp +++ b/firmware/config/engines/ford_festiva.cpp @@ -68,8 +68,8 @@ void setFordEscortGt() { engineConfiguration->trigger.type = TT_MAZDA_DOHC_1_4; - setFrankenso_01_LCD(engineConfiguration); - setFrankenso0_1_joystick(engineConfiguration); + setFrankenso_01_LCD(); + setFrankenso0_1_joystick(); setDensoTODO(config); @@ -192,7 +192,7 @@ void setFordEscortGt() { engineConfiguration->tunerStudioSerialSpeed = 19200; - commonFrankensoAnalogInputs(engineConfiguration); + commonFrankensoAnalogInputs(); setCommonNTCSensor(&engineConfiguration->clt, 2700); setCommonNTCSensor(&engineConfiguration->iat, 2700); diff --git a/firmware/config/engines/honda_600.cpp b/firmware/config/engines/honda_600.cpp index cbc947c2b6..669acbd64d 100644 --- a/firmware/config/engines/honda_600.cpp +++ b/firmware/config/engines/honda_600.cpp @@ -48,9 +48,9 @@ void setHonda600() { //setIndividualCoilsIgnition(); - setFrankenso_01_LCD(engineConfiguration); - commonFrankensoAnalogInputs(engineConfiguration); - setFrankenso0_1_joystick(engineConfiguration); + setFrankenso_01_LCD(); + commonFrankensoAnalogInputs(); + setFrankenso0_1_joystick(); setTable(config->injectionPhase, 320.0f); /** diff --git a/firmware/config/engines/subaru.cpp b/firmware/config/engines/subaru.cpp index 3fdd5dacaf..53a338fe54 100644 --- a/firmware/config/engines/subaru.cpp +++ b/firmware/config/engines/subaru.cpp @@ -15,8 +15,8 @@ #include "defaults.h" void setSubaru2003Wrx() { - setFrankenso_01_LCD(engineConfiguration); - setFrankenso0_1_joystick(engineConfiguration); + setFrankenso_01_LCD(); + setFrankenso0_1_joystick(); engineConfiguration->trigger.type = TT_TOOTHED_WHEEL; engineConfiguration->trigger.customTotalToothCount = 5; diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 0f92ca4cb6..741df9e5b6 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -1034,14 +1034,14 @@ void setCrankOperationMode() { engineConfiguration->skippedWheelOnCam = false; } -void commonFrankensoAnalogInputs(engine_configuration_s *engineConfiguration) { +void commonFrankensoAnalogInputs() { /** * VBatt */ engineConfiguration->vbattAdcChannel = EFI_ADC_14; } -void setFrankenso0_1_joystick(engine_configuration_s *engineConfiguration) { +void setFrankenso0_1_joystick() { engineConfiguration->joystickCenterPin = Gpio::C8; engineConfiguration->joystickAPin = Gpio::D10; diff --git a/firmware/controllers/algo/engine_configuration.h b/firmware/controllers/algo/engine_configuration.h index 224a6c09b3..5d9339f5af 100644 --- a/firmware/controllers/algo/engine_configuration.h +++ b/firmware/controllers/algo/engine_configuration.h @@ -42,8 +42,8 @@ void setDefaultSdCardParameters(); void onBurnRequest(); void incrementGlobalConfigurationVersion(); -void commonFrankensoAnalogInputs(engine_configuration_s *engineConfiguration); -void setFrankenso0_1_joystick(engine_configuration_s *engineConfiguration); +void commonFrankensoAnalogInputs(); +void setFrankenso0_1_joystick(); void emptyCallbackWithConfiguration(engine_configuration_s * engine);