diff --git a/firmware/config/engines/honda_accord.cpp b/firmware/config/engines/honda_accord.cpp index 8d303fbe91..e401ec05b1 100644 --- a/firmware/config/engines/honda_accord.cpp +++ b/firmware/config/engines/honda_accord.cpp @@ -160,57 +160,15 @@ static void setHondaAccordConfigurationCommon(DECLARE_CONFIG_PARAMETER_SIGNATURE } /* -void setHondaAccordConfigurationTwoWires(DECLARE_ENGINE_PARAMETER_SIGNATURE) { - engineConfiguration->engineType = HONDA_ACCORD_CD_TWO_WIRES; - engineConfiguration->trigger.type = TT_HONDA_ACCORD_CD_TWO_WIRES; - setHondaAccordConfigurationCommon(PASS_CONFIG_PARAMETER_SIGNATURE); -} -*/ - -void setHondaAccordConfigurationThreeWires(DECLARE_CONFIG_PARAMETER_SIGNATURE) { - engineConfiguration->engineType = HONDA_ACCORD_CD; - engineConfiguration->trigger.type = TT_HONDA_4_24_1; - setHondaAccordConfigurationCommon(PASS_CONFIG_PARAMETER_SIGNATURE); -} - void setHondaAccordConfigurationDip(DECLARE_CONFIG_PARAMETER_SIGNATURE) { engineConfiguration->engineType = HONDA_ACCORD_CD_DIP; engineConfiguration->trigger.type = TT_HONDA_1_4_24; setHondaAccordConfigurationCommon(PASS_CONFIG_PARAMETER_SIGNATURE); } +*/ void setHondaAccordConfiguration1_24(DECLARE_CONFIG_PARAMETER_SIGNATURE) { engineConfiguration->engineType = HONDA_ACCORD_CD_DIP; engineConfiguration->trigger.type = TT_HONDA_1_24; setHondaAccordConfigurationCommon(PASS_CONFIG_PARAMETER_SIGNATURE); } - -void setHondaAccordConfiguration1_24_shifted(DECLARE_CONFIG_PARAMETER_SIGNATURE) { - engineConfiguration->engineType = HONDA_ACCORD_1_24_SHIFTED; - engineConfiguration->trigger.type = TT_HONDA_ACCORD_1_24_SHIFTED; - setHondaAccordConfigurationCommon(PASS_CONFIG_PARAMETER_SIGNATURE); - - // set global_trigger_offset_angle 0 - engineConfiguration->globalTriggerAngleOffset = 0; - -} - -void setHondaCivic4_0_both(DECLARE_CONFIG_PARAMETER_SIGNATURE) { - setHondaAccordConfiguration1_24_shifted(PASS_CONFIG_PARAMETER_SIGNATURE); - - engineConfiguration->useOnlyRisingEdgeForTrigger = false; - engineConfiguration->trigger.customTotalToothCount = 4; - engineConfiguration->trigger.customSkippedToothCount = 0; - - engineConfiguration->trigger.type = TT_TOOTHED_WHEEL; -} - -void setHondaCivic4_0_rise(DECLARE_CONFIG_PARAMETER_SIGNATURE) { - setHondaAccordConfiguration1_24_shifted(PASS_CONFIG_PARAMETER_SIGNATURE); - - engineConfiguration->useOnlyRisingEdgeForTrigger = true; - engineConfiguration->trigger.customTotalToothCount = 4; - engineConfiguration->trigger.customSkippedToothCount = 0; - - engineConfiguration->trigger.type = TT_TOOTHED_WHEEL; -} diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 3e0653cf63..768ab462cd 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -1033,9 +1033,6 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e case NISSAN_PRIMERA: setNissanPrimeraEngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); break; - case HONDA_ACCORD_CD: - setHondaAccordConfigurationThreeWires(PASS_CONFIG_PARAMETER_SIGNATURE); - break; case MIATA_NA6_MAP: setMiataNA6_MAP_Frankenso(PASS_CONFIG_PARAMETER_SIGNATURE); break; @@ -1051,21 +1048,14 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e case MAZDA_MIATA_NA8: setMazdaMiataNA8Configuration(PASS_CONFIG_PARAMETER_SIGNATURE); break; - case TEST_CIVIC_4_0_BOTH: - setHondaCivic4_0_both(PASS_CONFIG_PARAMETER_SIGNATURE); - break; - case TEST_CIVIC_4_0_RISE: - setHondaCivic4_0_rise(PASS_CONFIG_PARAMETER_SIGNATURE); - break; case HONDA_ACCORD_CD_TWO_WIRES: setHondaAccordConfiguration1_24(PASS_CONFIG_PARAMETER_SIGNATURE); break; - case HONDA_ACCORD_1_24_SHIFTED: - setHondaAccordConfiguration1_24_shifted(PASS_CONFIG_PARAMETER_SIGNATURE); - break; case HONDA_ACCORD_CD_DIP: +/* setHondaAccordConfigurationDip(PASS_CONFIG_PARAMETER_SIGNATURE); break; +*/ case MITSU_4G93: setMitsubishiConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); break;