remove 2jz trigger that's really 12 tooth crank (#4637)

* remove 2jz trigger that's really 12 tooth crank * triggerimage hardcoded name
2022-10-05 18:59:17 -07:00 · 2022-10-05 18:59:17 -07:00 · a773b3249a
parent d6647025cc
commit a773b3249a
9 changed files with 4 additions and 84 deletions
--- a/firmware/config/engines/toyota_jzs147.cpp
+++ b/firmware/config/engines/toyota_jzs147.cpp
@ -67,34 +67,6 @@ static void common2jz() {

 }

-void setToyota_jzs147EngineConfiguration() {
-	common2jz();
-
-	setCamOperationMode();
-	engineConfiguration->trigger.type = TT_2JZ_1_12;
-
-//// temporary while I am fixing trigger bug
-//	setCrankOperationMode();
-//	//set trigger_type 16
-//	engineConfiguration->trigger.type = TT_TOOTHED_WHEEL;
-//	engineConfiguration->trigger.customTotalToothCount = 36;
-//	engineConfiguration->trigger.customSkippedToothCount = 2;
-//
-//	engineConfiguration->ignitionMode = IM_WASTED_SPARK;
-//	engineConfiguration->twoWireBatchIgnition = true;
-//
-//	engineConfiguration->crankingInjectionMode = IM_BATCH;
-//	engineConfiguration->injectionMode = IM_BATCH;
-//	engineConfiguration->twoWireBatchInjection = true;
-
-//	engineConfiguration->triggerInputPins[0] = Gpio::A5;
-//	engineConfiguration->triggerInputPins[1] = Gpio::C6;
-
-	engineConfiguration->isSdCardEnabled = false;
-
-
-}
-
 /**
 * TOYOTA_2JZ_GTE_VVTi
 * set engine_type 44
--- a/firmware/config/engines/toyota_jzs147.h
+++ b/firmware/config/engines/toyota_jzs147.h
@ -9,6 +9,4 @@

 #include "engine_configuration.h"

-void setToyota_jzs147EngineConfiguration();
 void setToyota_2jz_vics();
-
--- a/firmware/controllers/algo/engine_configuration.cpp
+++ b/firmware/controllers/algo/engine_configuration.cpp
@ -1066,9 +1066,6 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e
 	case TOYOTA_2JZ_GTE_VVTi:
 		setToyota_2jz_vics();
 		break;
-	case TOYOTA_JZS147:
-		setToyota_jzs147EngineConfiguration();
-		break;
 	case TEST_33816:
 		setTest33816EngineConfiguration();
 		break;
--- a/firmware/controllers/algo/engine_types.h
+++ b/firmware/controllers/algo/engine_types.h
@ -104,7 +104,7 @@ typedef enum __attribute__ ((__packed__)) {

 	MRE_SUBARU_EJ18 = 37,

-	TOYOTA_JZS147 = 38, // 2JZ-GTE NON VVTi
+	UNUSED_38 = 38,

 	PROTEUS_VW_B6 = 39,

@ -376,8 +376,6 @@ typedef enum {

 	TT_HONDA_CBR_600 = 28,

-	TT_2JZ_1_12 = 29,
-
 	TT_CHRYSLER_NGC_36_2_2 = 30,

 	// skipped 3/1 with cam sensor for testing
@ -508,6 +506,7 @@ typedef enum {
 	TT_SUBARU_EZ30 = 12,
 	TT_VVT_MAZDA_SKYACTIV = 13,
 	UNUSED_21 = 21,
+	UNUSED_29 = 29,
 	UNUSED_34 = 34,

 	// do not forget to edit "#define trigger_type_e_enum" line in integration/rusefi_config.txt file to propogate new value to rusefi.ini TS project
--- a/firmware/controllers/trigger/decoders/trigger_structure.cpp
+++ b/firmware/controllers/trigger/decoders/trigger_structure.cpp
@ -695,6 +695,7 @@ void TriggerWaveform::initializeTriggerWaveform(operation_mode_e triggerOperatio
        break;

 	case UNUSED_21:
+	case UNUSED_29:
 	case UNUSED_34:
 	case TT_1_16:
 		configureOnePlus16(this);
@ -736,10 +737,6 @@ void TriggerWaveform::initializeTriggerWaveform(operation_mode_e triggerOperatio
 		initialize2jzGE3_34_simulation_shape(this);
 		break;

-	case TT_2JZ_1_12:
-		initialize2jzGE1_12(this);
-		break;
-
 	case TT_12_TOOTH_CRANK:
 		configure12ToothCrank(this);
 		break;
--- a/firmware/controllers/trigger/decoders/trigger_toyota.cpp
+++ b/firmware/controllers/trigger/decoders/trigger_toyota.cpp
@ -11,46 +11,6 @@

 #include "trigger_toyota.h"

-/**
- * TT_2JZ_1_12
- * One cam + 12 crank
- * http://rusefi.com/images/triggers/trigger_29.png
- */
-
-void initialize2jzGE1_12(TriggerWaveform *s) {
-	s->initialize(FOUR_STROKE_CAM_SENSOR, SyncEdge::Rise);
-
-	float crankD = 360 / 12 / 2; // 15
-
-	float crankAngle = 10;
-	s->addEventClamped(crankAngle, TriggerWheel::T_SECONDARY, TriggerValue::FALL, -1, 721); // 120
-
-	for (int i = 0; i < 2; i++) {
-		s->addEventClamped(crankAngle + crankD, TriggerWheel::T_SECONDARY, TriggerValue::RISE, -1, 721);
-		crankAngle += crankD;
-		s->addEventClamped(crankAngle + crankD, TriggerWheel::T_SECONDARY, TriggerValue::FALL, -1, 721); // 120
-		crankAngle += crankD;
-	}
-
-
-	s->addEventClamped(75, TriggerWheel::T_PRIMARY, TriggerValue::FALL, -1, 721);
-
-	for (int i = 0; i < 21; i++) {
-		s->addEventClamped(crankAngle + crankD, TriggerWheel::T_SECONDARY, TriggerValue::RISE, -1, 721);
-		crankAngle += crankD;
-		s->addEventClamped(crankAngle + crankD, TriggerWheel::T_SECONDARY, TriggerValue::FALL, -1, 721); // 120
-		crankAngle += crankD;
-	}
-
-	s->addEventClamped(crankAngle + crankD, TriggerWheel::T_SECONDARY, TriggerValue::RISE, -1, 721);
-	crankAngle += crankD;
-
-
-	s->addEventClamped(720, TriggerWheel::T_PRIMARY, TriggerValue::RISE, -1, 721);
-
-	s->isSynchronizationNeeded = false;
-}
-
 /**
 * https://rusefi.com/forum/viewtopic.php?f=5&t=1720
 */
--- a/firmware/controllers/trigger/decoders/trigger_toyota.h
+++ b/firmware/controllers/trigger/decoders/trigger_toyota.h
@ -9,7 +9,6 @@

 class TriggerWaveform;

-void initialize2jzGE1_12(TriggerWaveform *s);
 // TT_2JZ_3_34
 void initialize2jzGE3_34_simulation_shape(TriggerWaveform *s);

--- a/firmware/integration/rusefi_config.txt
+++ b/firmware/integration/rusefi_config.txt
@ -580,7 +580,7 @@ adc_channel_e fuelLevelSensor;This is the processor pin that your fuel level sen

 struct trigger_config_s @brief Trigger wheel(s) configuration

-#define trigger_type_e_enum "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "INVALID", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Mercedes Two Segment", "Mitsubishi 4G93", "EZ30", "INVALID", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "INVALID", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM 24x 5 degree", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata NB", "INVALID", "INVALID", "Subaru 7+6", "Jeep 18-2-2-2", "12 tooth crank", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "INVALID", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "INVALID", "36/2", "Subaru SVX", "1+16", "Subaru 7 without 6", "INVALID", "TriTach", "GM 60/2/2/2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "Nissan VQ35", "INVALID", "Nissan VQ30", "Nissan QR25", "Mitsubishi 3A92", "Subaru SVX Crank 1", "Subaru SVX Cam VVT", "Ford PIP", "Suzuki G13B", "Honda K 4+1", "Nissan MR18 Crank", "32/2", "36-2-1", "36-2-1-1", "INVALID", "INVALID", "GM 24x 3 degree", "trg75"
+#define trigger_type_e_enum "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "INVALID", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Mercedes Two Segment", "Mitsubishi 4G93", "EZ30", "INVALID", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "INVALID", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM 24x 5 degree", "Honda CBR 600", "INVALID", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata NB", "INVALID", "INVALID", "Subaru 7+6", "Jeep 18-2-2-2", "12 tooth crank", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "INVALID", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "INVALID", "36/2", "Subaru SVX", "1+16", "Subaru 7 without 6", "INVALID", "TriTach", "GM 60/2/2/2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "Nissan VQ35", "INVALID", "Nissan VQ30", "Nissan QR25", "Mitsubishi 3A92", "Subaru SVX Crank 1", "Subaru SVX Cam VVT", "Ford PIP", "Suzuki G13B", "Honda K 4+1", "Nissan MR18 Crank", "32/2", "36-2-1", "36-2-1-1", "INVALID", "INVALID", "GM 24x 3 degree", "trg75"

 custom trigger_type_e 4 bits, U32, @OFFSET@, [0:6], @@trigger_type_e_enum@@
 	trigger_type_e type;https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers\nset trigger_type X
--- a/java_console/ui/src/main/java/com/rusefi/trigger/TriggerImage.java
+++ b/java_console/ui/src/main/java/com/rusefi/trigger/TriggerImage.java
@ -71,8 +71,6 @@ public class TriggerImage {
                return "Chrysler NGC 36/2/2";
            case TT_ONE:
                return "Single Tooth";
-            case TT_2JZ_1_12:
-                return "2JZ 1/12";
            case TT_JEEP_4_CYL:
                return "Jeep 4 cylinder";
            case TT_JEEP_18_2_2_2: