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

auto-sync

This commit is contained in:
rusEfi 2016-02-06 17:01:38 -05:00
parent 5e88186f5c
commit eeec275bc6
6 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -235,7 +235,7 @@ void setDodgeNeonNGCEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
setFrankenso_01_LCD(boardConfiguration); setFrankenso_01_LCD(boardConfiguration);
setFrankenso0_1_joystick(engineConfiguration); setFrankenso0_1_joystick(engineConfiguration);
// set_whole_timing_map 10 boardConfiguration->useWarmupPidAfr = true;
// set_global_trigger_offset_angle 38 // set_global_trigger_offset_angle 38
engineConfiguration->globalTriggerAngleOffset = 38; engineConfiguration->globalTriggerAngleOffset = 38;

4
firmware/console/status_loop.cpp
View File

@ -176,7 +176,7 @@ static void printSensors(Logging *log, bool fileFormat) {
reportSensorF(log, fileFormat, "baro", "kPa", getBaroPressure(), 2); reportSensorF(log, fileFormat, "baro", "kPa", getBaroPressure(), 2);
} }
if (engineConfiguration->hasAfrSensor) { if (engineConfiguration->hasAfrSensor) {
reportSensorF(log, fileFormat, "afr", "AFR", getAfr(), 2); reportSensorF(log, fileFormat, "afr", "AFR", getAfr(PASS_ENGINE_PARAMETER_F), 2);
} }
#endif #endif
@ -580,7 +580,7 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_
tsOutputChannels->veValue = veMap.getValue(getMap(), rpm); tsOutputChannels->veValue = veMap.getValue(getMap(), rpm);
tsOutputChannels->currentTargetAfr = afrMap.getValue(getMap(), rpm); tsOutputChannels->currentTargetAfr = afrMap.getValue(getMap(), rpm);
tsOutputChannels->airFuelRatio = getAfr(); tsOutputChannels->airFuelRatio = getAfr(PASS_ENGINE_PARAMETER_F);
if (hasVBatt(PASS_ENGINE_PARAMETER_F)) { if (hasVBatt(PASS_ENGINE_PARAMETER_F)) {
tsOutputChannels->vBatt = getVBatt(PASS_ENGINE_PARAMETER_F); tsOutputChannels->vBatt = getVBatt(PASS_ENGINE_PARAMETER_F);
} }

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

@ -140,6 +140,9 @@ void EngineState::periodicFastCallback(DECLARE_ENGINE_PARAMETER_F) {
iatFuelCorrection = getIatCorrection(iat PASS_ENGINE_PARAMETER); iatFuelCorrection = getIatCorrection(iat PASS_ENGINE_PARAMETER);
if (boardConfiguration->useWarmupPidAfr && clt < 80) { if (boardConfiguration->useWarmupPidAfr && clt < 80) {
if (rpm < 200)
warmupAfrPid.reset();
cltFuelCorrection = 1 + warmupAfrPid.getValue(13, getAfr(PASS_ENGINE_PARAMETER_F), 1);
} else { } else {
cltFuelCorrection = getCltCorrection(clt PASS_ENGINE_PARAMETER); cltFuelCorrection = getCltCorrection(clt PASS_ENGINE_PARAMETER);

1
firmware/controllers/engine_controller.cpp
View File

@ -249,6 +249,7 @@ static void periodicSlowCallback(Engine *engine) {
engine->configurationListeners.invokeJustArgCallbacks(); engine->configurationListeners.invokeJustArgCallbacks();
// todo: convert to a callback? // todo: convert to a callback?
updateAccelParameters(); updateAccelParameters();
engine->engineState.warmupAfrPid.reset();
} }
engine->watchdog(); engine->watchdog();

2
firmware/integration/rusefi_config.txt
View File

@ -81,7 +81,7 @@ float baseFuel;;"ms", 1, 0, 0, 200, 1
int16_t rpm;This value controls what RPM values we consider 'cranking' (any RPM below 'crankingRpm')\nAnything above 'crankingRpm' would be 'running';"RPM", 1, 0, 0, 3000, 0 int16_t rpm;This value controls what RPM values we consider 'cranking' (any RPM below 'crankingRpm')\nAnything above 'crankingRpm' would be 'running';"RPM", 1, 0, 0, 3000, 0
end_struct end_struct
#define debug_mode_e_enum "ALTERNATOR", "TPS_ACCEL", "mode2", "mode3" #define debug_mode_e_enum "ALTERNATOR", "TPS_ACCEL", "WARMUP_PID", "mode3"
custom debug_mode_e 4 bits, U32, @OFFSET@, [0:1], @@debug_mode_e_enum@@ custom debug_mode_e 4 bits, U32, @OFFSET@, [0:1], @@debug_mode_e_enum@@

2
firmware/tunerstudio/rusefi.ini
View File

@ -1404,7 +1404,7 @@ fileVersion = { 20160122 }
field = "wa I factor", warmupAfrPid_iFactor field = "wa I factor", warmupAfrPid_iFactor
field = "wa D factor", warmupAfrPid_dFactor field = "wa D factor", warmupAfrPid_dFactor
field = "useWarmupPidAfr", useWarmupPidAfr field = "useWarmupPidAfr", useWarmupPidAfr
field = "debugMode", debugMode
dialog = energySystems, "Battery and Alternator Settings", yAxis dialog = energySystems, "Battery and Alternator Settings", yAxis