From 55c8b58d13f46a6189b4971ac0de093a70266e4a Mon Sep 17 00:00:00 2001 From: rusEfi Date: Mon, 24 Aug 2015 01:01:28 -0400 Subject: [PATCH] auto-sync --- firmware/controllers/algo/accel_enrichment.cpp | 7 ++++++- java_console/ui/src/com/rusefi/ui/SettingsTab.java | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/firmware/controllers/algo/accel_enrichment.cpp b/firmware/controllers/algo/accel_enrichment.cpp index d9712baf7f..4ec2ba94c5 100644 --- a/firmware/controllers/algo/accel_enrichment.cpp +++ b/firmware/controllers/algo/accel_enrichment.cpp @@ -39,9 +39,12 @@ WallFuel::WallFuel() { } floatms_t WallFuel::adjust(int injectorIndex, floatms_t target DECLARE_ENGINE_PARAMETER_S) { + if (cisnan(target)) { + return target; + } float addedToWallCoef = engineConfiguration->addedToWallCoef; - floatms_t suckedOffWallsAmount = 0;//wallFuel[injectorIndex] * engineConfiguration->suckedOffCoef; + floatms_t suckedOffWallsAmount = wallFuel[injectorIndex] * engineConfiguration->suckedOffCoef; floatms_t result = (target - suckedOffWallsAmount) / (1 - addedToWallCoef); @@ -114,6 +117,8 @@ static void accelInfo() { // scheduleMsg(logger, "TPS accel length=%d", tpsInstance.cb.getSize()); scheduleMsg(logger, "TPS accel th=%f/mult=%f", engineConfiguration->tpsAccelEnrichmentThreshold, engineConfiguration->tpsAccelEnrichmentMultiplier); + + scheduleMsg(logger, "added to wall=%f/sucked=%f", engineConfiguration->addedToWallCoef, engineConfiguration->suckedOffCoef); } static void setMapAccelThr(float value) { diff --git a/java_console/ui/src/com/rusefi/ui/SettingsTab.java b/java_console/ui/src/com/rusefi/ui/SettingsTab.java index e8334cd6ab..9efdd81fc4 100644 --- a/java_console/ui/src/com/rusefi/ui/SettingsTab.java +++ b/java_console/ui/src/com/rusefi/ui/SettingsTab.java @@ -65,6 +65,9 @@ public class SettingsTab { panel.add(UiUtils.wrap(new ConfigField(Fields.IGNITIONOFFSET, "Ignition offset").getContent())); panel.add(UiUtils.wrap(new ConfigField(Fields.CRANKINGTIMINGANGLE, "Cranking timing").getContent())); + panel.add(UiUtils.wrap(new ConfigField(Fields.ADDEDTOWALLCOEF, "Added to wall").getContent())); + panel.add(UiUtils.wrap(new ConfigField(Fields.SUCKEDOFFCOEF, "Sucked off wall").getContent())); + panel.add(UiUtils.wrap(RecentCommands.createButton(new AtomicBoolean(), "writeconfig"))); content.add(panel);