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

#625

This commit is contained in:
rusefi 2018-12-25 19:18:37 -05:00
parent c6c53a02fd
commit 7e64c16df5
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,30 +17,30 @@ void initialize2jzGE1_12(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX) {
float crankD = 360 / 12 / 2; // 15 float crankD = 360 / 12 / 2; // 15
float crankAngle = 10; float crankAngle = 10;
s->addEvent3(crankAngle, T_SECONDARY, TV_FALL, -1, 721 PASS_ENGINE_PARAMETER_SUFFIX); // 120 s->addEvent3(crankAngle, T_SECONDARY, TV_FALL, -1, 721); // 120
for (int i = 0; i < 2; i++) { for (int i = 0; i < 2; i++) {
s->addEvent3(crankAngle + crankD, T_SECONDARY, TV_RISE, -1, 721 PASS_ENGINE_PARAMETER_SUFFIX); s->addEvent3(crankAngle + crankD, T_SECONDARY, TV_RISE, -1, 721);
crankAngle += crankD; crankAngle += crankD;
s->addEvent3(crankAngle + crankD, T_SECONDARY, TV_FALL, -1, 721 PASS_ENGINE_PARAMETER_SUFFIX); // 120 s->addEvent3(crankAngle + crankD, T_SECONDARY, TV_FALL, -1, 721); // 120
crankAngle += crankD; crankAngle += crankD;
} }
s->addEvent3(75, T_PRIMARY, TV_FALL, -1, 721 PASS_ENGINE_PARAMETER_SUFFIX); s->addEvent3(75, T_PRIMARY, TV_FALL, -1, 721);
for (int i = 0; i < 21; i++) { for (int i = 0; i < 21; i++) {
s->addEvent3(crankAngle + crankD, T_SECONDARY, TV_RISE, -1, 721 PASS_ENGINE_PARAMETER_SUFFIX); s->addEvent3(crankAngle + crankD, T_SECONDARY, TV_RISE, -1, 721);
crankAngle += crankD; crankAngle += crankD;
s->addEvent3(crankAngle + crankD, T_SECONDARY, TV_FALL, -1, 721 PASS_ENGINE_PARAMETER_SUFFIX); // 120 s->addEvent3(crankAngle + crankD, T_SECONDARY, TV_FALL, -1, 721); // 120
crankAngle += crankD; crankAngle += crankD;
} }
s->addEvent3(crankAngle + crankD, T_SECONDARY, TV_RISE, -1, 721 PASS_ENGINE_PARAMETER_SUFFIX); s->addEvent3(crankAngle + crankD, T_SECONDARY, TV_RISE, -1, 721);
crankAngle += crankD; crankAngle += crankD;
s->addEvent3(720, T_PRIMARY, TV_RISE, -1, 721 PASS_ENGINE_PARAMETER_SUFFIX); s->addEvent3(720, T_PRIMARY, TV_RISE, -1, 721);
s->isSynchronizationNeeded = false; s->isSynchronizationNeeded = false;
} }

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

@ -19,13 +19,13 @@ void addSkippedToothTriggerEvents(trigger_wheel_e wheel, TriggerShape *s, int to
for (int i = 0; i < totalTeethCount - skippedCount - 1; i++) { for (int i = 0; i < totalTeethCount - skippedCount - 1; i++) {
float angleDown = engineCycle / totalTeethCount * (i + (1 - toothWidth)); float angleDown = engineCycle / totalTeethCount * (i + (1 - toothWidth));
float angleUp = engineCycle / totalTeethCount * (i + 1); float angleUp = engineCycle / totalTeethCount * (i + 1);
s->addEvent3(offset + angleDown, wheel, TV_RISE, filterLeft, filterRight PASS_ENGINE_PARAMETER_SUFFIX); s->addEvent3(offset + angleDown, wheel, TV_RISE, filterLeft, filterRight);
s->addEvent3(offset + angleUp, wheel, TV_FALL, filterLeft, filterRight PASS_ENGINE_PARAMETER_SUFFIX); s->addEvent3(offset + angleUp, wheel, TV_FALL, filterLeft, filterRight);
} }
float angleDown = engineCycle / totalTeethCount * (totalTeethCount - skippedCount - 1 + (1 - toothWidth)); float angleDown = engineCycle / totalTeethCount * (totalTeethCount - skippedCount - 1 + (1 - toothWidth));
s->addEvent3(offset + angleDown, wheel, TV_RISE, filterLeft, filterRight PASS_ENGINE_PARAMETER_SUFFIX); s->addEvent3(offset + angleDown, wheel, TV_RISE, filterLeft, filterRight);
s->addEvent3(offset + engineCycle, wheel, TV_FALL, filterLeft, filterRight PASS_ENGINE_PARAMETER_SUFFIX); s->addEvent3(offset + engineCycle, wheel, TV_FALL, filterLeft, filterRight);
} }
void initializeSkippedToothTriggerShapeExt(TriggerShape *s, int totalTeethCount, int skippedCount, void initializeSkippedToothTriggerShapeExt(TriggerShape *s, int totalTeethCount, int skippedCount,

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

@ -26,8 +26,8 @@ void setVwConfiguration(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX) {
NO_LEFT_FILTER, 690 PASS_ENGINE_PARAMETER_SUFFIX); NO_LEFT_FILTER, 690 PASS_ENGINE_PARAMETER_SUFFIX);
float angleDown = engineCycle / totalTeethCount * (totalTeethCount - skippedCount - 1 + (1 - toothWidth) ); float angleDown = engineCycle / totalTeethCount * (totalTeethCount - skippedCount - 1 + (1 - toothWidth) );
s->addEvent3(0 + angleDown + 12, T_PRIMARY, TV_RISE, NO_LEFT_FILTER, NO_RIGHT_FILTER PASS_ENGINE_PARAMETER_SUFFIX); s->addEvent3(0 + angleDown + 12, T_PRIMARY, TV_RISE, NO_LEFT_FILTER, NO_RIGHT_FILTER);
s->addEvent3(0 + engineCycle, T_PRIMARY, TV_FALL, NO_LEFT_FILTER, NO_RIGHT_FILTER PASS_ENGINE_PARAMETER_SUFFIX); s->addEvent3(0 + engineCycle, T_PRIMARY, TV_FALL, NO_LEFT_FILTER, NO_RIGHT_FILTER);
s->setTriggerSynchronizationGap2(1.6, 4); s->setTriggerSynchronizationGap2(1.6, 4);
} }

2
firmware/controllers/trigger/trigger_structure.cpp
View File

@ -280,7 +280,7 @@ angle_t TriggerShape::getAngle(int index) const {
return getCycleDuration() * crankCycle + getSwitchAngle(remainder); return getCycleDuration() * crankCycle + getSwitchAngle(remainder);
} }
void TriggerShape::addEvent3(angle_t angle, trigger_wheel_e const channelIndex, trigger_value_e const stateParam, float filterLeft, float filterRight DECLARE_ENGINE_PARAMETER_SUFFIX) { void TriggerShape::addEvent3(angle_t angle, trigger_wheel_e const channelIndex, trigger_value_e const stateParam, float filterLeft, float filterRight) {
if (angle > filterLeft && angle < filterRight) if (angle > filterLeft && angle < filterRight)
addEvent(useOnlyRisingEdgeForTriggerTemp, angle / getEngineCycle(operationMode), channelIndex, stateParam); addEvent(useOnlyRisingEdgeForTriggerTemp, angle / getEngineCycle(operationMode), channelIndex, stateParam);
} }

2
firmware/controllers/trigger/trigger_structure.h
View File

@ -191,7 +191,7 @@ public:
/* 0..720 angle range /* 0..720 angle range
* Deprecated? * Deprecated?
*/ */
void addEvent3(angle_t angle, trigger_wheel_e const channelIndex, trigger_value_e const stateParam, float filterLeft, float filterRight DECLARE_ENGINE_PARAMETER_SUFFIX); void addEvent3(angle_t angle, trigger_wheel_e const channelIndex, trigger_value_e const stateParam, float filterLeft, float filterRight);
operation_mode_e getOperationMode(); operation_mode_e getOperationMode();
void initialize(operation_mode_e operationMode, bool needSecondTriggerInput); void initialize(operation_mode_e operationMode, bool needSecondTriggerInput);