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

Engine phase wrap around in log #3645 

refactoring & docs
This commit is contained in:
rusefillc 2021-12-02 16:52:16 -05:00
parent c9aa40293c
commit e896afe2f6
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,6 +68,9 @@ angle_t TriggerCentral::getVVTPosition(uint8_t bankIndex, uint8_t camIndex) {
return vvtPosition[bankIndex][camIndex]; return vvtPosition[bankIndex][camIndex];
} }
/**
* @return angle since trigger synchronization point, NOT angle since TDC.
*/
expected<float> TriggerCentral::getCurrentEnginePhase(efitick_t nowNt) const { expected<float> TriggerCentral::getCurrentEnginePhase(efitick_t nowNt) const {
floatus_t oneDegreeUs = engine->rpmCalculator.oneDegreeUs; floatus_t oneDegreeUs = engine->rpmCalculator.oneDegreeUs;
@ -75,7 +78,7 @@ expected<float> TriggerCentral::getCurrentEnginePhase(efitick_t nowNt) const {
return unexpected; return unexpected;
} }
return m_virtualZeroTimer.getElapsedUs(nowNt) / oneDegreeUs; return m_syncPointTimer.getElapsedUs(nowNt) / oneDegreeUs;
} }
/** /**
@ -617,7 +620,7 @@ void TriggerCentral::handleShaftSignal(trigger_event_e signal, efitick_t timesta
int crankInternalIndex = triggerState.getTotalRevolutionCounter() % crankDivider; int crankInternalIndex = triggerState.getTotalRevolutionCounter() % crankDivider;
int triggerIndexForListeners = triggerState.getCurrentIndex() + (crankInternalIndex * getTriggerSize()); int triggerIndexForListeners = triggerState.getCurrentIndex() + (crankInternalIndex * getTriggerSize());
if (triggerIndexForListeners == 0) { if (triggerIndexForListeners == 0) {
m_virtualZeroTimer.reset(timestamp); m_syncPointTimer.reset(timestamp);
} }
reportEventToWaveChart(signal, triggerIndexForListeners); reportEventToWaveChart(signal, triggerIndexForListeners);

3
firmware/controllers/trigger/trigger_central.h
View File

@ -126,7 +126,8 @@ public:
private: private:
// Keep track of the last time we saw the sync tooth go by (trigger index 0) // Keep track of the last time we saw the sync tooth go by (trigger index 0)
Timer m_virtualZeroTimer; // not TDC point
Timer m_syncPointTimer;
}; };
void triggerInfo(void); void triggerInfo(void);