diff --git a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h index dcc5b34468..4fa221b2d4 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Sat Feb 15 19:17:00 EST 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Sun Feb 16 16:11:47 EST 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONFIG_BOARDS_KINETIS_CONFIG_CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -622,7 +622,7 @@ struct engine_configuration_s { bool antiLagEnabled : 1; /** offset 76 bit 23 */ - bool useFixedMsForCranking : 1; + bool useRunningMathForCranking : 1; /** offset 76 bit 24 */ bool issue_294_25 : 1; @@ -3217,4 +3217,4 @@ typedef struct persistent_config_s persistent_config_s; #endif // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Sat Feb 15 19:17:00 EST 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Sun Feb 16 16:11:47 EST 2020 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index dd4cb62c6e..8b87720c44 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -2174,8 +2174,6 @@ #define useETBforIdleControl_offset_hex 2e8 #define useFixedBaroCorrFromMap_offset 1476 #define useFixedBaroCorrFromMap_offset_hex 5c4 -#define useFixedMsForCranking_offset 76 -#define useFixedMsForCranking_offset_hex 4c #define useFSIO10ForServo3_offset 1464 #define useFSIO10ForServo3_offset_hex 5b8 #define useFSIO11ForServo4_offset 1464 @@ -2218,6 +2216,8 @@ #define useNoiselessTriggerDecoder_offset_hex 2e8 #define useOnlyRisingEdgeForTrigger_offset 1476 #define useOnlyRisingEdgeForTrigger_offset_hex 5c4 +#define useRunningMathForCranking_offset 76 +#define useRunningMathForCranking_offset_hex 4c #define useSeparateAdvanceForCranking_offset 1476 #define useSeparateAdvanceForCranking_offset_hex 5c4 #define useSeparateAdvanceForIdle_offset 1476 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 97f70e5910..adfd3d482e 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Feb 15 19:16:46 EST 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Feb 16 16:11:34 EST 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -622,7 +622,7 @@ struct engine_configuration_s { bool antiLagEnabled : 1; /** offset 76 bit 23 */ - bool useFixedMsForCranking : 1; + bool useRunningMathForCranking : 1; /** offset 76 bit 24 */ bool issue_294_25 : 1; @@ -3217,4 +3217,4 @@ typedef struct persistent_config_s persistent_config_s; #endif // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Feb 15 19:16:46 EST 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Feb 16 16:11:34 EST 2020 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 2f08aa77a4..70bc613b86 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -2174,8 +2174,6 @@ #define useETBforIdleControl_offset_hex 2e8 #define useFixedBaroCorrFromMap_offset 1476 #define useFixedBaroCorrFromMap_offset_hex 5c4 -#define useFixedMsForCranking_offset 76 -#define useFixedMsForCranking_offset_hex 4c #define useFSIO10ForServo3_offset 1464 #define useFSIO10ForServo3_offset_hex 5b8 #define useFSIO11ForServo4_offset 1464 @@ -2218,6 +2216,8 @@ #define useNoiselessTriggerDecoder_offset_hex 2e8 #define useOnlyRisingEdgeForTrigger_offset 1476 #define useOnlyRisingEdgeForTrigger_offset_hex 5c4 +#define useRunningMathForCranking_offset 76 +#define useRunningMathForCranking_offset_hex 4c #define useSeparateAdvanceForCranking_offset 1476 #define useSeparateAdvanceForCranking_offset_hex 5c4 #define useSeparateAdvanceForIdle_offset 1476 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index ac26fb35a3..65e1113a71 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -333,7 +333,7 @@ bit absoluteFuelPressure;+If your fuel regulator does not have vacuum line bit launchControlEnabled; bit rollingLaunchEnabled; bit antiLagEnabled; -bit useFixedMsForCranking,Fixed,Fuel Map; +bit useRunningMathForCranking,Fixed,Fuel Map; bit issue_294_25; bit issue_294_26; bit issue_294_27; diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index e7dd6a0031..716d1ba0db 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Feb 15 19:16:46 EST 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Feb 16 16:11:34 EST 2020 pageSize = 20000 page = 1 @@ -117,7 +117,7 @@ page = 1 launchControlEnabled = bits, U32, 76, [20:20], "false", "true" rollingLaunchEnabled = bits, U32, 76, [21:21], "false", "true" antiLagEnabled = bits, U32, 76, [22:22], "false", "true" - useFixedMsForCranking = bits, U32, 76, [23:23], "Fuel Map", "Fixed" + useRunningMathForCranking= bits, U32, 76, [23:23], "Fuel Map", "Fixed" issue_294_25 = bits, U32, 76, [24:24], "false", "true" issue_294_26 = bits, U32, 76, [25:25], "false", "true" issue_294_27 = bits, U32, 76, [26:26], "false", "true" @@ -3474,8 +3474,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = crankingFuel, "Fuel" field = "Injection mode", crankingInjectionMode field = "!Value '1' is currently recommended" - field = "Fuel Source For Cranking", cranking_baseFuel, {useFixedMsForCranking == 1} - field = "Base fuel pulse width", cranking_baseFuel + field = "Fuel Source For Cranking", useRunningMathForCranking + field = "Base fuel pulse width", cranking_baseFuel, {useRunningMathForCranking == 0} dialog = crankingIAC, "IAC" field = "Cranking IAC position", crankingIACposition diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index a1d4638725..d8e98b4524 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -2350,8 +2350,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = crankingFuel, "Fuel" field = "Injection mode", crankingInjectionMode field = "!Value '1' is currently recommended" - field = "Fuel Source For Cranking", cranking_baseFuel, {useFixedMsForCranking == 1} - field = "Base fuel pulse width", cranking_baseFuel + field = "Fuel Source For Cranking", useRunningMathForCranking + field = "Base fuel pulse width", cranking_baseFuel, {useRunningMathForCranking == 0} dialog = crankingIAC, "IAC" field = "Cranking IAC position", crankingIACposition diff --git a/firmware/tunerstudio/rusefi_frankenso.ini b/firmware/tunerstudio/rusefi_frankenso.ini index 9a0a5b2db4..a83cfb146e 100644 --- a/firmware/tunerstudio/rusefi_frankenso.ini +++ b/firmware/tunerstudio/rusefi_frankenso.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Feb 15 19:16:52 EST 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Feb 16 16:11:39 EST 2020 pageSize = 20000 page = 1 @@ -117,7 +117,7 @@ page = 1 launchControlEnabled = bits, U32, 76, [20:20], "false", "true" rollingLaunchEnabled = bits, U32, 76, [21:21], "false", "true" antiLagEnabled = bits, U32, 76, [22:22], "false", "true" - useFixedMsForCranking = bits, U32, 76, [23:23], "Fuel Map", "Fixed" + useRunningMathForCranking= bits, U32, 76, [23:23], "Fuel Map", "Fixed" issue_294_25 = bits, U32, 76, [24:24], "false", "true" issue_294_26 = bits, U32, 76, [25:25], "false", "true" issue_294_27 = bits, U32, 76, [26:26], "false", "true" @@ -3474,8 +3474,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = crankingFuel, "Fuel" field = "Injection mode", crankingInjectionMode field = "!Value '1' is currently recommended" - field = "Fuel Source For Cranking", cranking_baseFuel, {useFixedMsForCranking == 1} - field = "Base fuel pulse width", cranking_baseFuel + field = "Fuel Source For Cranking", useRunningMathForCranking + field = "Base fuel pulse width", cranking_baseFuel, {useRunningMathForCranking == 0} dialog = crankingIAC, "IAC" field = "Cranking IAC position", crankingIACposition diff --git a/firmware/tunerstudio/rusefi_kinetis.ini b/firmware/tunerstudio/rusefi_kinetis.ini index 3e2e997a99..c8d183620b 100644 --- a/firmware/tunerstudio/rusefi_kinetis.ini +++ b/firmware/tunerstudio/rusefi_kinetis.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Sat Feb 15 19:17:00 EST 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Sun Feb 16 16:11:47 EST 2020 pageSize = 20000 page = 1 @@ -117,7 +117,7 @@ page = 1 launchControlEnabled = bits, U32, 76, [20:20], "false", "true" rollingLaunchEnabled = bits, U32, 76, [21:21], "false", "true" antiLagEnabled = bits, U32, 76, [22:22], "false", "true" - useFixedMsForCranking = bits, U32, 76, [23:23], "Fuel Map", "Fixed" + useRunningMathForCranking= bits, U32, 76, [23:23], "Fuel Map", "Fixed" issue_294_25 = bits, U32, 76, [24:24], "false", "true" issue_294_26 = bits, U32, 76, [25:25], "false", "true" issue_294_27 = bits, U32, 76, [26:26], "false", "true" @@ -3474,8 +3474,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = crankingFuel, "Fuel" field = "Injection mode", crankingInjectionMode field = "!Value '1' is currently recommended" - field = "Fuel Source For Cranking", cranking_baseFuel, {useFixedMsForCranking == 1} - field = "Base fuel pulse width", cranking_baseFuel + field = "Fuel Source For Cranking", useRunningMathForCranking + field = "Base fuel pulse width", cranking_baseFuel, {useRunningMathForCranking == 0} dialog = crankingIAC, "IAC" field = "Cranking IAC position", crankingIACposition diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini index b9ea392a0e..9e28fdec18 100644 --- a/firmware/tunerstudio/rusefi_microrusefi.ini +++ b/firmware/tunerstudio/rusefi_microrusefi.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Feb 15 19:16:49 EST 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Feb 16 16:11:37 EST 2020 pageSize = 20000 page = 1 @@ -117,7 +117,7 @@ page = 1 launchControlEnabled = bits, U32, 76, [20:20], "false", "true" rollingLaunchEnabled = bits, U32, 76, [21:21], "false", "true" antiLagEnabled = bits, U32, 76, [22:22], "false", "true" - useFixedMsForCranking = bits, U32, 76, [23:23], "Fuel Map", "Fixed" + useRunningMathForCranking= bits, U32, 76, [23:23], "Fuel Map", "Fixed" issue_294_25 = bits, U32, 76, [24:24], "false", "true" issue_294_26 = bits, U32, 76, [25:25], "false", "true" issue_294_27 = bits, U32, 76, [26:26], "false", "true" @@ -3457,8 +3457,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = crankingFuel, "Fuel" field = "Injection mode", crankingInjectionMode field = "!Value '1' is currently recommended" - field = "Fuel Source For Cranking", cranking_baseFuel, {useFixedMsForCranking == 1} - field = "Base fuel pulse width", cranking_baseFuel + field = "Fuel Source For Cranking", useRunningMathForCranking + field = "Base fuel pulse width", cranking_baseFuel, {useRunningMathForCranking == 0} dialog = crankingIAC, "IAC" field = "Cranking IAC position", crankingIACposition diff --git a/firmware/tunerstudio/rusefi_prometheus.ini b/firmware/tunerstudio/rusefi_prometheus.ini index 97661282db..bfa2c593f8 100644 --- a/firmware/tunerstudio/rusefi_prometheus.ini +++ b/firmware/tunerstudio/rusefi_prometheus.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Feb 15 19:16:54 EST 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Feb 16 16:11:42 EST 2020 pageSize = 20000 page = 1 @@ -117,7 +117,7 @@ page = 1 launchControlEnabled = bits, U32, 76, [20:20], "false", "true" rollingLaunchEnabled = bits, U32, 76, [21:21], "false", "true" antiLagEnabled = bits, U32, 76, [22:22], "false", "true" - useFixedMsForCranking = bits, U32, 76, [23:23], "Fuel Map", "Fixed" + useRunningMathForCranking= bits, U32, 76, [23:23], "Fuel Map", "Fixed" issue_294_25 = bits, U32, 76, [24:24], "false", "true" issue_294_26 = bits, U32, 76, [25:25], "false", "true" issue_294_27 = bits, U32, 76, [26:26], "false", "true" @@ -3470,8 +3470,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = crankingFuel, "Fuel" field = "Injection mode", crankingInjectionMode field = "!Value '1' is currently recommended" - field = "Fuel Source For Cranking", cranking_baseFuel, {useFixedMsForCranking == 1} - field = "Base fuel pulse width", cranking_baseFuel + field = "Fuel Source For Cranking", useRunningMathForCranking + field = "Base fuel pulse width", cranking_baseFuel, {useRunningMathForCranking == 0} dialog = crankingIAC, "IAC" field = "Cranking IAC position", crankingIACposition diff --git a/firmware/tunerstudio/rusefi_proteus.ini b/firmware/tunerstudio/rusefi_proteus.ini index ba613db936..3ac877843b 100644 --- a/firmware/tunerstudio/rusefi_proteus.ini +++ b/firmware/tunerstudio/rusefi_proteus.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Feb 15 19:16:57 EST 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Feb 16 16:11:45 EST 2020 pageSize = 20000 page = 1 @@ -117,7 +117,7 @@ page = 1 launchControlEnabled = bits, U32, 76, [20:20], "false", "true" rollingLaunchEnabled = bits, U32, 76, [21:21], "false", "true" antiLagEnabled = bits, U32, 76, [22:22], "false", "true" - useFixedMsForCranking = bits, U32, 76, [23:23], "Fuel Map", "Fixed" + useRunningMathForCranking= bits, U32, 76, [23:23], "Fuel Map", "Fixed" issue_294_25 = bits, U32, 76, [24:24], "false", "true" issue_294_26 = bits, U32, 76, [25:25], "false", "true" issue_294_27 = bits, U32, 76, [26:26], "false", "true" @@ -3474,8 +3474,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = crankingFuel, "Fuel" field = "Injection mode", crankingInjectionMode field = "!Value '1' is currently recommended" - field = "Fuel Source For Cranking", cranking_baseFuel, {useFixedMsForCranking == 1} - field = "Base fuel pulse width", cranking_baseFuel + field = "Fuel Source For Cranking", useRunningMathForCranking + field = "Base fuel pulse width", cranking_baseFuel, {useRunningMathForCranking == 0} dialog = crankingIAC, "IAC" field = "Cranking IAC position", crankingIACposition diff --git a/java_console/models/src/com/rusefi/config/generated/Fields.java b/java_console/models/src/com/rusefi/config/generated/Fields.java index 18b3e3078e..3d279f841d 100644 --- a/java_console/models/src/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Feb 15 19:16:46 EST 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Feb 16 16:11:34 EST 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1421,7 +1421,6 @@ public class Fields { public static final int useConstantDwellDuringCranking_offset = 1464; public static final int useETBforIdleControl_offset = 744; public static final int useFixedBaroCorrFromMap_offset = 1476; - public static final int useFixedMsForCranking_offset = 76; public static final int useFSIO10ForServo3_offset = 1464; public static final int useFSIO11ForServo4_offset = 1464; public static final int useFSIO12ForIdleOffset_offset = 1464; @@ -1443,6 +1442,7 @@ public class Fields { public static final int useLinearIatSensor_offset = 1464; public static final int useNoiselessTriggerDecoder_offset = 744; public static final int useOnlyRisingEdgeForTrigger_offset = 1476; + public static final int useRunningMathForCranking_offset = 76; public static final int useSeparateAdvanceForCranking_offset = 1476; public static final int useSeparateAdvanceForIdle_offset = 1476; public static final int useSeparateVeForIdle_offset = 1476; @@ -1505,7 +1505,7 @@ public class Fields { public static final Field LAUNCHCONTROLENABLED = Field.create("LAUNCHCONTROLENABLED", 76, FieldType.BIT, 20); public static final Field ROLLINGLAUNCHENABLED = Field.create("ROLLINGLAUNCHENABLED", 76, FieldType.BIT, 21); public static final Field ANTILAGENABLED = Field.create("ANTILAGENABLED", 76, FieldType.BIT, 22); - public static final Field USEFIXEDMSFORCRANKING = Field.create("USEFIXEDMSFORCRANKING", 76, FieldType.BIT, 23); + public static final Field USERUNNINGMATHFORCRANKING = Field.create("USERUNNINGMATHFORCRANKING", 76, FieldType.BIT, 23); public static final Field ISSUE_294_25 = Field.create("ISSUE_294_25", 76, FieldType.BIT, 24); public static final Field ISSUE_294_26 = Field.create("ISSUE_294_26", 76, FieldType.BIT, 25); public static final Field ISSUE_294_27 = Field.create("ISSUE_294_27", 76, FieldType.BIT, 26); @@ -2413,7 +2413,7 @@ public class Fields { LAUNCHCONTROLENABLED, ROLLINGLAUNCHENABLED, ANTILAGENABLED, - USEFIXEDMSFORCRANKING, + USERUNNINGMATHFORCRANKING, ISSUE_294_25, ISSUE_294_26, ISSUE_294_27,