diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index d150062d0e..d6841f0762 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 Tue Jul 25 20:21:45 EDT 2017 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Jul 31 14:44:23 EDT 2017 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -1583,7 +1583,15 @@ typedef struct { /** * offset 2168 */ - float unusedalternatorControl[4]; + int16_t afterCrankingIACtaperDuration; + /** + * offset 2170 + */ + int16_t unusedShortHere; + /** + * offset 2172 + */ + float unusedalternatorControl[3]; /** * offset 2184 */ @@ -2131,4 +2139,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Jul 25 20:21:45 EDT 2017 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Jul 31 14:44:23 EDT 2017 diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index 3abedbe1b6..5b4fc43615 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -1116,8 +1116,12 @@ #define alternatorOffAboveTps_offset_hex 870 #define startOfCrankingPrimingPulse_offset 2164 #define startOfCrankingPrimingPulse_offset_hex 874 -#define unusedalternatorControl_offset 2168 -#define unusedalternatorControl_offset_hex 878 +#define afterCrankingIACtaperDuration_offset 2168 +#define afterCrankingIACtaperDuration_offset_hex 878 +#define unusedShortHere_offset 2170 +#define unusedShortHere_offset_hex 87a +#define unusedalternatorControl_offset 2172 +#define unusedalternatorControl_offset_hex 87c #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 efeccabd82..63c8f627a6 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -721,7 +721,10 @@ custom pin_mode_e 4 bits, U32, @OFFSET@, [0:5], @@pin_mode_e_enum@@ float targetVBatt;set targetvbatt VOLTS;"Volts", 1, 0, 0,30, 1 float alternatorOffAboveTps;Turn off alternator output above specified TPS;"%", 1, 0, 0, 200, 2 float startOfCrankingPrimingPulse;;"ms", 1, 0, 0, 200, 1 - float[4] unusedalternatorControl; + int16_t afterCrankingIACtaperDuration;;"cycles", 1, 0, 0, 5000, 0 + int16_t unusedShortHere;;"seconds", 1, 0, 0, 6000, 0 + + float[3] unusedalternatorControl; int tpsAccelLength;;"cycles", 1, 0, 1, 200, 0 float tpsAccelEnrichmentThreshold;;"roc", 1, 0, 0, 200, 3 diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 3fe400c0c8..5a757d9de7 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 Wed Jul 26 20:23:40 EDT 2017 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Jul 31 14:44:23 EDT 2017 pageSize = 16376 page = 1 @@ -573,7 +573,9 @@ page = 1 targetVBatt = scalar, F32, 2156, "Volts", 1, 0, 0,30, 1 alternatorOffAboveTps = scalar, F32, 2160, "%", 1, 0, 0, 200, 2 startOfCrankingPrimingPulse = scalar, F32, 2164, "ms", 1, 0, 0, 200, 1 -;skipping unusedalternatorControl offset 2168 + afterCrankingIACtaperDuration = scalar, S16, 2168, "cycles", 1, 0, 0, 5000, 0 + unusedShortHere = scalar, S16, 2170, "seconds", 1, 0, 0, 6000, 0 +;skipping unusedalternatorControl offset 2172 tpsAccelLength = scalar, S32, 2184, "cycles", 1, 0, 1, 200, 0 tpsAccelEnrichmentThreshold = scalar, F32, 2188, "roc", 1, 0, 0, 200, 3 vvtOffset = scalar, F32, 2192, "value", 1, 0, -720, 1000, 1 @@ -938,6 +940,7 @@ fileVersion = { 20161225 } knockEverIndicator=bits, U32, 72, [13:13], "true", "false"; knockNowIndicator=bits, U32, 72, [14:14], "true", "false"; brakePedalIndicator=bits, U32, 72, [15:15], "true", "false"; + toothLogReady =bits, U32, 72, [16:16], "true", "false"; vehicleSpeedKph = scalar, F32, 76, "kph", 1, 0.0; ind_tps_error = bits, U32, 80, [0:0], "true", "false"; @@ -2378,6 +2381,7 @@ cmd_stop_engine = "w\x00\x99\x00\x00" field = "" field = "enable Cylinder Cleanup", isCylinderCleanupEnabled field = "Startup fuel prime duration", startUpFuelPumpDuration + field = "After cranking IAC taper duration", afterCrankingIACtaperDuration dialog = EngineLoadAccelPanel, "Engine Load" diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 5679b327d0..02f3308305 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1621,6 +1621,7 @@ cmd_stop_engine = "w\x00\x99\x00\x00" field = "" field = "enable Cylinder Cleanup", isCylinderCleanupEnabled field = "Startup fuel prime duration", startUpFuelPumpDuration + field = "After cranking IAC taper duration", afterCrankingIACtaperDuration dialog = EngineLoadAccelPanel, "Engine Load" diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java index 85f15ca61b..8efd1cfcaa 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 Tue Jul 25 20:21:45 EDT 2017 +// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Jul 31 14:44:23 EDT 2017 public class Fields { public static final int LE_COMMAND_LENGTH = 200; public static final int BLOCKING_FACTOR = 400; @@ -811,8 +811,10 @@ public class Fields { public static final int alternatorOffAboveTps_offset_hex = 870; public static final int startOfCrankingPrimingPulse_offset = 2164; public static final int startOfCrankingPrimingPulse_offset_hex = 874; - public static final int unusedalternatorControl_offset = 2168; - public static final int unusedalternatorControl_offset_hex = 878; + 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 tpsAccelLength_offset = 2184; public static final int tpsAccelLength_offset_hex = 888; public static final int tpsAccelEnrichmentThreshold_offset = 2188; @@ -1609,6 +1611,8 @@ public class Fields { 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 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 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);