refactoring: method rename
This commit is contained in:
parent
b9b2ae0a63
commit
6b5747d4c8
|
@ -118,7 +118,7 @@ static void initVvtShape(int camIndex, TriggerState &initState) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Engine::initializeTriggerWaveform() {
|
void Engine::updateTriggerWaveform() {
|
||||||
static TriggerState initState;
|
static TriggerState initState;
|
||||||
|
|
||||||
// Re-read config in case it's changed
|
// Re-read config in case it's changed
|
||||||
|
|
|
@ -341,7 +341,7 @@ public:
|
||||||
void periodicSlowCallback();
|
void periodicSlowCallback();
|
||||||
void updateSlowSensors();
|
void updateSlowSensors();
|
||||||
void updateSwitchInputs();
|
void updateSwitchInputs();
|
||||||
void initializeTriggerWaveform();
|
void updateTriggerWaveform();
|
||||||
|
|
||||||
bool clutchUpState = false;
|
bool clutchUpState = false;
|
||||||
bool clutchDownState = false;
|
bool clutchDownState = false;
|
||||||
|
|
|
@ -1160,7 +1160,7 @@ void applyNonPersistentConfiguration() {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if EFI_ENGINE_CONTROL
|
#if EFI_ENGINE_CONTROL
|
||||||
engine->initializeTriggerWaveform();
|
engine->updateTriggerWaveform();
|
||||||
#endif // EFI_ENGINE_CONTROL
|
#endif // EFI_ENGINE_CONTROL
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -404,7 +404,7 @@ void mainTriggerCallback(uint32_t trgEventIndex, efitick_t edgeTimestamp) {
|
||||||
engine->ignitionEvents.isReady = false; // we need to rebuild complete ignition schedule
|
engine->ignitionEvents.isReady = false; // we need to rebuild complete ignition schedule
|
||||||
engine->injectionEvents.isReady = false;
|
engine->injectionEvents.isReady = false;
|
||||||
// moved 'triggerIndexByAngle' into trigger initialization (why was it invoked from here if it's only about trigger shape & optimization?)
|
// moved 'triggerIndexByAngle' into trigger initialization (why was it invoked from here if it's only about trigger shape & optimization?)
|
||||||
// see initializeTriggerWaveform() -> prepareOutputSignals()
|
// see updateTriggerWaveform() -> prepareOutputSignals()
|
||||||
|
|
||||||
// we need this to apply new 'triggerIndexByAngle' values
|
// we need this to apply new 'triggerIndexByAngle' values
|
||||||
engine->periodicFastCallback();
|
engine->periodicFastCallback();
|
||||||
|
|
|
@ -882,7 +882,7 @@ void onConfigurationChangeTriggerCallback() {
|
||||||
|
|
||||||
if (changed) {
|
if (changed) {
|
||||||
#if EFI_ENGINE_CONTROL
|
#if EFI_ENGINE_CONTROL
|
||||||
engine->initializeTriggerWaveform();
|
engine->updateTriggerWaveform();
|
||||||
engine->triggerCentral.noiseFilter.resetAccumSignalData();
|
engine->triggerCentral.noiseFilter.resetAccumSignalData();
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
|
@ -340,7 +340,7 @@ void EngineTestHelper::assertEvent(const char *msg, int index, void *callback, e
|
||||||
|
|
||||||
|
|
||||||
void EngineTestHelper::applyTriggerWaveform() {
|
void EngineTestHelper::applyTriggerWaveform() {
|
||||||
engine.initializeTriggerWaveform();
|
engine.updateTriggerWaveform();
|
||||||
|
|
||||||
incrementGlobalConfigurationVersion();
|
incrementGlobalConfigurationVersion();
|
||||||
}
|
}
|
||||||
|
|
|
@ -136,7 +136,7 @@ TEST(misc, testAngleResolver) {
|
||||||
|
|
||||||
TriggerWaveform * ts = &engine->triggerCentral.triggerShape;
|
TriggerWaveform * ts = &engine->triggerCentral.triggerShape;
|
||||||
TriggerFormDetails *triggerFormDetails = &engine->triggerCentral.triggerFormDetails;
|
TriggerFormDetails *triggerFormDetails = &engine->triggerCentral.triggerFormDetails;
|
||||||
engine->initializeTriggerWaveform();
|
engine->updateTriggerWaveform();
|
||||||
|
|
||||||
assertEqualsM("index 2", 52.76, triggerFormDetails->eventAngles[3]); // this angle is relation to synch point
|
assertEqualsM("index 2", 52.76, triggerFormDetails->eventAngles[3]); // this angle is relation to synch point
|
||||||
assertEqualsM("time 2", 0.3233, ts->wave.getSwitchTime(2));
|
assertEqualsM("time 2", 0.3233, ts->wave.getSwitchTime(2));
|
||||||
|
|
|
@ -62,7 +62,7 @@ TEST_P(AllTriggersFixture, TestTrigger) {
|
||||||
|
|
||||||
TriggerWaveform *shape = &engine->triggerCentral.triggerShape;
|
TriggerWaveform *shape = &engine->triggerCentral.triggerShape;
|
||||||
TriggerFormDetails *triggerFormDetails = &engine->triggerCentral.triggerFormDetails;
|
TriggerFormDetails *triggerFormDetails = &engine->triggerCentral.triggerFormDetails;
|
||||||
engine->initializeTriggerWaveform();
|
engine->updateTriggerWaveform();
|
||||||
|
|
||||||
ASSERT_FALSE(shape->shapeDefinitionError) << "Trigger shapeDefinitionError";
|
ASSERT_FALSE(shape->shapeDefinitionError) << "Trigger shapeDefinitionError";
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue