From 168a899ba906c23d74dee8533c04dc987b969ab8 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Thu, 2 Dec 2021 01:06:40 -0500 Subject: [PATCH] how many more spelling mistakes?! --- firmware/console/binary/output_channels.txt | 2 +- firmware/console/status_loop.cpp | 4 ++-- firmware/controllers/algo/runtime_state.cpp | 2 +- firmware/controllers/trigger/trigger_central.cpp | 12 ++++++------ 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/firmware/console/binary/output_channels.txt b/firmware/console/binary/output_channels.txt index c0532822a4..6252727a52 100644 --- a/firmware/console/binary/output_channels.txt +++ b/firmware/console/binary/output_channels.txt @@ -270,7 +270,7 @@ uint16_t rpmAcceleration;dRPM;"RPM/s",1, 0, 0, 0, 0 uint16_t mostRecentTimeBetweenIgnitionEvents;;"", 1, 0, -10000, 10000, 3 uint16_t maxLockedDuration;;"", 1, 0, -10000, 10000, 3 - uint16_t maxTriggerReentraint;;"", 1, 0, -10000, 10000, 3 + uint16_t maxTriggerReentrant;;"", 1, 0, -10000, 10000, 3 uint16_t canWriteOk;;"", 1, 0, -10000, 10000, 3 diff --git a/firmware/console/status_loop.cpp b/firmware/console/status_loop.cpp index 1eb914873c..3be5b3a194 100644 --- a/firmware/console/status_loop.cpp +++ b/firmware/console/status_loop.cpp @@ -109,7 +109,7 @@ extern pin_output_mode_e INVERTED_OUTPUT; int warningEnabled = true; -extern int maxTriggerReentraint; +extern int maxTriggerReentrant; extern uint32_t maxLockedDuration; @@ -781,7 +781,7 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels) { #if EFI_CLOCK_LOCKS tsOutputChannels->maxLockedDuration = maxLockedDuration; - tsOutputChannels->maxTriggerReentraint = maxTriggerReentraint; + tsOutputChannels->maxTriggerReentrant = maxTriggerReentrant; #endif /* EFI_CLOCK_LOCKS */ switch (engineConfiguration->debugMode) { diff --git a/firmware/controllers/algo/runtime_state.cpp b/firmware/controllers/algo/runtime_state.cpp index 6aef5b8a38..34ab052132 100644 --- a/firmware/controllers/algo/runtime_state.cpp +++ b/firmware/controllers/algo/runtime_state.cpp @@ -47,7 +47,7 @@ void printRuntimeStats(void) { efiPrintf("maxSchedulingPrecisionLoss=%d", maxSchedulingPrecisionLoss); #if EFI_CLOCK_LOCKS - efiPrintf("maxLockedDuration=%d / maxTriggerReentraint=%d", maxLockedDuration, maxTriggerReentraint); + efiPrintf("maxLockedDuration=%d / maxTriggerReentrant=%d", maxLockedDuration, maxTriggerReentrant); efiPrintf("perSecondIrqDuration=%d ticks / perSecondIrqCounter=%d", perSecondIrqDuration, perSecondIrqCounter); efiPrintf("IRQ CPU utilization %f%%", perSecondIrqDuration / (float)CORE_CLOCK * 100); diff --git a/firmware/controllers/trigger/trigger_central.cpp b/firmware/controllers/trigger/trigger_central.cpp index 223ebeacca..419a5ad540 100644 --- a/firmware/controllers/trigger/trigger_central.cpp +++ b/firmware/controllers/trigger/trigger_central.cpp @@ -364,8 +364,8 @@ void hwHandleVvtCamSignal(trigger_value_e front, efitick_t nowNt, int index) { tc->vvtPosition[bankIndex][camIndex] = vvtPosition; } -int triggerReentraint = 0; -int maxTriggerReentraint = 0; +int triggerReentrant = 0; +int maxTriggerReentrant = 0; uint32_t triggerDuration; uint32_t triggerMaxDuration = 0; @@ -466,13 +466,13 @@ void handleShaftSignal(int signalIndex, bool isRising, efitick_t timestamp) { #endif /* EFI_TOOTH_LOGGER */ uint32_t triggerHandlerEntryTime = getTimeNowLowerNt(); - if (triggerReentraint > maxTriggerReentraint) - maxTriggerReentraint = triggerReentraint; - triggerReentraint++; + if (triggerReentrant > maxTriggerReentrant) + maxTriggerReentrant = triggerReentrant; + triggerReentrant++; engine->triggerCentral.handleShaftSignal(signal, timestamp); - triggerReentraint--; + triggerReentrant--; triggerDuration = getTimeNowLowerNt() - triggerHandlerEntryTime; triggerMaxDuration = maxI(triggerMaxDuration, triggerDuration); }