only:rename method
This commit is contained in:
parent
0fe85fee51
commit
b418273e86
|
@ -122,14 +122,14 @@ trigger_type_e getVvtTriggerType(vvt_mode_e vvtMode) {
|
|||
}
|
||||
}
|
||||
|
||||
void Engine::updateTriggerWaveform() {
|
||||
void Engine::updateTriggerConfiguration() {
|
||||
|
||||
|
||||
#if EFI_ENGINE_CONTROL && EFI_SHAFT_POSITION_INPUT
|
||||
// we have a confusing threading model so some synchronization would not hurt
|
||||
chibios_rt::CriticalSectionLocker csl;
|
||||
|
||||
engine->triggerCentral.updateWaveform();
|
||||
engine->triggerCentral.applyShapesConfiguration();
|
||||
|
||||
|
||||
if (!engine->triggerCentral.triggerShape.shapeDefinitionError) {
|
||||
|
|
|
@ -313,7 +313,7 @@ public:
|
|||
void periodicSlowCallback();
|
||||
void updateSlowSensors();
|
||||
void updateSwitchInputs();
|
||||
void updateTriggerWaveform();
|
||||
void updateTriggerConfiguration();
|
||||
|
||||
bool isRunningPwmTest = false;
|
||||
|
||||
|
|
|
@ -713,7 +713,7 @@ void applyNonPersistentConfiguration() {
|
|||
#endif
|
||||
|
||||
#if EFI_ENGINE_CONTROL
|
||||
engine->updateTriggerWaveform();
|
||||
engine->updateTriggerConfiguration();
|
||||
#endif // EFI_ENGINE_CONTROL
|
||||
}
|
||||
|
||||
|
|
|
@ -273,7 +273,7 @@ void mainTriggerCallback(uint32_t trgEventIndex, efitick_t edgeTimestamp, angle_
|
|||
getIgnitionEvents()->isReady = false; // we need to rebuild complete ignition schedule
|
||||
getFuelSchedule()->isReady = false;
|
||||
// moved 'triggerIndexByAngle' into trigger initialization (why was it invoked from here if it's only about trigger shape & optimization?)
|
||||
// see updateTriggerWaveform() -> prepareOutputSignals()
|
||||
// see updateTriggerConfiguration() -> prepareOutputSignals()
|
||||
|
||||
// we need this to apply new 'triggerIndexByAngle' values
|
||||
engine->periodicFastCallback();
|
||||
|
|
|
@ -1030,7 +1030,7 @@ void onConfigurationChangeTriggerCallback() {
|
|||
|
||||
if (changed) {
|
||||
#if EFI_ENGINE_CONTROL
|
||||
engine->updateTriggerWaveform();
|
||||
engine->updateTriggerConfiguration();
|
||||
getTriggerCentral()->noiseFilter.resetAccumSignalData();
|
||||
#endif
|
||||
}
|
||||
|
@ -1085,7 +1085,7 @@ static void calculateTriggerSynchPoint(
|
|||
|
||||
TriggerDecoderBase initState("init");
|
||||
|
||||
void TriggerCentral::updateWaveform() {
|
||||
void TriggerCentral::applyShapesConfiguration() {
|
||||
// Re-read config in case it's changed
|
||||
primaryTriggerConfiguration.update();
|
||||
for (int camIndex = 0;camIndex < CAMS_PER_BANK;camIndex++) {
|
||||
|
|
|
@ -59,7 +59,7 @@ public:
|
|||
int getHwEventCounter(int index) const;
|
||||
void resetCounters();
|
||||
void validateCamVvtCounters();
|
||||
void updateWaveform();
|
||||
void applyShapesConfiguration();
|
||||
|
||||
angle_t findNextTriggerToothAngle(int nextToothIndex);
|
||||
|
||||
|
|
|
@ -427,7 +427,7 @@ void EngineTestHelper::assertEvent(const char *msg, int index, void *callback, e
|
|||
|
||||
|
||||
void EngineTestHelper::applyTriggerWaveform() {
|
||||
engine.updateTriggerWaveform();
|
||||
engine.updateTriggerConfiguration();
|
||||
|
||||
incrementGlobalConfigurationVersion("helper");
|
||||
}
|
||||
|
|
|
@ -134,7 +134,7 @@ TEST(misc, testAngleResolver) {
|
|||
|
||||
TriggerWaveform * ts = &engine->triggerCentral.triggerShape;
|
||||
TriggerFormDetails *triggerFormDetails = &engine->triggerCentral.triggerFormDetails;
|
||||
engine->updateTriggerWaveform();
|
||||
engine->updateTriggerConfiguration();
|
||||
|
||||
assertEqualsM("index 2", 52.76, triggerFormDetails->eventAngles[3]); // this angle is relation to synch point
|
||||
assertEqualsM("time 2", 0.3233, ts->wave.getSwitchTime(2));
|
||||
|
|
|
@ -77,7 +77,7 @@ extern TriggerDecoderBase initState;
|
|||
|
||||
TriggerWaveform *shape = &engine->triggerCentral.triggerShape;
|
||||
TriggerFormDetails *triggerFormDetails = &engine->triggerCentral.triggerFormDetails;
|
||||
engine->updateTriggerWaveform();
|
||||
engine->updateTriggerConfiguration();
|
||||
|
||||
ASSERT_FALSE(shape->shapeDefinitionError) << "Trigger shapeDefinitionError";
|
||||
|
||||
|
|
Loading…
Reference in New Issue