rusefi
/
rusefi
mirror of https://github.com/rusefi/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

better names for 3/5 GM 24xs

This commit is contained in:
rusefillc 2024-03-22 12:29:31 -04:00 committed by rusefillc
parent 9c72e22f23
commit 5a06e47fd3
5 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/controllers/algo/engine_types.h
View File

@ -331,7 +331,7 @@ enum class trigger_type_e : uint32_t {
TT_2JZ_3_34_SIMULATION_ONLY = 25, TT_2JZ_3_34_SIMULATION_ONLY = 25,
TT_ROVER_K = 26, TT_ROVER_K = 26,
// GM 24x with 5/10 degree gaps // GM 24x with 5/10 degree gaps
TT_GM_24x = 27, TT_GM_24x_5 = 27,
TT_HONDA_CBR_600 = 28, TT_HONDA_CBR_600 = 28,
TT_MITSU_4G9x_CAM = 29, TT_MITSU_4G9x_CAM = 29,
TT_CHRYSLER_NGC_36_2_2 = 30, TT_CHRYSLER_NGC_36_2_2 = 30,
@ -400,7 +400,7 @@ enum class trigger_type_e : uint32_t {
TT_3_TOOTH_CRANK = 72, TT_3_TOOTH_CRANK = 72,
TT_VVT_TOYOTA_4_1 = 73, TT_VVT_TOYOTA_4_1 = 73,
// GM 24x with 3/12 degree gaps // GM 24x with 3/12 degree gaps
TT_GM_24x_2 = 74, TT_GM_24x_3 = 74,
// Renault F3R // Renault F3R
TT_60_2_2_F3R = 75, TT_60_2_2_F3R = 75,
TT_MITSU_4G63_CRANK = 76, TT_MITSU_4G63_CRANK = 76,

6
firmware/controllers/trigger/decoders/trigger_gm.cpp
View File

@ -91,7 +91,7 @@ static int gm_tooth_pair(float startAngle, bool isShortLong, TriggerWaveform* s,
} }
/** /**
* TT_GM_24x and TT_GM_24x_2 * TT_GM_24x_5 and TT_GM_24x_3
* https://www.mediafire.com/?40mfgeoe4ctti * https://www.mediafire.com/?40mfgeoe4ctti
* http://www.ls1gto.com/forums/archive/index.php/t-190549.htm * http://www.ls1gto.com/forums/archive/index.php/t-190549.htm
* http://www.ls2.com/forums/showthread.php/834483-LS-Timing-Reluctor-Wheels-Explained * http://www.ls2.com/forums/showthread.php/834483-LS-Timing-Reluctor-Wheels-Explained
@ -143,7 +143,7 @@ static void initGmLS24(TriggerWaveform *s, float shortToothWidth) {
} }
} }
// TT_GM_24x // TT_GM_24x_5
void initGmLS24_5deg(TriggerWaveform *s) { void initGmLS24_5deg(TriggerWaveform *s) {
initGmLS24(s, 5); initGmLS24(s, 5);
@ -155,7 +155,7 @@ void initGmLS24_5deg(TriggerWaveform *s) {
s->tdcPosition = 50; s->tdcPosition = 50;
} }
// TT_GM_24x_2 // TT_GM_24x_3
void initGmLS24_3deg(TriggerWaveform *s) { void initGmLS24_3deg(TriggerWaveform *s) {
initGmLS24(s, 3); initGmLS24(s, 3);

4
firmware/controllers/trigger/decoders/trigger_structure.cpp
View File

@ -744,11 +744,11 @@ void TriggerWaveform::initializeTriggerWaveform(operation_mode_e triggerOperatio
configureTriTach(this); configureTriTach(this);
break; break;
case trigger_type_e::TT_GM_24x: case trigger_type_e::TT_GM_24x_5:
initGmLS24_5deg(this); initGmLS24_5deg(this);
break; break;
case trigger_type_e::TT_GM_24x_2: case trigger_type_e::TT_GM_24x_3:
initGmLS24_3deg(this); initGmLS24_3deg(this);
break; break;

8
java_console/trigger-ui/src/main/java/com/rusefi/trigger/TriggerImage.java
View File

@ -58,10 +58,10 @@ public class TriggerImage {
return "Honda K 1/12"; return "Honda K 1/12";
case TT_SUBARU_7_6: case TT_SUBARU_7_6:
return "Subaru 7/6"; return "Subaru 7/6";
case TT_GM_24x: case TT_GM_24x_3:
return "GM 24x"; return "GM 24x 3";
case TT_GM_24x_2: case TT_GM_24x_5:
return "GM 24x 2"; return "GM 24x 5";
case TT_DODGE_NEON_1995: case TT_DODGE_NEON_1995:
return "Dodge Neon 1995"; return "Dodge Neon 1995";
case TT_DODGE_NEON_1995_ONLY_CRANK: case TT_DODGE_NEON_1995_ONLY_CRANK:

4
unit_tests/tests/trigger/test_real_gm_24x.cpp
View File

@ -2,7 +2,7 @@
#include "logicdata_csv_reader.h" #include "logicdata_csv_reader.h"
TEST(crankingGm24x, gmRealCrankingFromFile) { TEST(crankingGm24x_5, gmRealCrankingFromFile) {
CsvReader reader(1, /* vvtCount */ 0); CsvReader reader(1, /* vvtCount */ 0);
reader.open("tests/trigger/resources/gm_24x_cranking.csv"); reader.open("tests/trigger/resources/gm_24x_cranking.csv");
@ -10,7 +10,7 @@ TEST(crankingGm24x, gmRealCrankingFromFile) {
engineConfiguration->isFasterEngineSpinUpEnabled = true; engineConfiguration->isFasterEngineSpinUpEnabled = true;
engineConfiguration->alwaysInstantRpm = true; engineConfiguration->alwaysInstantRpm = true;
eth.setTriggerType(trigger_type_e::TT_GM_24x); eth.setTriggerType(trigger_type_e::TT_GM_24x_5);
int eventCount = 0; int eventCount = 0;
bool gotRpm = false; bool gotRpm = false;