From 9f7199950ec13cad13a27cbcedec48396f0ec93c Mon Sep 17 00:00:00 2001 From: rusefillc Date: Sat, 1 Apr 2023 15:17:37 -0400 Subject: [PATCH] Clean-up all the 4g drama #5213 --- firmware/controllers/algo/engine_types.h | 11 +++++------ .../trigger/decoders/trigger_structure.cpp | 15 +++------------ firmware/integration/rusefi_config.txt | 2 +- 3 files changed, 9 insertions(+), 19 deletions(-) diff --git a/firmware/controllers/algo/engine_types.h b/firmware/controllers/algo/engine_types.h index 44c1e6dc7d..c8f231cca8 100644 --- a/firmware/controllers/algo/engine_types.h +++ b/firmware/controllers/algo/engine_types.h @@ -316,7 +316,7 @@ typedef enum { TT_DODGE_NEON_1995 = 2, // https://rusefi.com/wiki/index.php?title=Manual:Software:Trigger#Mazda_Miata_NA TT_MAZDA_MIATA_NA = 3, - TT_MITSUBISHI_MESS = 4, + TT_UNUSED_4 = 4, TT_GM_7X = 5, TT_DAIHATSU = 6, TT_MAZDA_SOHC_4 = 7, @@ -325,8 +325,7 @@ typedef enum { TT_TOOTHED_WHEEL_60_2 = 8, TT_TOOTHED_WHEEL_36_1 = 9, TT_MERCEDES_2_SEGMENT = 10, - // todo: this really looks to be same as Miata_NA shall we remove? - TT_MITSUBISHI_4G93 = 11, + TT_UNUSED_11 = 11, TT_SUBARU_EZ30 = 12, TT_VVT_MAZDA_SKYACTIV = 13, // cam-based @@ -417,12 +416,12 @@ typedef enum { // Mitsubishi 4B11 would be this with half moon camshaft TT_36_2_1 = 70, // Mitsubishi 3 cyl and 6 cyl - TT_36_2_1_1 = 71, - TT_VVT_MITSUBISHI_6G75 = 72, + TT_36_2_1_1 = 71, + TT_VVT_MITSUBISHI_6G75 = 72, TT_VVT_TOYOTA_4_1 = 73, // GM 24x with 3/12 degree gaps TT_GM_24x_2 = 74, - TT_MITSU_75 = 75, + TT_UNUSED_75 = 75, TT_MITSU_4G63_CRANK = 76, TT_UNUSED_77 = 77, TT_UNUSED_78 = 78, diff --git a/firmware/controllers/trigger/decoders/trigger_structure.cpp b/firmware/controllers/trigger/decoders/trigger_structure.cpp index 6ef7d6c04a..24ed733f84 100644 --- a/firmware/controllers/trigger/decoders/trigger_structure.cpp +++ b/firmware/controllers/trigger/decoders/trigger_structure.cpp @@ -424,10 +424,6 @@ void TriggerWaveform::initializeTriggerWaveform(operation_mode_e triggerOperatio initializeMazdaMiataNaShape(this); break; - case TT_MITSUBISHI_MESS: - initializeMitsubishi4gMess(this); - break; - case TT_MAZDA_MIATA_VVT_TEST: initializeMazdaMiataVVtTestShape(this); break; @@ -630,12 +626,11 @@ void TriggerWaveform::initializeTriggerWaveform(operation_mode_e triggerOperatio case TT_MITSU_4G63_CRANK: initializeMitsubishi4gSymmetricalCrank(this); break; + case TT_UNUSED_4: + case TT_UNUSED_11: + case TT_UNUSED_75: case TT_UNUSED_77: case TT_UNUSED_78: - case TT_MITSU_75: - initializeMitsubishi75(this); - break; - case TT_MITSU_4G63_CAM: initializeMitsubishi4g63Cam(this); break; @@ -655,10 +650,6 @@ void TriggerWaveform::initializeTriggerWaveform(operation_mode_e triggerOperatio configureChryslerNGC_36_2_2(this); break; - case TT_MITSUBISHI_4G93: - initializeMitsubishi4G93(this); - break; - case TT_DODGE_RAM: initDodgeRam(this); break; diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 95c38b8d65..cf79934b3f 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -600,7 +600,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", "Mitsubishi Mess 4", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Mercedes Two Segment", "Mitsubishi 4G93 11", "EZ30", "INVALID", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "Benelli Tre", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM 24x 5 degree", "Honda CBR 600", "Mitsubishi 4G92/93/94 Cam 29", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata NB", "Mitsubishi 4G63 Cam 34", "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", "Mitsu 4G63 Crank", "trg77", "trg78", "trg79" +#define trigger_type_e_enum "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "trg4", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Mercedes Two Segment", "trg11", "EZ30", "INVALID", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "Benelli Tre", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM 24x 5 degree", "Honda CBR 600", "Mitsubishi 4G92/93/94 Cam 29", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata NB", "Mitsubishi 4G63 Cam 34", "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", "Mitsu 4G63 Crank", "trg77", "trg78", "trg79" 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