diff --git a/firmware/config/engines/honda_accord.h b/firmware/config/engines/honda_accord.h index f9e32ee114..fd62690cb5 100644 --- a/firmware/config/engines/honda_accord.h +++ b/firmware/config/engines/honda_accord.h @@ -9,10 +9,14 @@ #include "engine_configuration.h" void setHondaAccordConfigurationTwoWires(DECLARE_CONFIG_PARAMETER_SIGNATURE); -void setHondaAccordConfigurationThreeWires(DECLARE_CONFIG_PARAMETER_SIGNATURE); void setHondaAccordConfigurationDip(DECLARE_CONFIG_PARAMETER_SIGNATURE); -void setHondaAccordConfiguration1_24(DECLARE_CONFIG_PARAMETER_SIGNATURE); -void setHondaAccordConfiguration1_24_shifted(DECLARE_CONFIG_PARAMETER_SIGNATURE); -void setHondaCivic4_0_both(DECLARE_CONFIG_PARAMETER_SIGNATURE); -void setHondaCivic4_0_rise(DECLARE_CONFIG_PARAMETER_SIGNATURE); +/** + * https://technet.ff-squad.com/wiring.obd1.htm + * + * as you move inward from the outside of the connector, tooth count decreases + * outermost CKP = 12/24 + * middle = 4 total, 1/cyl + * inner CID cylinder ID = 1 total, 1/cam + */ +void setHondaAccordConfiguration1_24(DECLARE_CONFIG_PARAMETER_SIGNATURE); diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h index d9d1ba9d36..a480129a71 100644 --- a/firmware/controllers/algo/rusefi_enums.h +++ b/firmware/controllers/algo/rusefi_enums.h @@ -44,7 +44,7 @@ typedef enum { FORD_ASPIRE_1996 = ET_FORD_ASPIRE, NISSAN_PRIMERA = ET_NISSAN_PRIMERA, - HONDA_ACCORD_CD = 6, + UNUSED_6 = 6, FORD_INLINE_6_1995 = 7, /** * one cylinder engine @@ -138,19 +138,13 @@ typedef enum { */ MAZDA_MIATA_2003 = ET_FRANKENSO_MIATA_NB2, - HONDA_ACCORD_1_24_SHIFTED = 48, + UNUSED_48 = 48, FRANKENSO_QA_ENGINE = 49, - /** - * this is about unit-testing skipped wheel trigger - */ - TEST_CIVIC_4_0_BOTH = 50, + UNUSED_50 = 50, - /** - * this is about unit-testing skipped wheel trigger - */ - TEST_CIVIC_4_0_RISE = 51, + UNUSED_51 = 51, TEST_ISSUE_366_BOTH = 52, @@ -281,7 +275,7 @@ typedef enum { TT_TOOTHED_WHEEL_36_1 = TT_TT_TOOTHED_WHEEL_36_1, // todo: remove this weird trigger? - TT_HONDA_4_24_1 = TT_TT_HONDA_4_24_1, + TT_UNUSED_10 = TT_TT_UNUSED_10, // todo: this really looks to be same as Miata_NA shall we remove? TT_MITSUBISHI = 11, diff --git a/firmware/controllers/settings.h b/firmware/controllers/settings.h index 0f53ecacfe..1258615084 100644 --- a/firmware/controllers/settings.h +++ b/firmware/controllers/settings.h @@ -18,9 +18,3 @@ void setCallFromPitStop(int durationMs); void printTPSInfo(void); void setEngineType(int value DECLARE_ENGINE_PARAMETER_SUFFIX); void readPin(const char *pinName); - -/** - * See also getEngine_type_e() - */ -const char* getConfigurationName(engine_type_e engineType); - diff --git a/firmware/controllers/trigger/decoders/trigger_structure.cpp b/firmware/controllers/trigger/decoders/trigger_structure.cpp index acf7461aee..1b5d6323c7 100644 --- a/firmware/controllers/trigger/decoders/trigger_structure.cpp +++ b/firmware/controllers/trigger/decoders/trigger_structure.cpp @@ -654,11 +654,7 @@ void TriggerWaveform::initializeTriggerWaveform(operation_mode_e ambiguousOperat configureHondaK_12_1(this); break; - case TT_HONDA_4_24_1: - configureHonda_1_4_24(this, true, true, T_CHANNEL_3, T_PRIMARY, 0); - shapeWithoutTdc = true; - break; - + case TT_UNUSED_10: case TT_HONDA_4_24: configureHonda_1_4_24(this, false, true, T_NONE, T_PRIMARY, 0); shapeWithoutTdc = true; diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 34808c29f8..095af7211e 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -421,7 +421,7 @@ end_struct #define TT_TT_MAZDA_SOHC_4 7 #define TT_TT_TOOTHED_WHEEL_60_2 8 #define TT_TT_TOOTHED_WHEEL_36_1 9 -#define TT_TT_HONDA_4_24_1 10 +#define TT_TT_UNUSED_10 10 #define TT_TT_HONDA_1_4_24 13 #define TT_TT_MAZDA_DOHC_1_4 15 #define TT_TT_VVT_JZ 17 diff --git a/unit_tests/tests/trigger/test_trigger_decoder.cpp b/unit_tests/tests/trigger/test_trigger_decoder.cpp index ad24354672..f0d21dcc29 100644 --- a/unit_tests/tests/trigger/test_trigger_decoder.cpp +++ b/unit_tests/tests/trigger/test_trigger_decoder.cpp @@ -500,9 +500,7 @@ TEST(misc, testTriggerDecoder) { testTriggerDecoder2("test1+1", DEFAULT_FRANKENSO, 0, 0.7500, 0.2500); testTriggerDecoder2("testCitroen", CITROEN_TU3JP, 0, 0.4833, 0); - testTriggerDecoder2("testAccordCd 3w", HONDA_ACCORD_CD, 12, 0.8146, 0.5000); testTriggerDecoder2("testAccordCd 2w", HONDA_ACCORD_CD_TWO_WIRES, 2, 0.9167, 0.5); - testTriggerDecoder2("testAccordCdDip", HONDA_ACCORD_CD_DIP, 27, 0.5000, 0.5000); testTriggerDecoder2("testMitsu", MITSU_4G93, 0, 0.3553, 0.3752); {