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

The Big Refactoring of 2019: configuration version should not be a global variable #656 

making a global not global
This commit is contained in:
rusefi 2019-01-14 12:21:26 -05:00
parent 01095219ba
commit a2e8744200
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
firmware/controllers/algo/engine.h
View File

@ -396,6 +396,9 @@ public:
// timestamp of most recent time RPM hard limit was triggered // timestamp of most recent time RPM hard limit was triggered
efitime_t rpmHardLimitTimestamp; efitime_t rpmHardLimitTimestamp;
// todo: should be a field on some other class, not Engine?
bool isInitializingTrigger = false;
/** /**
* This flag indicated a big enough problem that engine control would be * This flag indicated a big enough problem that engine control would be
* prohibited if this flag is set to true. * prohibited if this flag is set to true.

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

@ -41,8 +41,6 @@ EXTERN_ENGINE
; ;
static cyclic_buffer<int> errorDetection; static cyclic_buffer<int> errorDetection;
// todo! make this NOT a global variable
static bool isInitializingTrigger = false; // #286 miata NA config - sync error on startup
#if ! EFI_PROD_CODE || defined(__DOXYGEN__) #if ! EFI_PROD_CODE || defined(__DOXYGEN__)
bool printTriggerDebug = false; bool printTriggerDebug = false;
@ -481,7 +479,7 @@ void TriggerState::decodeTriggerEvent(trigger_event_e const signal, efitime_t no
|| currentCycle.eventCount[2] != TRIGGER_SHAPE(expectedEventCount[2]); || currentCycle.eventCount[2] != TRIGGER_SHAPE(expectedEventCount[2]);
#if EFI_UNIT_TEST #if EFI_UNIT_TEST
printf("sync point: isDecodingError=%d isInit=%d\r\n", isDecodingError, isInitializingTrigger); printf("sync point: isDecodingError=%d isInit=%d\r\n", isDecodingError, engine->isInitializingTrigger);
if (isDecodingError) { if (isDecodingError) {
printf("count: cur=%d exp=%d\r\n", currentCycle.eventCount[0], TRIGGER_SHAPE(expectedEventCount[0])); printf("count: cur=%d exp=%d\r\n", currentCycle.eventCount[0], TRIGGER_SHAPE(expectedEventCount[0]));
printf("count: cur=%d exp=%d\r\n", currentCycle.eventCount[1], TRIGGER_SHAPE(expectedEventCount[1])); printf("count: cur=%d exp=%d\r\n", currentCycle.eventCount[1], TRIGGER_SHAPE(expectedEventCount[1]));
@ -490,7 +488,7 @@ void TriggerState::decodeTriggerEvent(trigger_event_e const signal, efitime_t no
#endif #endif
enginePins.triggerDecoderErrorPin.setValue(isDecodingError); enginePins.triggerDecoderErrorPin.setValue(isDecodingError);
if (isDecodingError && !isInitializingTrigger) { if (isDecodingError && !engine->isInitializingTrigger) {
if (engineConfiguration->debugMode == DBG_TRIGGER_SYNC) { if (engineConfiguration->debugMode == DBG_TRIGGER_SYNC) {
#if EFI_TUNER_STUDIO || defined(__DOXYGEN__) #if EFI_TUNER_STUDIO || defined(__DOXYGEN__)
tsOutputChannels.debugIntField1 = currentCycle.eventCount[0]; tsOutputChannels.debugIntField1 = currentCycle.eventCount[0];
@ -564,7 +562,7 @@ void TriggerState::decodeTriggerEvent(trigger_event_e const signal, efitime_t no
toothed_previous_time = nowNt; toothed_previous_time = nowNt;
} }
if (!isValidIndex(PASS_ENGINE_PARAMETER_SIGNATURE) && !isInitializingTrigger) { if (!isValidIndex(PASS_ENGINE_PARAMETER_SIGNATURE) && !engine->isInitializingTrigger) {
// let's not show a warning if we are just starting to spin // let's not show a warning if we are just starting to spin
if (GET_RPM() != 0) { if (GET_RPM() != 0) {
warning(CUSTOM_SYNC_ERROR, "sync error: index #%d above total size %d", currentCycle.current_index, getTriggerSize()); warning(CUSTOM_SYNC_ERROR, "sync error: index #%d above total size %d", currentCycle.current_index, getTriggerSize());
@ -581,7 +579,7 @@ void TriggerState::decodeTriggerEvent(trigger_event_e const signal, efitime_t no
runtimeStatistics(nowNt PASS_ENGINE_PARAMETER_SUFFIX); runtimeStatistics(nowNt PASS_ENGINE_PARAMETER_SUFFIX);
// Needed for early instant-RPM detection // Needed for early instant-RPM detection
if (!isInitializingTrigger) { if (!engine->isInitializingTrigger) {
engine->rpmCalculator.setSpinningUp(nowNt PASS_ENGINE_PARAMETER_SUFFIX); engine->rpmCalculator.setSpinningUp(nowNt PASS_ENGINE_PARAMETER_SUFFIX);
} }
} }
@ -613,14 +611,14 @@ uint32_t findTriggerZeroEventIndex(TriggerState *state, TriggerShape * shape,
return 0; return 0;
} }
isInitializingTrigger = true; engine->isInitializingTrigger = true;
// todo: should this variable be declared 'static' to reduce stack usage? // todo: should this variable be declared 'static' to reduce stack usage?
TriggerStimulatorHelper helper; TriggerStimulatorHelper helper;
uint32_t syncIndex = helper.findTriggerSyncPoint(shape, state PASS_ENGINE_PARAMETER_SUFFIX); uint32_t syncIndex = helper.findTriggerSyncPoint(shape, state PASS_ENGINE_PARAMETER_SUFFIX);
if (syncIndex == EFI_ERROR_CODE) { if (syncIndex == EFI_ERROR_CODE) {
isInitializingTrigger = false; engine->isInitializingTrigger = false;
return syncIndex; return syncIndex;
} }
efiAssert(CUSTOM_ERR_ASSERT, state->getTotalRevolutionCounter() == 1, "findZero_revCounter", EFI_ERROR_CODE); efiAssert(CUSTOM_ERR_ASSERT, state->getTotalRevolutionCounter() == 1, "findZero_revCounter", EFI_ERROR_CODE);
@ -641,7 +639,7 @@ uint32_t findTriggerZeroEventIndex(TriggerState *state, TriggerShape * shape,
helper.assertSyncPositionAndSetDutyCycle(syncIndex, state, shape PASS_ENGINE_PARAMETER_SUFFIX); helper.assertSyncPositionAndSetDutyCycle(syncIndex, state, shape PASS_ENGINE_PARAMETER_SUFFIX);
isInitializingTrigger = false; engine->isInitializingTrigger = false;
return syncIndex % shape->getSize(); return syncIndex % shape->getSize();
} }