diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index 5994d6494a..bd7be886b0 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 Sun Aug 06 19:42:16 EDT 2017 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Aug 12 12:04:29 EDT 2017 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -1592,9 +1592,18 @@ typedef struct { */ int16_t unusedShortHere; /** + * Extra IAC, in percent between 0 and 100, tapered between zero and idle deactivation TPS value * offset 2172 */ - float unusedalternatorControl[3]; + int16_t iacByTpsTaper; + /** + * offset 2174 + */ + int16_t unusedShort; + /** + * offset 2176 + */ + float unusedalternatorControl[2]; /** * offset 2184 */ @@ -2145,4 +2154,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Aug 06 19:42:16 EDT 2017 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Aug 12 12:04:29 EDT 2017 diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index d856b8412b..bfee756f18 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -1120,8 +1120,12 @@ #define afterCrankingIACtaperDuration_offset_hex 878 #define unusedShortHere_offset 2170 #define unusedShortHere_offset_hex 87a -#define unusedalternatorControl_offset 2172 -#define unusedalternatorControl_offset_hex 87c +#define iacByTpsTaper_offset 2172 +#define iacByTpsTaper_offset_hex 87c +#define unusedShort_offset 2174 +#define unusedShort_offset_hex 87e +#define unusedalternatorControl_offset 2176 +#define unusedalternatorControl_offset_hex 880 #define tpsAccelLength_offset 2184 #define tpsAccelLength_offset_hex 888 #define tpsAccelEnrichmentThreshold_offset 2188 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 0be09c81ac..3089db3a56 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -724,7 +724,9 @@ custom pin_mode_e 4 bits, U32, @OFFSET@, [0:5], @@pin_mode_e_enum@@ int16_t afterCrankingIACtaperDuration;;"cycles", 1, 0, 0, 5000, 0 int16_t unusedShortHere;;"seconds", 1, 0, 0, 6000, 0 - float[3] unusedalternatorControl; + int16_t iacByTpsTaper;Extra IAC, in percent between 0 and 100, tapered between zero and idle deactivation TPS value;"percent", 1, 0, 0, 500, 0 + int16_t unusedShort; + float[2] unusedalternatorControl; int tpsAccelLength;;"cycles", 1, 0, 1, 200, 0 float tpsAccelEnrichmentThreshold;;"roc", 1, 0, 0, 200, 3 diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 0bfed7c499..80e78accac 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1327,6 +1327,7 @@ cmd_stop_engine = "w\x00\x99\x00\x00" 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 = "iacByTpsTaper", iacByTpsTaper; 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 80cced1672..2afd324123 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 Sun Aug 06 19:42:16 EDT 2017 +// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Aug 12 12:04:29 EDT 2017 public class Fields { public static final int LE_COMMAND_LENGTH = 200; public static final int BLOCKING_FACTOR = 400; @@ -814,7 +814,10 @@ public class Fields { public static final int afterCrankingIACtaperDuration_offset = 2168; public static final int afterCrankingIACtaperDuration_offset_hex = 878; public static final int unusedShortHere_offset = 2170; - public static final int unusedalternatorControl_offset = 2172; + public static final int iacByTpsTaper_offset = 2172; + public static final int unusedShort_offset = 2174; + public static final int unusedalternatorControl_offset = 2176; + public static final int unusedalternatorControl_offset_hex = 880; public static final int tpsAccelLength_offset = 2184; public static final int tpsAccelLength_offset_hex = 888; public static final int tpsAccelEnrichmentThreshold_offset = 2188; @@ -1616,6 +1619,8 @@ public class Fields { public static final Field STARTOFCRANKINGPRIMINGPULSE = Field.create("STARTOFCRANKINGPRIMINGPULSE", 2164, FieldType.FLOAT); public static final Field AFTERCRANKINGIACTAPERDURATION = Field.create("AFTERCRANKINGIACTAPERDURATION", 2168, FieldType.INT); public static final Field UNUSEDSHORTHERE = Field.create("UNUSEDSHORTHERE", 2170, FieldType.INT); + public static final Field IACBYTPSTAPER = Field.create("IACBYTPSTAPER", 2172, FieldType.INT); + public static final Field UNUSEDSHORT = Field.create("UNUSEDSHORT", 2174, FieldType.INT); public static final Field TPSACCELLENGTH = Field.create("TPSACCELLENGTH", 2184, FieldType.INT); public static final Field TPSACCELENRICHMENTTHRESHOLD = Field.create("TPSACCELENRICHMENTTHRESHOLD", 2188, FieldType.FLOAT); public static final Field VVTOFFSET = Field.create("VVTOFFSET", 2192, FieldType.FLOAT);