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

#625

This commit is contained in:
rusefi 2018-12-25 21:05:06 -05:00
parent d51fa71085
commit 2585e4cad7
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1332,7 +1332,7 @@ void applyNonPersistentConfiguration(Logging * logger DECLARE_ENGINE_PARAMETER_S
assertEngineReference(); assertEngineReference();
#if EFI_ENGINE_CONTROL || defined(__DOXYGEN__) #if EFI_ENGINE_CONTROL || defined(__DOXYGEN__)
TRIGGER_SHAPE(initializeTriggerShape(logger, engineConfiguration->useOnlyRisingEdgeForTrigger PASS_ENGINE_PARAMETER_SUFFIX)); ENGINE(initializeTriggerShape(logger PASS_ENGINE_PARAMETER_SUFFIX));
#endif #endif
#if EFI_FSIO || defined(__DOXYGEN__) #if EFI_FSIO || defined(__DOXYGEN__)

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

@ -468,7 +468,7 @@ void printAllTriggers() {
engineConfiguration->operationMode = FOUR_STROKE_CAM_SENSOR; engineConfiguration->operationMode = FOUR_STROKE_CAM_SENSOR;
TriggerShape *s = &engine->triggerCentral.triggerShape; TriggerShape *s = &engine->triggerCentral.triggerShape;
s->initializeTriggerShape(NULL, engineConfiguration->useOnlyRisingEdgeForTrigger PASS_ENGINE_PARAMETER_SUFFIX); engine->initializeTriggerShape(NULL PASS_ENGINE_PARAMETER_SUFFIX);
if (s->shapeDefinitionError) { if (s->shapeDefinitionError) {
printf("Trigger error %d\r\n", triggerId); printf("Trigger error %d\r\n", triggerId);
@ -676,7 +676,7 @@ void onConfigurationChangeTriggerCallback(engine_configuration_s *previousConfig
assertEngineReference(); assertEngineReference();
#if EFI_ENGINE_CONTROL || defined(__DOXYGEN__) #if EFI_ENGINE_CONTROL || defined(__DOXYGEN__)
TRIGGER_SHAPE(initializeTriggerShape(logger, engineConfiguration->useOnlyRisingEdgeForTrigger PASS_ENGINE_PARAMETER_SUFFIX)); ENGINE(initializeTriggerShape(logger PASS_ENGINE_PARAMETER_SUFFIX));
engine->triggerCentral.resetAccumSignalData(); engine->triggerCentral.resetAccumSignalData();
#endif #endif
} }

4
unit_tests/engine_test_helper.cpp
View File

@ -64,7 +64,7 @@ EngineTestHelper::EngineTestHelper(engine_type_e engineType) : engine (&persiste
engine->updateSlowSensors(PASS_ENGINE_PARAMETER_SIGNATURE); engine->updateSlowSensors(PASS_ENGINE_PARAMETER_SIGNATURE);
prepareTimingMap(PASS_ENGINE_PARAMETER_SIGNATURE); prepareTimingMap(PASS_ENGINE_PARAMETER_SIGNATURE);
TRIGGER_SHAPE(initializeTriggerShape(NULL, engineConfiguration->useOnlyRisingEdgeForTrigger PASS_ENGINE_PARAMETER_SUFFIX)); engine->initializeTriggerShape(NULL PASS_ENGINE_PARAMETER_SUFFIX);
engine->triggerCentral.addEventListener(rpmShaftPositionCallback, "rpm reporter", engine); engine->triggerCentral.addEventListener(rpmShaftPositionCallback, "rpm reporter", engine);
engine->triggerCentral.addEventListener(mainTriggerCallback, "main loop", engine); engine->triggerCentral.addEventListener(mainTriggerCallback, "main loop", engine);
resetTriggerConfigChangedForUnitTest(); resetTriggerConfigChangedForUnitTest();
@ -121,7 +121,7 @@ void EngineTestHelper::applyTriggerShape() {
EXPAND_Engine EXPAND_Engine
TRIGGER_SHAPE(initializeTriggerShape(NULL, engineConfiguration->useOnlyRisingEdgeForTrigger PASS_ENGINE_PARAMETER_SUFFIX)); ENGINE(initializeTriggerShape(NULL PASS_ENGINE_PARAMETER_SUFFIX));
incrementGlobalConfigurationVersion(PASS_ENGINE_PARAMETER_SIGNATURE); incrementGlobalConfigurationVersion(PASS_ENGINE_PARAMETER_SIGNATURE);
} }

2
unit_tests/test_fuel_map.cpp
View File

@ -170,7 +170,7 @@ void testAngleResolver(void) {
engineConfiguration->globalTriggerAngleOffset = 175; engineConfiguration->globalTriggerAngleOffset = 175;
TriggerShape * ts = &engine->triggerCentral.triggerShape; TriggerShape * ts = &engine->triggerCentral.triggerShape;
ts->initializeTriggerShape(NULL, engineConfiguration->useOnlyRisingEdgeForTrigger PASS_ENGINE_PARAMETER_SUFFIX); engine->initializeTriggerShape(NULL PASS_ENGINE_PARAMETER_SUFFIX);
assertEqualsM("index 2", 52.76, ts->eventAngles[3]); // this angle is relation to synch point assertEqualsM("index 2", 52.76, ts->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));