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

Override trigger gaps feature #2734

This commit is contained in:
rusefillc 2021-10-30 10:45:32 -04:00
parent 28edebb4a3
commit c62fedbe34
4 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -150,8 +150,9 @@ void Engine::initializeTriggerWaveform(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
if (CONFIG(overrideTriggerGaps)) {
int gapIndex = 0;
for (;gapIndex<=CONFIG(overrideTriggerGaps);gapIndex++) {
float gapOverride = CONFIG(triggerGapOverride[gapIndex]);
TRIGGER_WAVEFORM(setTriggerSynchronizationGap3(/*gapIndex*/gapIndex, gapOverride * TRIGGER_GAP_DEVIATION_LOW, gapOverride * TRIGGER_GAP_DEVIATION_HIGH));
float gapOverrideFrom = CONFIG(triggerGapOverrideFrom[gapIndex]);
float gapOverrideTo = CONFIG(triggerGapOverrideTo[gapIndex]);
TRIGGER_WAVEFORM(setTriggerSynchronizationGap3(/*gapIndex*/gapIndex, gapOverrideFrom, gapOverrideTo));
}
for (;gapIndex<GAP_TRACKING_LENGTH;gapIndex++) {
ENGINE(triggerCentral.triggerShape).syncronizationRatioFrom[gapIndex] = NAN;

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

@ -791,8 +791,9 @@ void onConfigurationChangeTriggerCallback(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
changed |= isConfigurationChanged(vvtOffsets[camIndex]);
}
for (size_t i = 0; i < efi::size(CONFIG(triggerGapOverride)); i++) {
changed |= isConfigurationChanged(triggerGapOverride[i]);
for (size_t i = 0; i < efi::size(CONFIG(triggerGapOverrideFrom)); i++) {
changed |= isConfigurationChanged(triggerGapOverrideFrom[i]);
changed |= isConfigurationChanged(triggerGapOverrideTo[i]);
}
for (size_t i = 0; i < efi::size(CONFIG(triggerInputPins)); i++) {

5
firmware/integration/rusefi_config.txt
View File

@ -1476,11 +1476,12 @@ tChargeMode_e tChargeMode;
int8_t[IGN_RPM_COUNT] knockBaseNoise;;"dB", 1, 0, -30, 0, 2
float[GAP_TRACKING_LENGTH iterate] triggerGapOverride;;"ratio", 1, 0, 0, 20, 2
float[GAP_TRACKING_LENGTH iterate] triggerGapOverrideFrom;;"from", 1, 0, 0, 20, 2
int8_t[MAX_CYLINDER_COUNT iterate] fuelTrim;;"Percent", @@PERCENT_TRIM_BYTE_PACKING_DIV@@, 0, -25, 25, 2
int[344] mainUnusedEnd;;"units", 1, 0, -20, 100, 0
float[GAP_TRACKING_LENGTH iterate] triggerGapOverrideTo;;"to", 1, 0, 0, 20, 2
int[326] mainUnusedEnd;;"units", 1, 0, -20, 100, 0
! end of engine_configuration_s
end_struct

21
firmware/tunerstudio/rusefi.input
View File

@ -1919,14 +1919,19 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00"
commandButton = "Enable Trigger debug mode", cmd_test_debug_mode_trigger
field = "Override well known trigger gaps", overrideTriggerGaps
field = gapTrackingLengthOverride, gapTrackingLengthOverride, { overrideTriggerGaps == 1 }
field = "First gap", triggerGapOverride1, { overrideTriggerGaps == 1 }
field = "Second gap", triggerGapOverride2, { overrideTriggerGaps == 1 }
field = "Third gap", triggerGapOverride3, { overrideTriggerGaps == 1 }
field = "Gap #4", triggerGapOverride4, { overrideTriggerGaps == 1 }
field = "Gap #5", triggerGapOverride5, { overrideTriggerGaps == 1 }
field = "Gap #6", triggerGapOverride6, { overrideTriggerGaps == 1 }
field = "Gap #7", triggerGapOverride7, { overrideTriggerGaps == 1 }
field = "Gap #8", triggerGapOverride8, { overrideTriggerGaps == 1 }
field = "First gap from", triggerGapOverrideFrom1, { overrideTriggerGaps == 1 }
field = "First gap to", triggerGapOverrideTo1 , { overrideTriggerGaps == 1 }
field = "Second gap from", triggerGapOverrideFrom2, { overrideTriggerGaps == 1 }
field = "Second gap to", triggerGapOverrideTo2, { overrideTriggerGaps == 1 }
field = "Third gap from", triggerGapOverrideFrom3, { overrideTriggerGaps == 1 }
field = "Third gap to", triggerGapOverrideTo3, { overrideTriggerGaps == 1 }
field = "Gap #4 from", triggerGapOverrideFrom4, { overrideTriggerGaps == 1 }
field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 }
field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 }
field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 }
dialog = triggerConfiguration_IO, "Advanced Trigger"
field = "!https://rusefi.com/s/vvt"