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

trigger decoder timer (#2427) 

* part 2

* stale comment

* include

* why was this a macro

Co-authored-by: Matthew Kennedy <makenne@microsoft.com>
This commit is contained in:
Matthew Kennedy 2021-03-07 13:35:58 -08:00 committed by GitHub
parent 29f92a8db7
commit 57b79ab6bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,8 +67,6 @@ void TriggerState::resetTriggerState() {
totalRevolutionCounter = 0;
totalTriggerErrorCounter = 0;
orderingErrorCounter = 0;
// we need this initial to have not_running at first invocation
previousShaftEventTimeNt = (efitimems_t) -10 * NT_PER_SECOND;
lastDecodingErrorTime = US2NT(-10000000LL);
someSortOfTriggerError = false;
@ -298,9 +296,6 @@ bool TriggerState::isValidIndex(const TriggerWaveform& triggerShape) const {
static trigger_wheel_e eventIndex[6] = { T_PRIMARY, T_PRIMARY, T_SECONDARY, T_SECONDARY, T_CHANNEL_3, T_CHANNEL_3 };
static trigger_value_e eventType[6] = { TV_FALL, TV_RISE, TV_FALL, TV_RISE, TV_FALL, TV_RISE };
#define getCurrentGapDuration(nowNt) \
(isFirstEvent ? 0 : (nowNt) - toothed_previous_time)
#if EFI_UNIT_TEST
#define PRINT_INC_INDEX if (printTriggerTrace) {\
printf("nextTriggerEvent index=%d\r\n", currentCycle.current_index); \
@ -413,7 +408,7 @@ void TriggerState::decodeTriggerEvent(
const efitick_t nowNt) {
ScopePerf perf(PE::DecodeTriggerEvent);
if (nowNt - previousShaftEventTimeNt > NT_PER_SECOND) {
if (previousEventTimer.getElapsedSecondsAndReset(nowNt) > 1) {
/**
* We are here if there is a time gap between now and previous shaft event - that means the engine is not running.
* That means we have lost synchronization since the engine is not running :)
@ -423,7 +418,6 @@ void TriggerState::decodeTriggerEvent(
triggerStateListener->OnTriggerSynchronizationLost();
}
}
previousShaftEventTimeNt = nowNt;
bool useOnlyRisingEdgeForTrigger = triggerConfiguration.UseOnlyRisingEdgeForTrigger;
@ -445,7 +439,7 @@ void TriggerState::decodeTriggerEvent(
firmwareError(CUSTOM_OBD_93, "toothed_previous_time after nowNt %d %d", toothed_previous_time, nowNt);
}
efitick_t currentDurationLong = getCurrentGapDuration(nowNt);
efitick_t currentDurationLong = isFirstEvent ? 0 : nowNt - toothed_previous_time;
/**
* For performance reasons, we want to work with 32 bit values. If there has been more then

4
firmware/controllers/trigger/trigger_decoder.h
View File

@ -11,6 +11,7 @@
#include "trigger_structure.h"
#include "engine_configuration.h"
#include "trigger_state_generated.h"
#include "timer.h"
class TriggerState;
@ -109,7 +110,8 @@ public:
*/
bool shaft_is_synchronized;
efitick_t mostRecentSyncTime;
volatile efitick_t previousShaftEventTimeNt;
Timer previousEventTimer;
void setTriggerErrorState();