From 3b144f51cff873eacfdabffdc400dc6b946eb10c Mon Sep 17 00:00:00 2001 From: rusEfi Date: Wed, 15 Apr 2015 13:04:42 -0400 Subject: [PATCH] auto-sync --- firmware/controllers/algo/engine_configuration.cpp | 2 ++ .../algo/engine_configuration_generated_structures.h | 10 +++++++--- firmware/integration/rusefi_config.txt | 3 ++- firmware/tunerstudio/rusefi.ini | 5 +++-- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 3d5d3010e4..fca39343b0 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -250,6 +250,8 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) { engineConfiguration->rpmHardLimit = 7000; engineConfiguration->cranking.rpm = 550; + engineConfiguration->noAccelAfterHardLimitPeriodSecs = 3; + config->crankingFuelCoef[0] = 5; // base cranking fuel adjustment coefficient config->crankingFuelBins[0] = -20; // temperature in C config->crankingFuelCoef[1] = 3.7; diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index 0d08694472..33ecf85d3a 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 by config_definition.jar on Tue Apr 14 22:35:17 EDT 2015 +// this section was generated by config_definition.jar on Wed Apr 15 12:11:02 EDT 2015 // begin #include "rusefi_types.h" typedef struct { @@ -1095,7 +1095,11 @@ typedef struct { /** * offset 1644 */ - int unused3[135]; + float noAccelAfterHardLimitPeriodSecs; + /** + * offset 1648 + */ + int unused3[134]; /** * offset 2184 */ @@ -1275,4 +1279,4 @@ typedef struct { } persistent_config_s; // end -// this section was generated by config_definition.jar on Tue Apr 14 22:35:17 EDT 2015 +// this section was generated by config_definition.jar on Wed Apr 15 12:11:02 EDT 2015 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index c7dfa91ffc..ba01e21810 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -486,7 +486,8 @@ custom pin_input_mode_e 4 scalar, F32, @OFFSET@, "ms", 1, 0, 0, 200, 1 int idleStepperTotalSteps;;"count", 1, 0, 5, 3000, 0 brain_pin_e stepperEnablePin; - int[135] unused3; +float noAccelAfterHardLimitPeriodSecs;;"sec", 1, 0, 0, 60, 0 + int[134] unused3; int tpsAccelLength;;"len", 1, 0, 1, 200, 3 float tpsAccelEnrichmentThreshold;;"roc", 1, 0, 0, 200, 3 diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index e1cb6115d3..7be77c12ae 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -40,7 +40,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated by ConfigDefinition.jar on Tue Apr 14 22:35:19 EDT 2015 +; this section was generated by ConfigDefinition.jar on Wed Apr 15 12:11:03 EDT 2015 pageSize = 15288 page = 1 @@ -452,7 +452,8 @@ page = 1 ;skipping alternatorControlDFactor offset 1632 idleStepperTotalSteps = scalar, S32, 1636, "count", 1, 0, 5, 3000, 0 stepperEnablePin = bits, U32, 1640, [0:6], "GPIOA_0", "GPIOA_1", "GPIOA_2", "GPIOA_3", "GPIOA_4", "GPIOA_5", "GPIOA_6", "GPIOA_7", "GPIOA_8", "GPIOA_9", "GPIOA_10", "GPIOA_11", "GPIOA_12", "GPIOA_13", "GPIOA_14", "GPIOA_15", "GPIOB_0", "GPIOB_1", "GPIOB_2", "GPIOB_3", "GPIOB_4", "GPIOB_5", "GPIOB_6", "GPIOB_7", "GPIOB_8", "GPIOB_9", "GPIOB_10", "GPIOB_11", "GPIOB_12", "GPIOB_13", "GPIOB_14", "GPIOB_15", "GPIOC_0", "GPIOC_1", "GPIOC_2", "GPIOC_3", "GPIOC_4", "GPIOC_5", "GPIOC_6", "GPIOC_7", "GPIOC_8", "GPIOC_9", "GPIOC_10", "GPIOC_11", "GPIOC_12", "GPIOC_13", "GPIOC_14", "GPIOC_15", "GPIOD_0", "GPIOD_1", "GPIOD_2", "GPIOD_3", "GPIOD_4", "GPIOD_5", "GPIOD_6", "GPIOD_7", "GPIOD_8", "GPIOD_9", "GPIOD_10", "GPIOD_11", "GPIOD_12", "GPIOD_13", "GPIOD_14", "GPIOD_15", "GPIOE_0", "GPIOE_1", "GPIOE_2", "GPIOE_3", "GPIOE_4", "GPIOE_5", "GPIOE_6", "GPIOE_7", "GPIOE_8", "GPIOE_9", "GPIOE_10", "GPIOE_11", "GPIOE_12", "GPIOE_13", "GPIOE_14", "GPIOE_15", "NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -;skipping unused3 offset 1644 + noAccelAfterHardLimitPeriodSecs = scalar, F32, 1644, "sec", 1, 0, 0, 60, 0 +;skipping unused3 offset 1648 tpsAccelLength = scalar, S32, 2184, "len", 1, 0, 1, 200, 3 tpsAccelEnrichmentThreshold = scalar, F32, 2188, "roc", 1, 0, 0, 200, 3 tpsAccelEnrichmentMultiplier = scalar, F32, 2192, "coeff", 1, 0, 0, 200, 3