From 635b0e6ffa52f476900075c4aab0941b32f0f0f4 Mon Sep 17 00:00:00 2001
From: rusEFI LLC <rusefillc@gmail.com>
Date: Fri, 26 Apr 2024 11:07:14 -0400
Subject: [PATCH] Honda (?) 1+16 trigger is not right fix #6418

---
 firmware/CHANGELOG.md                          |  2 +-
 firmware/controllers/algo/engine_types.h       |  2 +-
 .../trigger/decoders/trigger_honda.cpp         | 18 ------------------
 .../trigger/decoders/trigger_honda.h           |  2 --
 .../trigger/decoders/trigger_structure.cpp     |  4 +---
 5 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/firmware/CHANGELOG.md b/firmware/CHANGELOG.md
index d7a83a28d9..6ae42d7839 100644
--- a/firmware/CHANGELOG.md
+++ b/firmware/CHANGELOG.md
@@ -29,7 +29,7 @@ Release template (copy/paste this for new release):
 ### Breaking Changes
  - "60/2 VW" trigger wheel renamed to "60-2 Wrong Polarity" #988
  - exhaust VVTs now use it's onw Edge Select setting
-
+ - removing weird 1+16 trigger wheel #6418
 
 ## Unreleased
 
diff --git a/firmware/controllers/algo/engine_types.h b/firmware/controllers/algo/engine_types.h
index c431219969..2921641451 100644
--- a/firmware/controllers/algo/engine_types.h
+++ b/firmware/controllers/algo/engine_types.h
@@ -367,7 +367,7 @@ enum class trigger_type_e : uint32_t {
 	TT_VVT_BOSCH_QUICK_START = 47,
 	TT_TOOTHED_WHEEL_36_2 = 48,
 	TT_SUBARU_SVX = 49,
-	TT_1_16 = 50,
+	TT_UNUSED_50 = 50,
 	// todo: remove this trigger once we have https://github.com/rusefi/rusefi/issues/2073
 	TT_SUBARU_7_WITHOUT_6 = 51,
 	TT_NISSAN_MR18_CAM_VVT = 52,
diff --git a/firmware/controllers/trigger/decoders/trigger_honda.cpp b/firmware/controllers/trigger/decoders/trigger_honda.cpp
index 30f94b7452..af601aaae5 100644
--- a/firmware/controllers/trigger/decoders/trigger_honda.cpp
+++ b/firmware/controllers/trigger/decoders/trigger_honda.cpp
@@ -26,24 +26,6 @@ void configureHondaCbr600(TriggerWaveform *s) {
 	s->addEvent720(720.0f, TriggerValue::RISE);
 }
 
-// todo: what is this 1+16 trigger about? should it have been defined as skipped + cam or else?
-void configureOnePlus16(TriggerWaveform *s) {
-	s->initialize(FOUR_STROKE_CAM_SENSOR, SyncEdge::RiseOnly);
-
-	int count = 16;
-	float tooth = s->getCycleDuration() / 2 / count;
-	float width = tooth / 2; // for VR we only handle rises so width does not matter much
-
-	s->addEventAngle(1, TriggerValue::RISE, TriggerWheel::T_PRIMARY);
-	s->addEventAngle(5, TriggerValue::FALL, TriggerWheel::T_PRIMARY);
-
-	for (int i = 1; i <= count; i++) {
-		s->addToothRiseFall(tooth * i, width, TriggerWheel::T_SECONDARY);
-	}
-
-	s->isSynchronizationNeeded = false;
-}
-
 // TT_HONDA_K_CRANK_12_1
 void configureHondaK_12_1(TriggerWaveform *s) {
 	s->initialize(FOUR_STROKE_CRANK_SENSOR, SyncEdge::RiseOnly);
diff --git a/firmware/controllers/trigger/decoders/trigger_honda.h b/firmware/controllers/trigger/decoders/trigger_honda.h
index f3af00ccda..6902567a90 100644
--- a/firmware/controllers/trigger/decoders/trigger_honda.h
+++ b/firmware/controllers/trigger/decoders/trigger_honda.h
@@ -9,8 +9,6 @@
 
 class TriggerWaveform;
 
-void configureOnePlus16(TriggerWaveform *s);
-
 void configureHondaCbr600(TriggerWaveform *s);
 
 void configureHondaK_12_1(TriggerWaveform *s);
diff --git a/firmware/controllers/trigger/decoders/trigger_structure.cpp b/firmware/controllers/trigger/decoders/trigger_structure.cpp
index 6ee930ea02..faac9ee440 100644
--- a/firmware/controllers/trigger/decoders/trigger_structure.cpp
+++ b/firmware/controllers/trigger/decoders/trigger_structure.cpp
@@ -680,10 +680,8 @@ void TriggerWaveform::initializeTriggerWaveform(operation_mode_e triggerOperatio
 	case trigger_type_e::TT_MITSU_4G9x_CAM:
 	    initializeMitsubishi4g9xCam(this);
         break;
-	case trigger_type_e::TT_1_16:
-		configureOnePlus16(this);
-		break;
 
+	case trigger_type_e::TT_UNUSED_50:
 	case trigger_type_e::TT_HONDA_CBR_600:
 		configureHondaCbr600(this);
 		break;