diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index dfb5b22e2f..793773a748 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -566,6 +566,9 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) { boardConfiguration->mapMinBufferLength = 1; + engineConfiguration->iacRPMErrorThreshold = 0; + engineConfiguration->startOfCrankingPrimingPulse = 0; + engineConfiguration->acCutoffLowRpm = 700; engineConfiguration->acCutoffHighRpm = 5000; diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index cd211bb5e3..d8adbf5559 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 Sat Jul 15 15:20:22 EDT 2017 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Jul 15 15:30:50 EDT 2017 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -1579,7 +1579,11 @@ typedef struct { /** * offset 2164 */ - float unusedalternatorControl[5]; + float startOfCrankingPrimingPulse; + /** + * offset 2168 + */ + float unusedalternatorControl[4]; /** * offset 2184 */ @@ -2127,4 +2131,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Jul 15 15:20:22 EDT 2017 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Jul 15 15:30:50 EDT 2017 diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index 2f9c0d0899..3fa74e3b42 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -1114,8 +1114,10 @@ #define targetVBatt_offset_hex 86c #define alternatorOffAboveTps_offset 2160 #define alternatorOffAboveTps_offset_hex 870 -#define unusedalternatorControl_offset 2164 -#define unusedalternatorControl_offset_hex 874 +#define startOfCrankingPrimingPulse_offset 2164 +#define startOfCrankingPrimingPulse_offset_hex 874 +#define unusedalternatorControl_offset 2168 +#define unusedalternatorControl_offset_hex 878 #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 f5d46ae996..f8c7c407ed 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -720,7 +720,8 @@ 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[5] unusedalternatorControl; + float startOfCrankingPrimingPulse;;"ms", 1, 0, 0, 200, 1 + float[4] 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 6539bda03b..3815ebee4c 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 15 15:20:22 EDT 2017 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Jul 15 15:30:50 EDT 2017 pageSize = 16376 page = 1 @@ -572,7 +572,8 @@ page = 1 cltIdleRpm = array, F32, 2092, [16], "RPM", 1, 0, 0.0, 400.0, 0 targetVBatt = scalar, F32, 2156, "Volts", 1, 0, 0,30, 1 alternatorOffAboveTps = scalar, F32, 2160, "%", 1, 0, 0, 200, 2 -;skipping unusedalternatorControl offset 2164 + startOfCrankingPrimingPulse = scalar, F32, 2164, "ms", 1, 0, 0, 200, 1 +;skipping unusedalternatorControl offset 2168 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, 5 @@ -2369,6 +2370,7 @@ cmd_call_from_pit = "w\x00\x20\x34\x56" panel = crankingFuel panel = crankingIgnition field = "Cranking Idle Air", crankingIACposition + field = "Priming fuel pulse", startOfCrankingPrimingPulse panel = postCrankingEnrichment field = "" field = "" diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 19492f1279..71cf3386ed 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1603,6 +1603,7 @@ cmd_call_from_pit = "w\x00\x20\x34\x56" panel = crankingFuel panel = crankingIgnition field = "Cranking Idle Air", crankingIACposition + field = "Priming fuel pulse", startOfCrankingPrimingPulse panel = postCrankingEnrichment field = "" field = "" diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java index 7c1cdfb6ea..9d560aac4b 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 Sat Jul 15 15:20:22 EDT 2017 +// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Jul 15 15:30:50 EDT 2017 public class Fields { public static final int LE_COMMAND_LENGTH = 200; public static final int BLOCKING_FACTOR = 400; @@ -809,8 +809,10 @@ public class Fields { public static final int targetVBatt_offset = 2156; public static final int alternatorOffAboveTps_offset = 2160; public static final int alternatorOffAboveTps_offset_hex = 870; - public static final int unusedalternatorControl_offset = 2164; - public static final int unusedalternatorControl_offset_hex = 874; + 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 tpsAccelLength_offset = 2184; public static final int tpsAccelLength_offset_hex = 888; public static final int tpsAccelEnrichmentThreshold_offset = 2188; @@ -1596,6 +1598,7 @@ public class Fields { 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 STARTOFCRANKINGPRIMINGPULSE = Field.create("STARTOFCRANKINGPRIMINGPULSE", 2164, FieldType.FLOAT); 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);