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

C++11 and unique method name

This commit is contained in:
rusefi 2019-01-22 19:07:36 -05:00
parent 7497c8791f
commit 1d15885448
5 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/controllers/algo/engine.cpp
View File

@ -69,7 +69,7 @@ void Engine::initializeTriggerShape(Logging *logger DECLARE_ENGINE_PARAMETER_SUF
* this instance is used only to initialize 'this' TriggerShape instance
* #192 BUG real hardware trigger events could be coming even while we are initializing trigger
*/
initState.reset();
initState.resetTriggerState();
calculateTriggerSynchPoint(&ENGINE(triggerCentral.triggerShape),
&initState PASS_ENGINE_PARAMETER_SUFFIX);

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

@ -204,16 +204,12 @@ void hwHandleShaftSignal(trigger_event_e signal) {
}
#endif /* EFI_PROD_CODE */
TriggerCentral::TriggerCentral() {
nowNt = 0;
vvtPosition = 0;
timeAtVirtualZeroNt = 0;
TriggerCentral::TriggerCentral() : hwEventCounters() {
// we need this initial to have not_running at first invocation
previousShaftEventTimeNt = (efitimems_t) -10 * US2NT(US_PER_SECOND_LL);
memset(hwEventCounters, 0, sizeof(hwEventCounters));
clearCallbacks(&triggerListeneres);
triggerState.reset();
triggerState.resetTriggerState();
resetAccumSignalData();
}

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

@ -32,12 +32,12 @@ public:
void resetAccumSignalData();
bool noiseFilter(efitick_t nowNt, trigger_event_e signal DECLARE_ENGINE_PARAMETER_SUFFIX);
TriggerStateWithRunningStatistics triggerState;
efitick_t nowNt;
angle_t vvtPosition;
efitick_t nowNt = 0;
angle_t vvtPosition = 0;
/**
* this is similar to TriggerState#startOfCycleNt but with the crank-only sensor magic
*/
efitick_t timeAtVirtualZeroNt;
efitick_t timeAtVirtualZeroNt = 0;
TriggerShape triggerShape;

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

@ -236,10 +236,10 @@ static trigger_value_e eventType[6] = { TV_FALL, TV_RISE, TV_FALL, TV_RISE, TV_F
#define isLessImportant(type) (needToSkipFall(type) || needToSkipRise(type) || (!considerEventForGap()) )
TriggerState::TriggerState() {
reset();
resetTriggerState();
}
void TriggerState::reset() {
void TriggerState::resetTriggerState() {
triggerCycleCallback = NULL;
shaft_is_synchronized = false;
toothed_previous_time = 0;
@ -607,7 +607,7 @@ uint32_t findTriggerZeroEventIndex(TriggerState *state, TriggerShape * shape,
errorDetection.clear();
efiAssert(CUSTOM_ERR_ASSERT, state != NULL, "NULL state", -1);
state->reset();
state->resetTriggerState();
if (shape->shapeDefinitionError) {
return 0;

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

@ -97,7 +97,7 @@ public:
uint32_t orderingErrorCounter;
uint32_t runningOrderingErrorCounter;
void reset();
void resetTriggerState();
void resetRunningCounters();
virtual void runtimeStatistics(efitime_t nowNt DECLARE_ENGINE_PARAMETER_SUFFIX);