From c6a2f2657b148b4b239cb5659d32281d0aaba30e Mon Sep 17 00:00:00 2001 From: rusefillc Date: Fri, 23 Sep 2022 20:12:34 -0400 Subject: [PATCH] honda K enum rename --- .../controllers/algo/auto_generated_enginetypes.cpp | 8 ++++---- firmware/controllers/algo/engine_types.h | 10 ++++++++-- .../controllers/trigger/decoders/trigger_honda.cpp | 2 +- .../controllers/trigger/decoders/trigger_structure.cpp | 4 ++-- unit_tests/tests/trigger/test_real_k24a2.cpp | 2 +- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/firmware/controllers/algo/auto_generated_enginetypes.cpp b/firmware/controllers/algo/auto_generated_enginetypes.cpp index 7ecceb2599..50947151c7 100644 --- a/firmware/controllers/algo/auto_generated_enginetypes.cpp +++ b/firmware/controllers/algo/auto_generated_enginetypes.cpp @@ -412,10 +412,10 @@ case TT_GM_7X: return "TT_GM_7X"; case TT_HONDA_CBR_600: return "TT_HONDA_CBR_600"; -case TT_HONDA_K_12_1: - return "TT_HONDA_K_12_1"; -case TT_HONDA_K_4_1: - return "TT_HONDA_K_4_1"; +case TT_HONDA_K_CRANK_12_1: + return "TT_HONDA_K_CRANK_12_1"; +case TT_HONDA_K_CAM_4_1: + return "TT_HONDA_K_CAM_4_1"; case TT_JEEP_18_2_2_2: return "TT_JEEP_18_2_2_2"; case TT_JEEP_4_CYL: diff --git a/firmware/controllers/algo/engine_types.h b/firmware/controllers/algo/engine_types.h index 294e21e53c..a24f78a5da 100644 --- a/firmware/controllers/algo/engine_types.h +++ b/firmware/controllers/algo/engine_types.h @@ -431,7 +431,10 @@ typedef enum { */ TT_RENIX_66_2_2_2 = 45, - TT_HONDA_K_12_1 = 46, + /** + * Honda K crank shape + */ + TT_HONDA_K_CRANK_12_1 = 46, TT_VVT_BOSCH_QUICK_START = 47, @@ -479,7 +482,10 @@ typedef enum { TT_SUZUKI_G13B = 66, - TT_HONDA_K_4_1 = 67, + /** + * Honda K cam shaft + */ + TT_HONDA_K_CAM_4_1 = 67, TT_NISSAN_MR18_CRANK = 68, diff --git a/firmware/controllers/trigger/decoders/trigger_honda.cpp b/firmware/controllers/trigger/decoders/trigger_honda.cpp index 7049b7a8a6..8596ad4eb8 100644 --- a/firmware/controllers/trigger/decoders/trigger_honda.cpp +++ b/firmware/controllers/trigger/decoders/trigger_honda.cpp @@ -75,7 +75,7 @@ static void kseriesTooth(TriggerWaveform* s, float end) { s->addEvent360(end , TriggerWheel::T_PRIMARY, TriggerValue::FALL); } -// TT_HONDA_K_12_1 +// TT_HONDA_K_CRANK_12_1 void configureHondaK_12_1(TriggerWaveform *s) { s->initialize(FOUR_STROKE_CRANK_SENSOR); diff --git a/firmware/controllers/trigger/decoders/trigger_structure.cpp b/firmware/controllers/trigger/decoders/trigger_structure.cpp index b885e026fd..9a6f091ccc 100644 --- a/firmware/controllers/trigger/decoders/trigger_structure.cpp +++ b/firmware/controllers/trigger/decoders/trigger_structure.cpp @@ -679,11 +679,11 @@ void TriggerWaveform::initializeTriggerWaveform(operation_mode_e triggerOperatio configureBarra3plus1cam(this); break; - case TT_HONDA_K_4_1: + case TT_HONDA_K_CAM_4_1: configureHondaK_4_1(this); break; - case TT_HONDA_K_12_1: + case TT_HONDA_K_CRANK_12_1: configureHondaK_12_1(this); break; diff --git a/unit_tests/tests/trigger/test_real_k24a2.cpp b/unit_tests/tests/trigger/test_real_k24a2.cpp index 3298858ca6..4a369616a4 100644 --- a/unit_tests/tests/trigger/test_real_k24a2.cpp +++ b/unit_tests/tests/trigger/test_real_k24a2.cpp @@ -11,7 +11,7 @@ static void doTest(const char* testFile, int expectedRpm) { engineConfiguration->isFasterEngineSpinUpEnabled = true; engineConfiguration->alwaysInstantRpm = true; - eth.setTriggerType(TT_HONDA_K_12_1); + eth.setTriggerType(TT_HONDA_K_CRANK_12_1); while (reader.haveMore()) { reader.processLine(ð);