mirror of https://github.com/rusefi/rusefi.git
parent
52ada3072f
commit
76ebc1d1fe
|
@ -26,6 +26,10 @@ Release template (copy/paste this for new release):
|
||||||
|
|
||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
### Breaking Changes
|
||||||
|
- "60/2 VW" trigger wheel renamed to "60-2 Wrong Polarity" #988
|
||||||
|
|
||||||
|
|
||||||
## Unreleased
|
## Unreleased
|
||||||
|
|
||||||
## April 2024 "Day 785"
|
## April 2024 "Day 785"
|
||||||
|
|
|
@ -102,8 +102,7 @@ void m73engine() {
|
||||||
|
|
||||||
engineConfiguration->globalTriggerAngleOffset = 90;
|
engineConfiguration->globalTriggerAngleOffset = 90;
|
||||||
setCrankOperationMode();
|
setCrankOperationMode();
|
||||||
// todo: that's not right, should be 60/2 without VW
|
engineConfiguration->trigger.type = trigger_type_e::TT_TOOTHED_WHEEL_60_2;
|
||||||
engineConfiguration->trigger.type = trigger_type_e::TT_60_2_VW;
|
|
||||||
|
|
||||||
// this large engine seems to crank at around only 150 RPM? And happily idle at 400RPM?
|
// this large engine seems to crank at around only 150 RPM? And happily idle at 400RPM?
|
||||||
engineConfiguration->cranking.rpm = 350;
|
engineConfiguration->cranking.rpm = 350;
|
||||||
|
|
|
@ -98,9 +98,7 @@ void setEngineBMW_M73_microRusEfi() {
|
||||||
|
|
||||||
engineConfiguration->enableVerboseCanTx = true;
|
engineConfiguration->enableVerboseCanTx = true;
|
||||||
|
|
||||||
|
engineConfiguration->trigger.type = trigger_type_e::TT_TOOTHED_WHEEL_60_2;
|
||||||
// do I have VR wires flipped?
|
|
||||||
engineConfiguration->trigger.type = trigger_type_e::TT_60_2_VW;
|
|
||||||
|
|
||||||
//set tps_min 891
|
//set tps_min 891
|
||||||
engineConfiguration->tpsMin = 891;
|
engineConfiguration->tpsMin = 891;
|
||||||
|
|
|
@ -319,8 +319,8 @@ enum class trigger_type_e : uint32_t {
|
||||||
TT_HALF_MOON = 18,
|
TT_HALF_MOON = 18,
|
||||||
|
|
||||||
TT_DODGE_RAM = 19,
|
TT_DODGE_RAM = 19,
|
||||||
// * It looks like this is the VR shape if you have your wires flipped
|
// keeping for compatibility with M73 PnP harnesses which until 2023 were build with VR wires flipped
|
||||||
TT_60_2_VW = 20,
|
TT_60_2_WRONG_POLARITY = 20,
|
||||||
TT_BENELLI_TRE = 21,
|
TT_BENELLI_TRE = 21,
|
||||||
TT_DODGE_STRATUS = 22,
|
TT_DODGE_STRATUS = 22,
|
||||||
// Subaru but also Mazda RX-8, we suspect that it's VR
|
// Subaru but also Mazda RX-8, we suspect that it's VR
|
||||||
|
|
|
@ -616,7 +616,7 @@ void TriggerWaveform::initializeTriggerWaveform(operation_mode_e triggerOperatio
|
||||||
setTriggerSynchronizationGap3(/*gapIndex*/1, /*from*/0.7, 1.3); // second gap is not required to synch on perfect signal but is needed to handle to reject cranking transition noise
|
setTriggerSynchronizationGap3(/*gapIndex*/1, /*from*/0.7, 1.3); // second gap is not required to synch on perfect signal but is needed to handle to reject cranking transition noise
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case trigger_type_e::TT_60_2_VW:
|
case trigger_type_e::TT_60_2_WRONG_POLARITY:
|
||||||
setVwConfiguration(this);
|
setVwConfiguration(this);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
|
@ -605,7 +605,7 @@ adc_channel_e fuelLevelSensor;This is the processor pin that your fuel level sen
|
||||||
struct trigger_config_s
|
struct trigger_config_s
|
||||||
|
|
||||||
! 'INVALID' for TT_VVT_* wheels
|
! 'INVALID' for TT_VVT_* wheels
|
||||||
#define trigger_type_e_enum "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "INVALID", "GM_7X", "Daihatsu 3 cylinder", "Mazda SOHC 4", "60-2", "36-1", "Mercedes Two Segment", "Single Tooth", "EZ30", "INVALID", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Half Moon", "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 Cam", "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", "12crank/24cam", "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", "INVALID", "GM 60-2-2-2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "Nissan VQ35", "INVALID", "Nissan VQ30", "Nissan QR25", "INVALID", "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", "3-0", "INVALID", "GM 24x 3 degree", "60-2-2 F3R", "Mitsu 4G63 Crank", "x2 30 Deg camshaft BTDC", "INVALID", "Mitsu 6G72 Cam", "6-0", "Daihatsu 4 cylinder", "trg82", "trg83"
|
#define trigger_type_e_enum "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "INVALID", "GM_7X", "Daihatsu 3 cylinder", "Mazda SOHC 4", "60-2", "36-1", "Mercedes Two Segment", "Single Tooth", "EZ30", "INVALID", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Half Moon", "Dodge Ram 1+16", "60-2 Wrong Polarity", "Benelli Tre", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM 24x 5 degree", "Honda CBR 600 Cam", "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", "12crank/24cam", "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", "INVALID", "GM 60-2-2-2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "Nissan VQ35", "INVALID", "Nissan VQ30", "Nissan QR25", "INVALID", "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", "3-0", "INVALID", "GM 24x 3 degree", "60-2-2 F3R", "Mitsu 4G63 Crank", "x2 30 Deg camshaft BTDC", "INVALID", "Mitsu 6G72 Cam", "6-0", "Daihatsu 4 cylinder", "trg82", "trg83"
|
||||||
|
|
||||||
custom trigger_type_e 4 bits, U32, @OFFSET@, [0:6], @@trigger_type_e_enum@@
|
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
|
trigger_type_e type;https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers
|
||||||
|
|
|
@ -15,7 +15,7 @@ TEST(crankingVW, vwRealCrankingFromFile) {
|
||||||
reader.open("tests/trigger/resources/nick_1.csv");
|
reader.open("tests/trigger/resources/nick_1.csv");
|
||||||
EngineTestHelper eth (engine_type_e::VW_ABA);
|
EngineTestHelper eth (engine_type_e::VW_ABA);
|
||||||
engineConfiguration->alwaysInstantRpm = true;
|
engineConfiguration->alwaysInstantRpm = true;
|
||||||
eth.setTriggerType(trigger_type_e::TT_60_2_VW);
|
eth.setTriggerType(trigger_type_e::TT_60_2_WRONG_POLARITY);
|
||||||
|
|
||||||
while (reader.haveMore()) {
|
while (reader.haveMore()) {
|
||||||
reader.processLine(ð);
|
reader.processLine(ð);
|
||||||
|
@ -28,7 +28,7 @@ TEST(crankingVW, vwRealCrankingFromFile) {
|
||||||
TEST(crankingVW, crankingTwiceWithGap) {
|
TEST(crankingVW, crankingTwiceWithGap) {
|
||||||
EngineTestHelper eth (engine_type_e::VW_ABA);
|
EngineTestHelper eth (engine_type_e::VW_ABA);
|
||||||
engineConfiguration->alwaysInstantRpm = true;
|
engineConfiguration->alwaysInstantRpm = true;
|
||||||
eth.setTriggerType(trigger_type_e::TT_60_2_VW);
|
eth.setTriggerType(trigger_type_e::TT_60_2_WRONG_POLARITY);
|
||||||
|
|
||||||
{
|
{
|
||||||
CsvReader reader(1, /* vvtCount */ 0);
|
CsvReader reader(1, /* vvtCount */ 0);
|
||||||
|
|
Loading…
Reference in New Issue