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

Revert "smaller step forward" 

This reverts commit f0e6bcc279.
This commit is contained in:
Andrey 2022-09-01 09:10:11 -04:00
parent e1b3c3380f
commit 1d1fd2da43
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -704,9 +704,9 @@ void TriggerCentral::handleShaftSignal(trigger_event_e signal, efitick_t timesta
auto currentPhaseFromSyncPoint = engine->triggerCentral.triggerFormDetails.eventAngles[triggerIndexForListeners];
// Adjust so currentPhase is in engine-space angle, not trigger-space angle
currentEngineDecodedPhase = wrapAngleMethod(currentPhaseFromSyncPoint - tdcPosition(), "currentEnginePhase", CUSTOM_ERR_6555);
auto currentPhase = wrapAngleMethod(currentPhaseFromSyncPoint - tdcPosition(), "currentEnginePhase", CUSTOM_ERR_6555);
#if EFI_TUNER_STUDIO
engine->outputChannels.currentEnginePhase = currentEngineDecodedPhase;
engine->outputChannels.currentEnginePhase = currentPhase;
#endif // EFI_TUNER_STUDIO
// Record precise time and phase of the engine. This is used for VVT decode.
@ -747,7 +747,7 @@ void TriggerCentral::handleShaftSignal(trigger_event_e signal, efitick_t timesta
nextToothIndex = (nextToothIndex + 1) % engine->engineCycleEventCount;
nextPhase = engine->triggerCentral.triggerFormDetails.eventAngles[nextToothIndex] - tdcPosition();
wrapAngle(nextPhase, "nextEnginePhase", CUSTOM_ERR_6555);
} while (nextPhase == currentPhaseFromSyncPoint);
} while (nextPhase == currentPhase);
#if EFI_CDM_INTEGRATION
@ -758,10 +758,10 @@ void TriggerCentral::handleShaftSignal(trigger_event_e signal, efitick_t timesta
#endif /* EFI_CDM_INTEGRATION */
// Handle ignition and injection
mainTriggerCallback(triggerIndexForListeners, timestamp, currentPhaseFromSyncPoint, nextPhase);
mainTriggerCallback(triggerIndexForListeners, timestamp, currentPhase, nextPhase);
// Decode the MAP based "cam" sensor
decodeMapCam(timestamp, currentPhaseFromSyncPoint);
decodeMapCam(timestamp, currentPhase);
} else {
// We don't have sync, but report to the wave chart anyway as index 0.
reportEventToWaveChart(signal, 0);