rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactoring trigger sync layer

This commit is contained in:
rusefi 2018-10-21 14:03:51 -04:00
parent fb34e5f36e
commit 20d7c655df
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -135,7 +135,8 @@ void TriggerState::reset() {
totalRevolutionCounter = 0; totalRevolutionCounter = 0;
totalTriggerErrorCounter = 0; totalTriggerErrorCounter = 0;
orderingErrorCounter = 0; orderingErrorCounter = 0;
currentDuration = 0;
memset(toothDurations, 0, sizeof(toothDurations));
curSignal = SHAFT_PRIMARY_FALLING; curSignal = SHAFT_PRIMARY_FALLING;
prevSignal = SHAFT_PRIMARY_FALLING; prevSignal = SHAFT_PRIMARY_FALLING;
startOfCycleNt = 0; startOfCycleNt = 0;
@ -201,7 +202,7 @@ void TriggerState::decodeTriggerEvent(trigger_event_e const signal, efitime_t no
* For performance reasons, we want to work with 32 bit values. If there has been more then * For performance reasons, we want to work with 32 bit values. If there has been more then
* 10 seconds since previous trigger event we do not really care. * 10 seconds since previous trigger event we do not really care.
*/ */
currentDuration = toothDurations[0] =
currentDurationLong > 10 * US2NT(US_PER_SECOND_LL) ? 10 * US2NT(US_PER_SECOND_LL) : currentDurationLong; currentDurationLong > 10 * US2NT(US_PER_SECOND_LL) ? 10 * US2NT(US_PER_SECOND_LL) : currentDurationLong;
bool isPrimary = triggerWheel == T_PRIMARY; bool isPrimary = triggerWheel == T_PRIMARY;
@ -236,7 +237,6 @@ void TriggerState::decodeTriggerEvent(trigger_event_e const signal, efitime_t no
isFirstEvent = false; isFirstEvent = false;
// todo: skip a number of signal from the beginning // todo: skip a number of signal from the beginning
toothDurations[0] = currentDuration;
#if EFI_PROD_CODE || defined(__DOXYGEN__) #if EFI_PROD_CODE || defined(__DOXYGEN__)
// scheduleMsg(&logger, "from %.2f to %.2f %d %d", triggerConfig->syncRatioFrom, triggerConfig->syncRatioTo, toothDurations[0], shaftPositionState->toothDurations[1]); // scheduleMsg(&logger, "from %.2f to %.2f %d %d", triggerConfig->syncRatioFrom, triggerConfig->syncRatioTo, toothDurations[0], shaftPositionState->toothDurations[1]);
// scheduleMsg(&logger, "ratio %.2f", 1.0 * toothDurations[0]/ shaftPositionState->toothDurations[1]); // scheduleMsg(&logger, "ratio %.2f", 1.0 * toothDurations[0]/ shaftPositionState->toothDurations[1]);
@ -280,7 +280,7 @@ void TriggerState::decodeTriggerEvent(trigger_event_e const signal, efitime_t no
#else #else
if (printTriggerDebug) { if (printTriggerDebug) {
#endif /* EFI_PROD_CODE */ #endif /* EFI_PROD_CODE */
float gap = 1.0 * currentDuration / toothDurations[1]; float gap = 1.0 * toothDurations[0] / toothDurations[1];
float prevGap = 1.0 * toothDurations[1] / toothDurations[2]; float prevGap = 1.0 * toothDurations[1] / toothDurations[2];
float gap3 = 1.0 * toothDurations[2] / toothDurations[3]; float gap3 = 1.0 * toothDurations[2] / toothDurations[3];
#if EFI_PROD_CODE || defined(__DOXYGEN__) #if EFI_PROD_CODE || defined(__DOXYGEN__)
@ -299,7 +299,7 @@ void TriggerState::decodeTriggerEvent(trigger_event_e const signal, efitime_t no
#else #else
actualSynchGap = gap; actualSynchGap = gap;
print("current gap %.2f/%.2f/%.2f c=%d prev=%d\r\n", gap, prevGap, gap3, currentDuration, toothDurations[1]); print("current gap %.2f/%.2f/%.2f c=%d prev=%d\r\n", gap, prevGap, gap3, toothDurations[0], toothDurations[1]);
#endif /* EFI_PROD_CODE */ #endif /* EFI_PROD_CODE */
} }
@ -425,7 +425,7 @@ void TriggerState::decodeTriggerEvent(trigger_event_e const signal, efitime_t no
toothDurations[3] = toothDurations[2]; toothDurations[3] = toothDurations[2];
toothDurations[2] = toothDurations[1]; toothDurations[2] = toothDurations[1];
toothDurations[1] = currentDuration; toothDurations[1] = toothDurations[0];
toothed_previous_time = nowNt; toothed_previous_time = nowNt;
} }
if (!isValidIndex(PASS_ENGINE_PARAMETER_SIGNATURE) && !isInitializingTrigger) { if (!isValidIndex(PASS_ENGINE_PARAMETER_SIGNATURE) && !isInitializingTrigger) {

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

@ -79,10 +79,6 @@ public:
*/ */
uint32_t toothDurations[GAP_TRACKING_LENGHT + 1]; uint32_t toothDurations[GAP_TRACKING_LENGHT + 1];
/**
* this could be a local variable, but it's better for debugging to have it as a field
*/
uint32_t currentDuration;
efitime_t toothed_previous_time; efitime_t toothed_previous_time;
current_cycle_state_s currentCycle; current_cycle_state_s currentCycle;