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

deep rabbit holes are the best ones! 

refactoring: encapsulation
This commit is contained in:
Andrey 2022-09-14 02:45:31 -04:00
parent 0e91914266
commit 0c87bb7260
3 changed files with 68 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,75 +100,17 @@ trigger_type_e getVvtTriggerType(vvt_mode_e vvtMode) {
}
}
static void initVvtShape(TriggerWaveform& shape, const TriggerConfiguration& config, TriggerDecoderBase &initState) {
shape.initializeTriggerWaveform(FOUR_STROKE_CAM_SENSOR, config);
shape.initializeSyncPoint(initState, config);
}
void Engine::updateTriggerWaveform() {
static TriggerDecoderBase initState("init");
// Re-read config in case it's changed
triggerCentral.primaryTriggerConfiguration.update();
for (int camIndex = 0;camIndex < CAMS_PER_BANK;camIndex++) {
triggerCentral.vvtTriggerConfiguration[camIndex].update();
}
#if EFI_ENGINE_CONTROL && EFI_SHAFT_POSITION_INPUT
// we have a confusing threading model so some synchronization would not hurt
chibios_rt::CriticalSectionLocker csl;
triggerCentral.triggerShape.initializeTriggerWaveform(lookupOperationMode(), triggerCentral.primaryTriggerConfiguration);
engine->triggerCentral.updateWaveform();
/**
* this is only useful while troubleshooting a new trigger shape in the field
* in very VERY rare circumstances
*/
if (engineConfiguration->overrideTriggerGaps) {
int gapIndex = 0;
// copy however many the user wants
for (; gapIndex < engineConfiguration->gapTrackingLengthOverride; gapIndex++) {
float gapOverrideFrom = engineConfiguration->triggerGapOverrideFrom[gapIndex];
float gapOverrideTo = engineConfiguration->triggerGapOverrideTo[gapIndex];
TRIGGER_WAVEFORM(setTriggerSynchronizationGap3(/*gapIndex*/gapIndex, gapOverrideFrom, gapOverrideTo));
}
// fill the remainder with the default gaps
for (; gapIndex < GAP_TRACKING_LENGTH; gapIndex++) {
engine->triggerCentral.triggerShape.syncronizationRatioFrom[gapIndex] = NAN;
engine->triggerCentral.triggerShape.syncronizationRatioTo[gapIndex] = NAN;
}
}
if (!TRIGGER_WAVEFORM(shapeDefinitionError)) {
/**
* 'initState' instance of TriggerDecoderBase is used only to initialize 'this' TriggerWaveform instance
* #192 BUG real hardware trigger events could be coming even while we are initializing trigger
*/
calculateTriggerSynchPoint(&engine->triggerCentral,
engine->triggerCentral.triggerShape,
initState);
engine->triggerCentral.engineCycleEventCount = engine->triggerCentral.triggerShape.getLength();
}
for (int camIndex = 0; camIndex < CAMS_PER_BANK; camIndex++) {
// todo: should 'vvtWithRealDecoder' be used here?
if (engineConfiguration->vvtMode[camIndex] != VVT_INACTIVE) {
initVvtShape(
triggerCentral.vvtShape[camIndex],
triggerCentral.vvtTriggerConfiguration[camIndex],
initState
);
}
}
// This is not the right place for this, but further refactoring has to happen before it can get moved.
engine->triggerCentral.triggerState.setNeedsDisambiguation(engine->triggerCentral.triggerShape.needsDisambiguation());
if (!TRIGGER_WAVEFORM(shapeDefinitionError)) {
if (!engine->triggerCentral.triggerShape.shapeDefinitionError) {
prepareOutputSignals();
}
#endif /* EFI_ENGINE_CONTROL && EFI_SHAFT_POSITION_INPUT */

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

@ -938,6 +938,71 @@ void onConfigurationChangeTriggerCallback() {
engine->triggerCentral.triggerConfigChanged = engine->triggerCentral.triggerConfigChanged || changed;
}
static void initVvtShape(TriggerWaveform& shape, const TriggerConfiguration& config, TriggerDecoderBase &initState) {
shape.initializeTriggerWaveform(FOUR_STROKE_CAM_SENSOR, config);
shape.initializeSyncPoint(initState, config);
}
void TriggerCentral::updateWaveform() {
static TriggerDecoderBase initState("init");
// Re-read config in case it's changed
primaryTriggerConfiguration.update();
for (int camIndex = 0;camIndex < CAMS_PER_BANK;camIndex++) {
vvtTriggerConfiguration[camIndex].update();
}
triggerShape.initializeTriggerWaveform(lookupOperationMode(), primaryTriggerConfiguration);
/**
* this is only useful while troubleshooting a new trigger shape in the field
* in very VERY rare circumstances
*/
if (engineConfiguration->overrideTriggerGaps) {
int gapIndex = 0;
// copy however many the user wants
for (; gapIndex < engineConfiguration->gapTrackingLengthOverride; gapIndex++) {
float gapOverrideFrom = engineConfiguration->triggerGapOverrideFrom[gapIndex];
float gapOverrideTo = engineConfiguration->triggerGapOverrideTo[gapIndex];
TRIGGER_WAVEFORM(setTriggerSynchronizationGap3(/*gapIndex*/gapIndex, gapOverrideFrom, gapOverrideTo));
}
// fill the remainder with the default gaps
for (; gapIndex < GAP_TRACKING_LENGTH; gapIndex++) {
triggerShape.syncronizationRatioFrom[gapIndex] = NAN;
triggerShape.syncronizationRatioTo[gapIndex] = NAN;
}
}
if (!triggerShape.shapeDefinitionError) {
/**
* 'initState' instance of TriggerDecoderBase is used only to initialize 'this' TriggerWaveform instance
* #192 BUG real hardware trigger events could be coming even while we are initializing trigger
*/
calculateTriggerSynchPoint(this,
triggerShape,
initState);
engineCycleEventCount = triggerShape.getLength();
}
for (int camIndex = 0; camIndex < CAMS_PER_BANK; camIndex++) {
// todo: should 'vvtWithRealDecoder' be used here?
if (engineConfiguration->vvtMode[camIndex] != VVT_INACTIVE) {
initVvtShape(
vvtShape[camIndex],
vvtTriggerConfiguration[camIndex],
initState
);
}
}
// This is not the right place for this, but further refactoring has to happen before it can get moved.
triggerState.setNeedsDisambiguation(engine->triggerCentral.triggerShape.needsDisambiguation());
}
/**
* @returns true if configuration just changed, and if that change has affected trigger
*/

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

@ -51,6 +51,7 @@ public:
int getHwEventCounter(int index) const;
void resetCounters();
void validateCamVvtCounters();
void updateWaveform();
// this is useful at least for real hardware integration testing - maybe a proper solution would be to simply
// GND input pins instead of leaving them floating