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

34-2 3 cam Toyota wheel progress

This commit is contained in:
rusefi 2020-05-09 01:15:55 -04:00
parent 05f1e6e151
commit 6661c66e62
3 changed files with 67 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -183,7 +183,7 @@ void TriggerWaveform::calculateExpectedEventCounts(bool useOnlyRisingEdgeForTrig
bool isSingleToothOnPrimaryChannel = useOnlyRisingEdgeForTrigger ? expectedEventCount[0] == 1 : expectedEventCount[0] == 2;
// todo: next step would be to set 'isSynchronizationNeeded' automatically based on the logic we have here
if (!shapeWithoutTdc && isSingleToothOnPrimaryChannel != !isSynchronizationNeeded) {
firmwareError(ERROR_TRIGGER_DRAMA, "trigger constraint violation");
firmwareError(ERROR_TRIGGER_DRAMA, "trigger sync constraint violation");
}
// todo: move the following logic from below here
@ -614,7 +614,7 @@ void TriggerWaveform::initializeTriggerWaveform(Logging *logger, operation_mode_
break;
case TT_2JZ_3_34:
initialize2jzGE3_34(this);
initialize2jzGE3_34_simulation_shape(this);
break;
case TT_2JZ_1_12:

130
firmware/controllers/trigger/decoders/trigger_toyota.cpp
View File

@ -52,72 +52,70 @@ void initialize2jzGE1_12(TriggerWaveform *s) {
/**
* https://rusefi.com/forum/viewtopic.php?f=5&t=1720
*/
void initialize2jzGE3_34(TriggerWaveform *s) {
setToothedWheelConfiguration(s, 36, 2, FOUR_STROKE_CRANK_SENSOR);
void initialize2jzGE3_34_simulation_shape(TriggerWaveform *s) {
s->initialize(FOUR_STROKE_CAM_SENSOR);
// s->initialize(FOUR_STROKE_CAM_SENSOR);
//
// float camD = 720 / 6; // 120
//
// float crankAngle = 20; // skipping two teeth
//
// for (int i = 0; i < 10; i++) {
// s->addEvent2(crankAngle + 5, T_SECONDARY, TV_RISE, -1, 721);
// s->addEvent2(crankAngle + 9.9, T_SECONDARY, TV_FALL, -1, 721); // 120
// crankAngle += 10;
// } // 2 + 10
//
// float camAngle = 0;
// camAngle += camD;
// s->addEvent2(camAngle, T_PRIMARY, TV_RISE, -1, 721); // 120
//
// for (int i = 0; i < 12; i++) {
// s->addEvent2(crankAngle + 5, T_SECONDARY, TV_RISE, -1, 721);
// s->addEvent2(crankAngle + 9.9, T_SECONDARY, TV_FALL, -1, 721); // 120
// crankAngle += 10;
// } // 2 + 22
//
//
// camAngle += camD;
// s->addEvent2(camAngle, T_PRIMARY, TV_FALL, -1, 721); // 240
//
// for (int i = 0; i < 12; i++) {
// s->addEvent2(crankAngle + 5, T_SECONDARY, TV_RISE, -1, 721);
// s->addEvent2(crankAngle + 9.9, T_SECONDARY, TV_FALL, -1, 721); // 120
// crankAngle += 10;
// } // 2 + 34
//
// camAngle += camD;
// s->addEvent2(camAngle, T_PRIMARY, TV_RISE, -1, 721); // 360
//
// crankAngle += 20; // skipping two teeth one more time
// for (int i = 0; i < 10; i++) {
// s->addEvent2(crankAngle + 5, T_SECONDARY, TV_RISE, -1, 721);
// s->addEvent2(crankAngle + 9.9, T_SECONDARY, TV_FALL, -1, 721); // 120
// crankAngle += 10;
// } // 2 + 10
//
// camAngle += camD;
// s->addEvent2(camAngle, T_PRIMARY, TV_FALL, -1, 721); // 480
//
// for (int i = 0; i < 12; i++) {
// s->addEvent2(crankAngle + 5, T_SECONDARY, TV_RISE, -1, 721);
// s->addEvent2(crankAngle + 9.9, T_SECONDARY, TV_FALL, -1, 721); // 120
// crankAngle += 10;
// } // 2 + 22
//
// camAngle += camD;
// s->addEvent2(camAngle, T_PRIMARY, TV_RISE, -1, 721); // 600
//
//
// for (int i = 0; i < 12; i++) {
// s->addEvent2(crankAngle + 5, T_SECONDARY, TV_RISE, -1, 721);
// s->addEvent2(crankAngle + 9.9, T_SECONDARY, TV_FALL, -1, 721); // 120
// crankAngle += 10;
// } // 2 + 32
// camAngle += camD;
// s->addEvent2(camAngle, T_PRIMARY, TV_FALL, -1, 721); // 720
//
// s->isSynchronizationNeeded = false;
float camD = 720 / 6; // 120
float crankAngle = 20; // skipping two teeth
for (int i = 0; i < 10; i++) {
s->addEvent720(crankAngle + 5, T_SECONDARY, TV_RISE);
s->addEvent720(crankAngle + 9.9, T_SECONDARY, TV_FALL); // 120
crankAngle += 10;
} // 2 + 10
float camAngle = 0;
camAngle += camD;
s->addEvent720(camAngle, T_PRIMARY, TV_RISE); // 120
for (int i = 0; i < 12; i++) {
s->addEvent720(crankAngle + 5, T_SECONDARY, TV_RISE);
s->addEvent720(crankAngle + 9.9, T_SECONDARY, TV_FALL); // 120
crankAngle += 10;
} // 2 + 22
camAngle += camD;
s->addEventClamped(camAngle, T_PRIMARY, TV_FALL, -1, 721); // 240
for (int i = 0; i < 12; i++) {
s->addEventClamped(crankAngle + 5, T_SECONDARY, TV_RISE, -1, 721);
s->addEventClamped(crankAngle + 9.9, T_SECONDARY, TV_FALL, -1, 721); // 120
crankAngle += 10;
} // 2 + 34
camAngle += camD;
s->addEventClamped(camAngle, T_PRIMARY, TV_RISE, -1, 721); // 360
crankAngle += 20; // skipping two teeth one more time
for (int i = 0; i < 10; i++) {
s->addEventClamped(crankAngle + 5, T_SECONDARY, TV_RISE, -1, 721);
s->addEventClamped(crankAngle + 9.9, T_SECONDARY, TV_FALL, -1, 721); // 120
crankAngle += 10;
} // 2 + 10
camAngle += camD;
s->addEventClamped(camAngle, T_PRIMARY, TV_FALL, -1, 721); // 480
for (int i = 0; i < 12; i++) {
s->addEvent720(crankAngle + 5, T_SECONDARY, TV_RISE);
s->addEvent720(crankAngle + 9.9, T_SECONDARY, TV_FALL); // 120
crankAngle += 10;
} // 2 + 22
camAngle += camD;
s->addEventClamped(camAngle, T_PRIMARY, TV_RISE, -1, 721); // 600
for (int i = 0; i < 12; i++) {
s->addEventClamped(crankAngle + 5, T_SECONDARY, TV_RISE, -1, 721);
s->addEventClamped(crankAngle + 9.9, T_SECONDARY, TV_FALL, -1, 721); // 120
crankAngle += 10;
} // 2 + 32
camAngle += camD;
s->addEventClamped(camAngle, T_PRIMARY, TV_FALL, -1, 721); // 720
s->shapeWithoutTdc = true;
s->isSynchronizationNeeded = false;
}

2
firmware/controllers/trigger/decoders/trigger_toyota.h
View File

@ -10,5 +10,5 @@
#include "trigger_structure.h"
void initialize2jzGE1_12(TriggerWaveform *s);
void initialize2jzGE3_34(TriggerWaveform *s);
void initialize2jzGE3_34_simulation_shape(TriggerWaveform *s);