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

auto-sync

This commit is contained in:
rusEfi 2015-04-13 00:04:32 -05:00
parent f89a6e404f
commit 271b5a6639
4 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
firmware/config/engines/test_engine.cpp
View File

@ -13,7 +13,9 @@
EXTERN_ENGINE;
void setTestEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
setOperationMode(engineConfiguration, FOUR_STROKE_CRANK_SENSOR);
// engineConfiguration->trigger.type = TT_TOOTHED_WHEEL;
engineConfiguration->trigger.type = TT_ONE_PLUS_ONE;
trigger_config_s *triggerConfig = &engineConfiguration->trigger;
@ -21,7 +23,6 @@ void setTestEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
triggerConfig->customSkippedToothCount = 0;
engineConfiguration->useOnlyFrontForTrigger = true;
setOperationMode(engineConfiguration, FOUR_STROKE_CRANK_SENSOR);
engineConfiguration->ignitionMode = IM_ONE_COIL;
setConstantDwell(3 PASS_ENGINE_PARAMETER); // 50% duty cycle @ 5000 rpm

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

@ -724,6 +724,9 @@ void resetConfigurationExt(Logging * logger, engine_type_e engineType DECLARE_EN
default:
firmwareError("Unexpected engine type: %d", engineType);
}
// todo: eliminate triggerShape.operationMode?
if (engineConfiguration->operationMode != engine->triggerShape.getOperationMode())
firmwareError("operationMode mismatch");
applyNonPersistentConfiguration(logger PASS_ENGINE_PARAMETER);
#if EFI_TUNER_STUDIO

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

@ -203,6 +203,10 @@ void TriggerShape::addEvent(float angle, trigger_wheel_e const waveIndex, trigge
addEvent(angle, waveIndex, stateParam);
}
operation_mode_e TriggerShape::getOperationMode() {
return operationMode;
}
void TriggerShape::addEvent(float angle, trigger_wheel_e const waveIndex, trigger_value_e const stateParam) {
efiAssertVoid(operationMode != OM_NONE, "operationMode not set");

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

@ -90,6 +90,7 @@ public:
void addEvent(float angle, trigger_wheel_e const waveIndex, trigger_value_e const state);
void addEvent(float angle, trigger_wheel_e const waveIndex, trigger_value_e const stateParam, float filterLeft, float filterRight);
operation_mode_e getOperationMode();
// todo: these two methods here, something could be improved
void clear();