rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix 4g63 vs 9x naming, add cam-only test (#5093)

This commit is contained in:
Matthew Kennedy 2023-02-16 20:22:34 -08:00 committed by GitHub
parent 2dcfe57516
commit 4b5fa68d13
13 changed files with 334 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/controllers/algo/engine.cpp
View File

@ -96,8 +96,10 @@ trigger_type_e getVvtTriggerType(vvt_mode_e vvtMode) {
case VVT_MITSUBISHI_6G75:
case VVT_NISSAN_MR:
return TT_NISSAN_MR18_CAM_VVT;
case VVT_MITSUBISHI_4G9x:
return TT_MITSU_4G9x_CAM;
case VVT_MITSUBISHI_4G63:
return TT_MITSU_ONLY_TOP_BOTH_FRONTS;
return TT_MITSU_4G63_CAM;
default:
firmwareError(OBD_PCM_Processor_Fault, "getVvtTriggerType for %s", getVvt_mode_e(vvtMode));
return TT_ONE; // we have to return something for the sake of -Werror=return-type

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

@ -511,8 +511,8 @@ typedef enum {
TT_SUBARU_EZ30 = 12,
TT_VVT_MAZDA_SKYACTIV = 13,
TT_MITSU_ONLY_TOP_BOTH_FRONTS = 29,
TT_MITSU_BOTH_BOTH = 34,
TT_MITSU_4G9x_CAM = 29,
TT_MITSU_4G63_CAM = 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
// do not forget to invoke "gen_config.bat" once you make changes to integration/rusefi_config.txt

3
firmware/controllers/algo/rusefi_enums.h
View File

@ -107,7 +107,8 @@ typedef enum __attribute__ ((__packed__)) {
*/
VVT_HONDA_K_EXHAUST = 16,
VVT_MITSUBISHI_4G63 = 17,
VVT_MITSUBISHI_4G9x = 17,
VVT_MITSUBISHI_4G63 = 18,
} vvt_mode_e;

33
firmware/controllers/trigger/decoders/trigger_mitsubishi.cpp
View File

@ -74,24 +74,31 @@ void initializeMitsubishi4g18(TriggerWaveform *s) {
addMitsu93(s, true);
}
void initializeMitsubishi4g93_both_both(TriggerWaveform *s) {
void initializeMitsubishi4g9xCam(TriggerWaveform *s) {
s->initialize(FOUR_STROKE_CAM_SENSOR, SyncEdge::Both);
s->setTriggerSynchronizationGap(3.2);
// nominal gap 0.5
s->setSecondTriggerSynchronizationGap2(0.2, 0.8);
addMitsu93(s, true);
// nominal gap 3.0
s->setTriggerSynchronizationGap2(2.0f, 5.0f);
// 131 deg before #1 TDC
s->addEvent720(270, TriggerValue::RISE, TriggerWheel::T_PRIMARY);
// 49 deg after #1 TDC
s->addEvent720(450, TriggerValue::FALL, TriggerWheel::T_PRIMARY);
// 131 deg before #4 TDC
s->addEvent720(630, TriggerValue::RISE, TriggerWheel::T_PRIMARY);
// 41 deg before #4 TDC
s->addEvent720(720, TriggerValue::FALL, TriggerWheel::T_PRIMARY);
}
void initializeMitsubishi4g93_only_first_wheel_both_fronts(TriggerWaveform *s) {
s->initialize(FOUR_STROKE_CAM_SENSOR, SyncEdge::Both);
s->setSecondTriggerSynchronizationGap2(0.5, 2.3);
s->setTriggerSynchronizationGap2(0.1, 0.5);
s->addEvent720(180, TriggerValue::RISE, TriggerWheel::T_PRIMARY);
s->addEvent720(266, TriggerValue::FALL, TriggerWheel::T_PRIMARY);
s->addEvent720(641, TriggerValue::RISE, TriggerWheel::T_PRIMARY);
s->addEvent720(720, TriggerValue::FALL, TriggerWheel::T_PRIMARY);
void initializeMitsubishi4g63Cam(TriggerWaveform *s) {
// TODO: is this actually the same as 4G9x or not?
initializeMitsubishi4g9xCam(s);
}
void initialize36_2_1_1(TriggerWaveform *s) {

6
firmware/controllers/trigger/decoders/trigger_mitsubishi.h
View File

@ -10,8 +10,10 @@
class TriggerWaveform;
void initializeMitsubishi4g18(TriggerWaveform *s);
void initializeMitsubishi4g93_both_both(TriggerWaveform *s);
void initializeMitsubishi4g93_only_first_wheel_both_fronts(TriggerWaveform *s);
void initializeMitsubishi4g63Cam(TriggerWaveform *s);
// 4G92/93/94
void initializeMitsubishi4g9xCam(TriggerWaveform *s);
void configureFordAspireTriggerWaveform(TriggerWaveform * s);
void initialize36_2_1_1(TriggerWaveform *s);

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

@ -630,11 +630,11 @@ void TriggerWaveform::initializeTriggerWaveform(operation_mode_e triggerOperatio
configureBenelli(this);
break;
case TT_MITSU_BOTH_BOTH:
initializeMitsubishi4g93_both_both(this);
case TT_MITSU_4G63_CAM:
initializeMitsubishi4g63Cam(this);
break;
case TT_MITSU_ONLY_TOP_BOTH_FRONTS:
initializeMitsubishi4g93_only_first_wheel_both_fronts(this);
case TT_MITSU_4G9x_CAM:
initializeMitsubishi4g9xCam(this);
break;
case TT_1_16:
configureOnePlus16(this);

1
firmware/controllers/trigger/trigger_central.cpp
View File

@ -171,6 +171,7 @@ static angle_t adjustCrankPhase(int camIndex) {
case VVT_FIRST_HALF:
case VVT_MAP_V_TWIN:
case VVT_MITSUBISHI_4G63:
case VVT_MITSUBISHI_4G9x:
return tc->syncAndReport(getCrankDivider(operationMode), 1);
case VVT_SECOND_HALF:
case VVT_NISSAN_VQ:

4
firmware/integration/rusefi_config.txt
View File

@ -310,7 +310,7 @@ custom debug_mode_e 1 bits, U08, @OFFSET@, [0:5], @@debug_mode_e_enum@@
#define VM_VVT_INACTIVE 0
#define vvt_mode_e_enum "Inactive", "Single Tooth Second Half", "2JZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K Intake", "Nissan MR18", "Mitsu 3A92", "VTwin by MAP", "Mitsu 6G75", "Mazda Skyactiv", "Honda K Exhaust", "Mitsu 4G63"
#define vvt_mode_e_enum "Inactive", "Single Tooth Second Half", "2JZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K Intake", "Nissan MR18", "Mitsu 3A92", "VTwin by MAP", "Mitsu 6G75", "Mazda Skyactiv", "Honda K Exhaust", "Mitsubishi 4G92/93/94", "Mitsubishi 4G63"
custom vvt_mode_e 1 bits, U08, @OFFSET@, [0:5], @@vvt_mode_e_enum@@
! At the moment TIM1, TIM2, TIM3 and TIM9 are configured as ICU
@ -586,7 +586,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", "Benelli Tre", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM 24x 5 degree", "Honda CBR 600", "4g93 only cam", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata NB", "4g93 both fronts", "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", "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", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata NB", "Mitsubishi 4G63 Cam", "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

2
unit_tests/tests/tests.mk
View File

@ -14,7 +14,7 @@ TESTS_SRC_CPP = \
tests/trigger/test_real_cranking_nissan_vq40.cpp \
tests/trigger/test_trigger_skipped_wheel.cpp \
tests/trigger/test_real_4b11.cpp \
tests/trigger/test_real_4g63.cpp \
tests/trigger/test_real_4g93.cpp \
tests/trigger/test_real_volkswagen.cpp \
tests/trigger/test_real_nb2_cranking.cpp \
tests/trigger/test_real_gm_24x.cpp \

194
unit_tests/tests/trigger/resources/4g93-cranking-cam-only.csv Normal file
View File

@ -0,0 +1,194 @@
Time[s], cam
0.000000000000000, 0
1.494753000000000, 0
1.506921750000000, 0
1.612318250000000, 0
1.681612750000000, 1
1.732877500000000, 1
1.806291750000000, 1
1.861951000000000, 0
1.902313000000000, 0
1.970729250000000, 0
2.022872250000000, 1
2.059014000000000, 1
2.085412750000000, 0
2.119538000000000, 0
2.206066250000000, 0
2.266987500000000, 0
2.316638500000000, 1
2.352118750000000, 1
2.412216500000000, 1
2.460772750000000, 0
2.497370750000000, 0
2.559245750000000, 0
2.607990000000000, 1
2.642810000000000, 1
2.667487000000000, 0
2.700186500000000, 0
2.785114250000000, 0
2.844329000000000, 0
2.893034750000000, 1
2.927807250000000, 1
2.986567000000000, 1
3.034370750000000, 0
3.070484750000000, 0
3.131379250000000, 0
3.179887750000000, 1
3.214613250000000, 1
3.239370500000000, 0
3.271715250000000, 0
3.356859250000000, 0
3.415756750000000, 0
3.464241500000000, 1
3.498965250000000, 1
3.557156500000000, 1
3.604547500000000, 0
3.640645750000000, 0
3.701006250000000, 0
3.749165500000000, 1
3.783702750000000, 1
3.808099750000000, 0
3.840262750000000, 0
3.925541500000000, 0
3.984426500000000, 0
4.032156250000000, 1
4.066623000000000, 1
4.124483000000000, 1
4.171811000000000, 0
4.207782750000000, 0
4.267835499999999, 0
4.315820000000000, 1
4.350302000000000, 1
4.374738250000000, 0
4.406492249999999, 0
4.490840500000000, 0
4.549222750000000, 0
4.597310500000000, 1
4.631872500000000, 1
4.689966500000000, 1
4.737363750000000, 0
4.773538250000000, 0
4.834032500000000, 0
4.881681749999999, 1
4.915958000000000, 1
4.940247250000000, 0
4.972271000000000, 0
5.056390749999999, 0
5.114432250000000, 0
5.163234750000000, 1
5.198098000000000, 1
5.255806250000000, 1
5.303640000000000, 0
5.339906750000000, 0
5.399754499999999, 0
5.447633000000000, 1
5.482216250000000, 1
5.506672500000000, 0
5.538245750000000, 0
5.622610750000000, 0
5.680819250000000, 0
5.727998250000000, 1
5.761973250000000, 1
5.818899500000000, 1
5.865582499999999, 0
5.901025250000000, 0
5.960164750000000, 0
6.007168249999999, 1
6.041088999999999, 1
6.065072499999999, 0
6.096412000000000, 0
6.180311250000000, 0
6.237890500000000, 0
6.285459500000000, 1
6.319601250000000, 1
6.376443750000000, 1
6.422967250000000, 0
6.458396000000000, 0
6.517242749999999, 0
6.563905750000000, 1
6.597798999999999, 1
6.621518500000000, 0
6.652881499999999, 0
6.736140750000000, 0
6.793416250000000, 0
6.840612999999999, 1
6.874703250000000, 1
6.931303750000000, 1
6.977859250000000, 0
7.013473500000000, 0
7.072443750000000, 0
7.118917499999999, 1
7.152824250000000, 1
7.176675250000000, 0
7.207953250000000, 0
7.291758499999999, 0
7.349159750000000, 0
7.396515249999999, 1
7.430614250000000, 1
7.487187250000000, 1
7.533847000000000, 0
7.569177499999999, 0
7.627891999999999, 0
7.674611250000000, 1
7.708475999999999, 1
7.732335999999999, 0
7.763510500000000, 0
7.845901749999999, 0
7.902759250000000, 0
7.949735500000000, 1
7.983770000000000, 1
8.040103000000000, 1
8.086273000000000, 0
8.121497750000000, 0
8.179841000000000, 0
8.226068999999999, 1
8.259755999999999, 1
8.283215750000000, 0
8.314324250000000, 0
8.396975500000000, 0
8.453863750000000, 0
8.501026000000000, 1
8.534975500000000, 1
8.591211249999999, 1
8.637514749999999, 0
8.672692500000000, 0
8.731024750000000, 0
8.777467000000000, 1
8.811156499999999, 1
8.834794250000000, 0
8.865860500000000, 0
8.948499750000000, 0
9.005370500000000, 0
9.052408500000000, 1
9.086271750000000, 1
9.142514250000000, 1
9.188700250000000, 0
9.223915750000000, 0
9.282259500000000, 0
9.328291000000000, 1
9.361782500000000, 1
9.385013749999999, 0
9.416155000000000, 0
9.498853499999999, 0
9.555615749999999, 0
9.602765750000000, 1
9.636807250000000, 1
9.693013499999999, 1
9.739416250000000, 0
9.774776500000000, 0
9.833094250000000, 0
9.879419499999999, 1
9.913084500000000, 1
9.936648750000000, 0
9.967679250000000, 0
10.049862250000000, 0
10.106634500000000, 0
10.153670499999999, 1
10.187534749999999, 1
10.243663000000000, 1
10.289702499999999, 0
10.324709250000000, 0
10.382712500000000, 0
10.428939999999999, 1
10.462404249999999, 1
10.485657750000000, 0
1 Time[s] cam
2 0.000000000000000 0
3 1.494753000000000 0
4 1.506921750000000 0
5 1.612318250000000 0
6 1.681612750000000 1
7 1.732877500000000 1
8 1.806291750000000 1
9 1.861951000000000 0
10 1.902313000000000 0
11 1.970729250000000 0
12 2.022872250000000 1
13 2.059014000000000 1
14 2.085412750000000 0
15 2.119538000000000 0
16 2.206066250000000 0
17 2.266987500000000 0
18 2.316638500000000 1
19 2.352118750000000 1
20 2.412216500000000 1
21 2.460772750000000 0
22 2.497370750000000 0
23 2.559245750000000 0
24 2.607990000000000 1
25 2.642810000000000 1
26 2.667487000000000 0
27 2.700186500000000 0
28 2.785114250000000 0
29 2.844329000000000 0
30 2.893034750000000 1
31 2.927807250000000 1
32 2.986567000000000 1
33 3.034370750000000 0
34 3.070484750000000 0
35 3.131379250000000 0
36 3.179887750000000 1
37 3.214613250000000 1
38 3.239370500000000 0
39 3.271715250000000 0
40 3.356859250000000 0
41 3.415756750000000 0
42 3.464241500000000 1
43 3.498965250000000 1
44 3.557156500000000 1
45 3.604547500000000 0
46 3.640645750000000 0
47 3.701006250000000 0
48 3.749165500000000 1
49 3.783702750000000 1
50 3.808099750000000 0
51 3.840262750000000 0
52 3.925541500000000 0
53 3.984426500000000 0
54 4.032156250000000 1
55 4.066623000000000 1
56 4.124483000000000 1
57 4.171811000000000 0
58 4.207782750000000 0
59 4.267835499999999 0
60 4.315820000000000 1
61 4.350302000000000 1
62 4.374738250000000 0
63 4.406492249999999 0
64 4.490840500000000 0
65 4.549222750000000 0
66 4.597310500000000 1
67 4.631872500000000 1
68 4.689966500000000 1
69 4.737363750000000 0
70 4.773538250000000 0
71 4.834032500000000 0
72 4.881681749999999 1
73 4.915958000000000 1
74 4.940247250000000 0
75 4.972271000000000 0
76 5.056390749999999 0
77 5.114432250000000 0
78 5.163234750000000 1
79 5.198098000000000 1
80 5.255806250000000 1
81 5.303640000000000 0
82 5.339906750000000 0
83 5.399754499999999 0
84 5.447633000000000 1
85 5.482216250000000 1
86 5.506672500000000 0
87 5.538245750000000 0
88 5.622610750000000 0
89 5.680819250000000 0
90 5.727998250000000 1
91 5.761973250000000 1
92 5.818899500000000 1
93 5.865582499999999 0
94 5.901025250000000 0
95 5.960164750000000 0
96 6.007168249999999 1
97 6.041088999999999 1
98 6.065072499999999 0
99 6.096412000000000 0
100 6.180311250000000 0
101 6.237890500000000 0
102 6.285459500000000 1
103 6.319601250000000 1
104 6.376443750000000 1
105 6.422967250000000 0
106 6.458396000000000 0
107 6.517242749999999 0
108 6.563905750000000 1
109 6.597798999999999 1
110 6.621518500000000 0
111 6.652881499999999 0
112 6.736140750000000 0
113 6.793416250000000 0
114 6.840612999999999 1
115 6.874703250000000 1
116 6.931303750000000 1
117 6.977859250000000 0
118 7.013473500000000 0
119 7.072443750000000 0
120 7.118917499999999 1
121 7.152824250000000 1
122 7.176675250000000 0
123 7.207953250000000 0
124 7.291758499999999 0
125 7.349159750000000 0
126 7.396515249999999 1
127 7.430614250000000 1
128 7.487187250000000 1
129 7.533847000000000 0
130 7.569177499999999 0
131 7.627891999999999 0
132 7.674611250000000 1
133 7.708475999999999 1
134 7.732335999999999 0
135 7.763510500000000 0
136 7.845901749999999 0
137 7.902759250000000 0
138 7.949735500000000 1
139 7.983770000000000 1
140 8.040103000000000 1
141 8.086273000000000 0
142 8.121497750000000 0
143 8.179841000000000 0
144 8.226068999999999 1
145 8.259755999999999 1
146 8.283215750000000 0
147 8.314324250000000 0
148 8.396975500000000 0
149 8.453863750000000 0
150 8.501026000000000 1
151 8.534975500000000 1
152 8.591211249999999 1
153 8.637514749999999 0
154 8.672692500000000 0
155 8.731024750000000 0
156 8.777467000000000 1
157 8.811156499999999 1
158 8.834794250000000 0
159 8.865860500000000 0
160 8.948499750000000 0
161 9.005370500000000 0
162 9.052408500000000 1
163 9.086271750000000 1
164 9.142514250000000 1
165 9.188700250000000 0
166 9.223915750000000 0
167 9.282259500000000 0
168 9.328291000000000 1
169 9.361782500000000 1
170 9.385013749999999 0
171 9.416155000000000 0
172 9.498853499999999 0
173 9.555615749999999 0
174 9.602765750000000 1
175 9.636807250000000 1
176 9.693013499999999 1
177 9.739416250000000 0
178 9.774776500000000 0
179 9.833094250000000 0
180 9.879419499999999 1
181 9.913084500000000 1
182 9.936648750000000 0
183 9.967679250000000 0
184 10.049862250000000 0
185 10.106634500000000 0
186 10.153670499999999 1
187 10.187534749999999 1
188 10.243663000000000 1
189 10.289702499999999 0
190 10.324709250000000 0
191 10.382712500000000 0
192 10.428939999999999 1
193 10.462404249999999 1
194 10.485657750000000 0

5
unit_tests/tests/trigger/resources/4g63-cranking.csv → unit_tests/tests/trigger/resources/4g93-cranking.csv
View File

@ -192,8 +192,3 @@ Time[s], crank, cam
10.428939999999999, 0, 1
10.462404249999999, 1, 1
10.485657750000000, 1, 0
10.573481749999999, 1, 1
10.601926499999999, 0, 1
12.630424750000000, 1, 1
12.630433499999999, 0, 1
12.630445499999999, 1, 1
1 Time[s] crank cam
192 10.428939999999999 0 1
193 10.462404249999999 1 1
194 10.485657750000000 1 0
10.573481749999999 1 1
10.601926499999999 0 1
12.630424750000000 1 1
12.630433499999999 0 1
12.630445499999999 1 1

55
unit_tests/tests/trigger/test_real_4g63.cpp
View File

@ -1,55 +0,0 @@
// Mitsubishi 4G63 trigger pattern
// Crank: 2 teeth per rev (4 teeth per cycle)
// Cam: 4G63 pattern (big tooth - small tooth)
#include "pch.h"
#include "logicdata_csv_reader.h"
TEST(real4g63, cranking) {
CsvReader reader(1, /* vvtCount */ 1);
reader.open("tests/trigger/resources/4g63-cranking.csv");
EngineTestHelper eth(TEST_ENGINE);
engineConfiguration->isFasterEngineSpinUpEnabled = true;
engineConfiguration->alwaysInstantRpm = true;
engineConfiguration->isPhaseSyncRequiredForIgnition = true;
engineConfiguration->vvtMode[0] = VVT_MITSUBISHI_4G63;
engineConfiguration->trigger.customTotalToothCount = 2;
engineConfiguration->trigger.customSkippedToothCount = 0;
engineConfiguration->skippedWheelOnCam = false;
eth.setTriggerType(TT_TOOTHED_WHEEL);
int eventCount = 0;
bool gotRpm = false;
bool gotSync = false;
while (reader.haveMore()) {
reader.processLine(&eth);
eventCount++;
engine->rpmCalculator.onSlowCallback();
// Expect that all teeth are in the correct spot
auto rpm = Sensor::getOrZero(SensorType::Rpm);
if (!gotRpm && rpm) {
gotRpm = true;
// We should get first RPM on exactly the first sync point - this means the instant RPM pre-sync event copy all worked OK
EXPECT_EQ(eventCount, 6);
EXPECT_NEAR(rpm, 132.77f, 0.1);
}
if (!gotSync && engine->triggerCentral.triggerState.hasSynchronizedPhase()) {
gotSync = true;
EXPECT_EQ(eventCount, 13);
EXPECT_NEAR(rpm, 191.45f, 0.1);
}
}
ASSERT_EQ(0, eth.recentWarnings()->getCount());
}

101
unit_tests/tests/trigger/test_real_4g93.cpp Normal file
View File

@ -0,0 +1,101 @@
// Mitsubishi 4G93 trigger pattern
// Crank: 2 teeth per rev (4 teeth per cycle)
// Cam: 4G92/93/94 pattern (big tooth - small tooth)
#include "pch.h"
#include "logicdata_csv_reader.h"
TEST(real4g93, cranking) {
CsvReader reader(1, /* vvtCount */ 1);
reader.open("tests/trigger/resources/4g93-cranking.csv");
EngineTestHelper eth(TEST_ENGINE);
engineConfiguration->isFasterEngineSpinUpEnabled = true;
engineConfiguration->alwaysInstantRpm = true;
engineConfiguration->isPhaseSyncRequiredForIgnition = true;
engineConfiguration->vvtMode[0] = VVT_MITSUBISHI_4G63;
engineConfiguration->trigger.customTotalToothCount = 2;
engineConfiguration->trigger.customSkippedToothCount = 0;
engineConfiguration->skippedWheelOnCam = false;
eth.setTriggerType(TT_TOOTHED_WHEEL);
int eventCount = 0;
bool gotRpm = false;
bool gotSync = false;
while (reader.haveMore()) {
reader.processLine(&eth);
eventCount++;
engine->rpmCalculator.onSlowCallback();
// Expect that all teeth are in the correct spot
auto rpm = Sensor::getOrZero(SensorType::Rpm);
if (!gotRpm && rpm) {
gotRpm = true;
// We should get first RPM on exactly the first sync point - this means the instant RPM pre-sync event copy all worked OK
EXPECT_EQ(eventCount, 6);
EXPECT_NEAR(rpm, 132.77f, 0.1);
}
if (!gotSync && engine->triggerCentral.triggerState.hasSynchronizedPhase()) {
gotSync = true;
EXPECT_EQ(eventCount, 17);
EXPECT_NEAR(rpm, 204.01f, 0.1);
}
}
ASSERT_TRUE(gotRpm);
ASSERT_TRUE(gotSync);
ASSERT_EQ(0, eth.recentWarnings()->getCount());
}
TEST(real4g93, crankingCamOnly) {
CsvReader reader(1, /* vvtCount */ 0);
reader.open("tests/trigger/resources/4g93-cranking-cam-only.csv");
EngineTestHelper eth(TEST_ENGINE);
engineConfiguration->isFasterEngineSpinUpEnabled = true;
engineConfiguration->alwaysInstantRpm = true;
eth.setTriggerType(TT_MITSU_4G9x_CAM);
int eventCount = 0;
bool gotRpm = false;
bool gotSync = false;
while (reader.haveMore()) {
reader.processLine(&eth);
eventCount++;
engine->rpmCalculator.onSlowCallback();
// Expect that all teeth are in the correct spot
auto rpm = Sensor::getOrZero(SensorType::Rpm);
if (!gotRpm && rpm) {
gotRpm = true;
// We should get first RPM on exactly the first sync point - this means the instant RPM pre-sync event copy all worked OK
EXPECT_EQ(eventCount, 17);
EXPECT_NEAR(rpm, 194.61f, 0.1);
}
if (!gotSync && engine->triggerCentral.triggerState.getShaftSynchronized() && engine->triggerCentral.triggerState.hasSynchronizedPhase()) {
gotSync = true;
EXPECT_EQ(eventCount, 17);
}
}
ASSERT_TRUE(gotRpm);
ASSERT_TRUE(gotSync);
ASSERT_EQ(0, eth.recentWarnings()->getCount());
}