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

Trigger setup in TS is highly confusing: hide operation mode from users? #4031

This commit is contained in:
Andrey 2022-04-03 00:43:28 -04:00
parent 95d36b37e3
commit 6aa948a666
9 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/config/boards/prometheus/board_configuration.cpp
View File

@ -17,7 +17,7 @@ static bool is469 = false;
static void setPrometheusDefaults() { static void setPrometheusDefaults() {
setOperationMode(engineConfiguration, FOUR_STROKE_CRANK_SENSOR/*FOUR_STROKE_CAM_SENSOR*/); setCrankOperationMode(engineConfiguration);
engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2;
//engineConfiguration->useOnlyRisingEdgeForTrigger = true; //engineConfiguration->useOnlyRisingEdgeForTrigger = true;
setAlgorithm(LM_SPEED_DENSITY); setAlgorithm(LM_SPEED_DENSITY);

2
firmware/config/engines/ford_1995_inline_6.cpp
View File

@ -23,7 +23,7 @@ void setFordInline6() {
engineConfiguration->specs.cylindersCount = 6; engineConfiguration->specs.cylindersCount = 6;
setOperationMode(engineConfiguration, FOUR_STROKE_CAM_SENSOR); setCamOperationMode(engineConfiguration);
engineConfiguration->ignitionMode = IM_ONE_COIL; engineConfiguration->ignitionMode = IM_ONE_COIL;
engineConfiguration->specs.firingOrder = FO_1_5_3_6_2_4; engineConfiguration->specs.firingOrder = FO_1_5_3_6_2_4;

1
firmware/config/engines/sachs.cpp
View File

@ -18,6 +18,7 @@ void setSachs() {
engineConfiguration->specs.displacement = 0.1; // 100cc engineConfiguration->specs.displacement = 0.1; // 100cc
engineConfiguration->specs.cylindersCount = 1; engineConfiguration->specs.cylindersCount = 1;
engineConfiguration->twoStroke = true;
setOperationMode(engineConfiguration, TWO_STROKE); setOperationMode(engineConfiguration, TWO_STROKE);
engineConfiguration->specs.firingOrder = FO_1; engineConfiguration->specs.firingOrder = FO_1;
engineConfiguration->engineChartSize = 400; engineConfiguration->engineChartSize = 400;

2
firmware/config/engines/subaru.cpp
View File

@ -66,7 +66,7 @@ void setSubaruEJ18_MRE() {
*/ */
void setSubaruEG33Defaults() { void setSubaruEG33Defaults() {
setOperationMode(engineConfiguration, FOUR_STROKE_CAM_SENSOR); setCamOperationMode(engineConfiguration);
engineConfiguration->trigger.type = TT_SUBARU_SVX; engineConfiguration->trigger.type = TT_SUBARU_SVX;
engineConfiguration->useOnlyRisingEdgeForTrigger = true; engineConfiguration->useOnlyRisingEdgeForTrigger = true;

2
firmware/config/engines/toyota_jzs147.cpp
View File

@ -70,7 +70,7 @@ static void common2jz() {
void setToyota_jzs147EngineConfiguration() { void setToyota_jzs147EngineConfiguration() {
common2jz(); common2jz();
setOperationMode(engineConfiguration, FOUR_STROKE_CAM_SENSOR); setCamOperationMode(engineConfiguration);
engineConfiguration->trigger.type = TT_2JZ_1_12; engineConfiguration->trigger.type = TT_2JZ_1_12;
//// temporary while I am fixing trigger bug //// temporary while I am fixing trigger bug

3
firmware/controllers/algo/defaults/default_base_engine.cpp
View File

@ -35,8 +35,7 @@ void setDefaultBaseEngine() {
// Trigger // Trigger
engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2;
// huh WAT? our default is skipped on CAM?! and *many* our tests are relying on that?! // huh WAT? our default is skipped on CAM?! and *many* our tests are relying on that?!
setOperationMode(engineConfiguration, FOUR_STROKE_CAM_SENSOR); setCamOperationMode(engineConfiguration);
engineConfiguration->skippedWheelOnCam = true;
engineConfiguration->useOnlyRisingEdgeForTrigger = false; engineConfiguration->useOnlyRisingEdgeForTrigger = false;
engineConfiguration->globalTriggerAngleOffset = 0; engineConfiguration->globalTriggerAngleOffset = 0;

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

@ -1178,8 +1178,14 @@ void setOperationMode(engine_configuration_s *engineConfiguration, operation_mod
engineConfiguration->ambiguousOperationMode = mode; engineConfiguration->ambiguousOperationMode = mode;
} }
void setCamOperationMode(engine_configuration_s *engineConfiguration) {
engineConfiguration->ambiguousOperationMode = FOUR_STROKE_CAM_SENSOR;
engineConfiguration->skippedWheelOnCam = true;
}
void setCrankOperationMode(engine_configuration_s *engineConfiguration) { void setCrankOperationMode(engine_configuration_s *engineConfiguration) {
engineConfiguration->ambiguousOperationMode = FOUR_STROKE_CRANK_SENSOR; engineConfiguration->ambiguousOperationMode = FOUR_STROKE_CRANK_SENSOR;
engineConfiguration->skippedWheelOnCam = false;
} }
void commonFrankensoAnalogInputs(engine_configuration_s *engineConfiguration) { void commonFrankensoAnalogInputs(engine_configuration_s *engineConfiguration) {

1
firmware/controllers/algo/engine_configuration.h
View File

@ -23,6 +23,7 @@
void setOperationMode(engine_configuration_s *engineConfiguration, operation_mode_e mode); void setOperationMode(engine_configuration_s *engineConfiguration, operation_mode_e mode);
void setCrankOperationMode(engine_configuration_s *engineConfiguration); void setCrankOperationMode(engine_configuration_s *engineConfiguration);
void setCamOperationMode(engine_configuration_s *engineConfiguration);
void prepareVoidConfiguration(engine_configuration_s *activeConfiguration); void prepareVoidConfiguration(engine_configuration_s *activeConfiguration);
void setTargetRpmCurve(int rpm); void setTargetRpmCurve(int rpm);

6
firmware/controllers/settings.cpp
View File

@ -202,11 +202,6 @@ static void setSensorChartMode(int value) {
doPrintConfiguration(); doPrintConfiguration();
} }
static void setOperationMode(int value) {
engineConfiguration->ambiguousOperationMode = (operation_mode_e)value;
doPrintConfiguration();
}
static void printTpsSenser(const char *msg, SensorType sensor, int16_t min, int16_t max, adc_channel_e channel) { static void printTpsSenser(const char *msg, SensorType sensor, int16_t min, int16_t max, adc_channel_e channel) {
auto tps = Sensor::get(sensor); auto tps = Sensor::get(sensor);
auto raw = Sensor::getRaw(sensor); auto raw = Sensor::getRaw(sensor);
@ -1068,7 +1063,6 @@ const command_i_s commandsI[] = {{"ignition_mode", setIgnitionMode},
{"idle_pin_mode", setIdlePinMode}, {"idle_pin_mode", setIdlePinMode},
{"fuel_pump_pin_mode", setFuelPumpPinMode}, {"fuel_pump_pin_mode", setFuelPumpPinMode},
{"malfunction_indicator_pin_mode", setMalfunctionIndicatorPinMode}, {"malfunction_indicator_pin_mode", setMalfunctionIndicatorPinMode},
{"operation_mode", setOperationMode},
{"debug_mode", setDebugMode}, {"debug_mode", setDebugMode},
{"trigger_type", setTriggerType}, {"trigger_type", setTriggerType},
{"idle_solenoid_freq", setIdleSolenoidFrequency}, {"idle_solenoid_freq", setIdleSolenoidFrequency},