From fc32f3930c80d0f04bd2a52dbc21198075e8bd1d Mon Sep 17 00:00:00 2001 From: rusefi Date: Sat, 15 Jul 2017 15:24:06 -0400 Subject: [PATCH] #4 --- .../algo/engine_configuration_generated_structures.h | 7 ++++--- firmware/controllers/algo/rusefi_generated.h | 4 ++-- firmware/integration/rusefi_config.txt | 2 +- firmware/tunerstudio/rusefi.ini | 5 +++-- firmware/tunerstudio/rusefi.input | 1 + java_console/models/src/com/rusefi/config/Fields.java | 6 +++--- 6 files changed, 14 insertions(+), 11 deletions(-) diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index c00e69581f..cd211bb5e3 100644 --- a/firmware/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Jun 26 09:15:23 MSK 2017 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Jul 15 15:20:22 EDT 2017 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -1553,9 +1553,10 @@ typedef struct { */ int16_t startUpFuelPumpDuration; /** + * If RPM is close enough let's leave IAC alone * offset 2026 */ - int16_t unusedetb; + int16_t iacRPMErrorThreshold; /** * CLT-based target RPM for automatic idle controller * offset 2028 @@ -2126,4 +2127,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Jun 26 09:15:23 MSK 2017 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Jul 15 15:20:22 EDT 2017 diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index ace2616127..2f9c0d0899 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -1104,8 +1104,8 @@ #define stepperDirectionPinMode_offset_hex 7e4 #define startUpFuelPumpDuration_offset 2024 #define startUpFuelPumpDuration_offset_hex 7e8 -#define unusedetb_offset 2026 -#define unusedetb_offset_hex 7ea +#define iacRPMErrorThreshold_offset 2026 +#define iacRPMErrorThreshold_offset_hex 7ea #define cltIdleRpmBins_offset 2028 #define cltIdleRpmBins_offset_hex 7ec #define cltIdleRpm_offset 2092 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index e2c8bf9e3b..f5d46ae996 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -712,7 +712,7 @@ custom pin_mode_e 4 bits, U32, @OFFSET@, [0:5], @@pin_mode_e_enum@@ pin_output_mode_e stepperDirectionPinMode; int16_t startUpFuelPumpDuration;;"seconds", 1, 0, 0, 6000, 0 - int16_t unusedetb;;"C", 1, 0, 0, 100, 0 + int16_t iacRPMErrorThreshold;If RPM is close enough let's leave IAC alone;"C", 1, 0, 0, 1000, 0 float[CLT_CURVE_SIZE] cltIdleRpmBins;CLT-based target RPM for automatic idle controller;"C", 1, 0, -100.0, 250.0, 2 diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index ecb3f28411..6539bda03b 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -59,7 +59,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Jul 01 11:50:40 MSK 2017 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Jul 15 15:20:22 EDT 2017 pageSize = 16376 page = 1 @@ -567,7 +567,7 @@ page = 1 throttlePedalWOTVoltage = scalar, F32, 2016, "voltage", 1, 0, -6, 6, 2 stepperDirectionPinMode = bits, U32, 2020, [0:1], "default", "default inverted", "open collector", "open collector inverted" startUpFuelPumpDuration = scalar, S16, 2024, "seconds", 1, 0, 0, 6000, 0 - unusedetb = scalar, S16, 2026, "C", 1, 0, 0, 100, 0 + iacRPMErrorThreshold = scalar, S16, 2026, "C", 1, 0, 0, 1000, 0 cltIdleRpmBins = array, F32, 2028, [16], "C", 1, 0, -100.0, 250.0, 2 cltIdleRpm = array, F32, 2092, [16], "RPM", 1, 0, 0.0, 400.0, 0 targetVBatt = scalar, F32, 2156, "Volts", 1, 0, 0,30, 1 @@ -2080,6 +2080,7 @@ cmd_call_from_pit = "w\x00\x20\x34\x56" field = "pid min", idleRpmPid_minValue, { idleMode == 0} field = "pid max", idleRpmPid_maxValue, { idleMode == 0} field = "pid TPS deactivation", idlePidDeactivationTpsThreshold, { idleMode == 0} + field = "RPM error to deactivate IAC pid", iacRPMErrorThreshold, { idleMode == 0} field = "verbose", isVerboseIAC slider = "Manual Idle Position", manIdlePosition, horizontal field = "" diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index d53488c544..19492f1279 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1314,6 +1314,7 @@ cmd_call_from_pit = "w\x00\x20\x34\x56" field = "pid min", idleRpmPid_minValue, { idleMode == 0} field = "pid max", idleRpmPid_maxValue, { idleMode == 0} field = "pid TPS deactivation", idlePidDeactivationTpsThreshold, { idleMode == 0} + field = "RPM error to deactivate IAC pid", iacRPMErrorThreshold, { idleMode == 0} field = "verbose", isVerboseIAC slider = "Manual Idle Position", manIdlePosition, horizontal field = "" diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java index 8395d9f277..7c1cdfb6ea 100644 --- a/java_console/models/src/com/rusefi/config/Fields.java +++ b/java_console/models/src/com/rusefi/config/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config; -// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Jun 26 09:15:23 MSK 2017 +// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Jul 15 15:20:22 EDT 2017 public class Fields { public static final int LE_COMMAND_LENGTH = 200; public static final int BLOCKING_FACTOR = 400; @@ -803,7 +803,7 @@ public class Fields { public static final int throttlePedalWOTVoltage_offset = 2016; public static final int stepperDirectionPinMode_offset = 2020; public static final int startUpFuelPumpDuration_offset = 2024; - public static final int unusedetb_offset = 2026; + public static final int iacRPMErrorThreshold_offset = 2026; public static final int cltIdleRpmBins_offset = 2028; public static final int cltIdleRpm_offset = 2092; public static final int targetVBatt_offset = 2156; @@ -1593,7 +1593,7 @@ public class Fields { public static final Field THROTTLEPEDALWOTVOLTAGE = Field.create("THROTTLEPEDALWOTVOLTAGE", 2016, FieldType.FLOAT); public static final Field STEPPERDIRECTIONPINMODE = Field.create("STEPPERDIRECTIONPINMODE", 2020, FieldType.INT, pin_output_mode_e); public static final Field STARTUPFUELPUMPDURATION = Field.create("STARTUPFUELPUMPDURATION", 2024, FieldType.INT); - public static final Field UNUSEDETB = Field.create("UNUSEDETB", 2026, FieldType.INT); + public static final Field IACRPMERRORTHRESHOLD = Field.create("IACRPMERRORTHRESHOLD", 2026, FieldType.INT); public static final Field TARGETVBATT = Field.create("TARGETVBATT", 2156, FieldType.FLOAT); public static final Field ALTERNATOROFFABOVETPS = Field.create("ALTERNATOROFFABOVETPS", 2160, FieldType.FLOAT); public static final Field TPSACCELLENGTH = Field.create("TPSACCELLENGTH", 2184, FieldType.INT);