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

GM/Daewoo 60/2/2/2 Trigger Pattern #2264

This commit is contained in:
rusefillc 2021-02-02 11:06:32 -05:00
parent bd0f9687ac
commit 29db28f077
4 changed files with 40 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,14 @@
#include "trigger_gm.h"
static float addTooth(float offset, TriggerWaveform *s) {
s->addEventAngle(offset, T_SECONDARY, TV_RISE);
offset += CRANK_MODE_MULTIPLIER * 3;
s->addEventAngle(offset, T_SECONDARY, TV_FALL);
offset += CRANK_MODE_MULTIPLIER * 3;
return offset;
}
/**
* https://github.com/rusefi/rusefi/issues/2264
* GM/Daewoo Distributor on the F8CV
@ -15,10 +23,36 @@ void configureGm60_2_2_2(TriggerWaveform *s) {
s->initialize(FOUR_STROKE_CAM_SENSOR);
s->isSynchronizationNeeded = false;
int offset = 3;
float m = CRANK_MODE_MULTIPLIER;
int offset = 1 * m;
for (int i=0;i<12;i++) {
offset = addTooth(offset, s);
}
offset += m * 2 * 6;
for (int i=0;i<18;i++) {
offset = addTooth(offset, s);
}
offset += m * 2 * 6;
for (int i=0;i<18;i++) {
offset = addTooth(offset, s);
}
offset += m * 2 * 6;
for (int i=0;i<5;i++) {
offset = addTooth(offset, s);
}
s->addEventAngle(m * (360 - 6), T_PRIMARY, TV_RISE);
offset = addTooth(offset, s);
s->addEventAngle(m * (360 - 10), T_PRIMARY, TV_RISE);
s->addEventAngle(m * (360), T_PRIMARY, TV_FALL);
}

2
java_console/ui/src/main/java/com/rusefi/StartupFrame.java
View File

@ -39,7 +39,7 @@ import static javax.swing.JOptionPane.YES_NO_OPTION;
*/
public class StartupFrame {
private static final String LOGO = "/com/rusefi/logo.gif";
public static final String LINK_TEXT = "rusEFI (c) 2012-2020";
public static final String LINK_TEXT = "rusEFI (c) 2012-2021";
private static final String URI = "http://rusefi.com/?java_console";
// private static final int RUSEFI_ORANGE = 0xff7d03;

2
java_console/ui/src/main/java/com/rusefi/TriggerImage.java
View File

@ -91,6 +91,8 @@ public class TriggerImage {
return "TriTach";
case Fields.TT_TT_TOOTHED_WHEEL_60_2:
return "60/2";
case Fields.TT_TT_GM_60_2_2_2:
return "GM 60/2/2/2";
}
return triggerName.triggerName;
}

1
java_console/ui/src/main/java/com/rusefi/TriggerWheelInfo.java
View File

@ -110,6 +110,7 @@ class TriggerWheelInfo {
private boolean isSecondCamBased() {
return id == Fields.TT_TT_MAZDA_MIATA_NA ||
id == Fields.TT_TT_MAZDA_DOHC_1_4 ||
id == Fields.TT_TT_GM_60_2_2_2 ||
id == Fields.TT_TT_FORD_ASPIRE;
}
}