From 84f1d7fbc283dd8fa1ed902d3587f4a916e42eea Mon Sep 17 00:00:00 2001 From: rusEfi Date: Wed, 18 Nov 2015 21:02:51 -0500 Subject: [PATCH] auto-sync --- .../controllers/algo/engine_configuration.cpp | 18 ++++++++++++++++++ ...engine_configuration_generated_structures.h | 6 +++--- firmware/controllers/algo/rusefi_generated.h | 2 +- firmware/integration/rusefi_config.txt | 2 +- firmware/tunerstudio/rusefi.ini | 4 ++-- .../models/src/com/rusefi/config/Fields.java | 2 +- 6 files changed, 26 insertions(+), 8 deletions(-) diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 0dc026c997..955c6e4dc0 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -381,6 +381,24 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) { config->crankingCycleCoef[7] = 0.5; config->crankingCycleBins[7] = 77; + + // todo: set bins + setTableValue(engineConfiguration->cltIdleRpmBins, engineConfiguration->cltIdleRpm, CLT_CURVE_SIZE, -30, 1350); + setTableValue(engineConfiguration->cltIdleRpmBins, engineConfiguration->cltIdleRpm, CLT_CURVE_SIZE, -20, 1300); + setTableValue(engineConfiguration->cltIdleRpmBins, engineConfiguration->cltIdleRpm, CLT_CURVE_SIZE, -10, 1200); + setTableValue(engineConfiguration->cltIdleRpmBins, engineConfiguration->cltIdleRpm, CLT_CURVE_SIZE, 0, 1150); + setTableValue(engineConfiguration->cltIdleRpmBins, engineConfiguration->cltIdleRpm, CLT_CURVE_SIZE, 10, 1100); + setTableValue(engineConfiguration->cltIdleRpmBins, engineConfiguration->cltIdleRpm, CLT_CURVE_SIZE, 20, 1050); + setTableValue(engineConfiguration->cltIdleRpmBins, engineConfiguration->cltIdleRpm, CLT_CURVE_SIZE, 30, 1000); + setTableValue(engineConfiguration->cltIdleRpmBins, engineConfiguration->cltIdleRpm, CLT_CURVE_SIZE, 40, 1000); + setTableValue(engineConfiguration->cltIdleRpmBins, engineConfiguration->cltIdleRpm, CLT_CURVE_SIZE, 50, 950); + setTableValue(engineConfiguration->cltIdleRpmBins, engineConfiguration->cltIdleRpm, CLT_CURVE_SIZE, 60, 950); + setTableValue(engineConfiguration->cltIdleRpmBins, engineConfiguration->cltIdleRpm, CLT_CURVE_SIZE, 70, 930); + setTableValue(engineConfiguration->cltIdleRpmBins, engineConfiguration->cltIdleRpm, CLT_CURVE_SIZE, 80, 900); + setTableValue(engineConfiguration->cltIdleRpmBins, engineConfiguration->cltIdleRpm, CLT_CURVE_SIZE, 90, 900); + setTableValue(engineConfiguration->cltIdleRpmBins, engineConfiguration->cltIdleRpm, CLT_CURVE_SIZE, 100, 1000); + setTableValue(engineConfiguration->cltIdleRpmBins, engineConfiguration->cltIdleRpm, CLT_CURVE_SIZE, 110, 1100); + engineConfiguration->cranking.baseFuel = 5; engineConfiguration->analogInputDividerCoefficient = 2; diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index b187d4dd6d..8211000739 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 Wed Nov 18 18:02:47 EST 2015 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Nov 18 19:07:01 EST 2015 // begin #include "rusefi_types.h" typedef struct { @@ -1368,7 +1368,7 @@ typedef struct { * CLT-based target RPM for automatic idle controller * offset 2028 */ - float cltIdleCorrRpmBins[CLT_CURVE_SIZE]; + float cltIdleRpmBins[CLT_CURVE_SIZE]; /** * offset 2092 */ @@ -1576,4 +1576,4 @@ typedef struct { } persistent_config_s; // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Nov 18 18:02:47 EST 2015 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Nov 18 19:07:01 EST 2015 diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index 0c8916f5e1..397231c0ea 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -695,7 +695,7 @@ #define etb_pFactor_offset 2016 #define etb_iFactor_offset 2020 #define etb_dFactor_offset 2024 -#define cltIdleCorrRpmBins_offset 2028 +#define cltIdleRpmBins_offset 2028 #define cltIdleRpm_offset 2092 #define targetVBatt_offset 2156 #define alternatorOffAboveTps_offset 2160 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 3c7fe312bd..7655bc080f 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -601,7 +601,7 @@ baro_corr_table_t baroCorrTable; float[8] knockNoise; pid_s etb; - float[CLT_CURVE_SIZE] cltIdleCorrRpmBins;CLT-based target RPM for automatic idle controller;"C", 1, 0, -100.0, 250.0, 2 + float[CLT_CURVE_SIZE] cltIdleRpmBins;CLT-based target RPM for automatic idle controller;"C", 1, 0, -100.0, 250.0, 2 float[CLT_CURVE_SIZE] cltIdleRpm;;"RPM", 1, 0, 0.0, 400.0, 0 float targetVBatt;;"Volts", 1, 0, 0,30, 1 diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index be05d749a4..2de22734a7 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 automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Nov 18 18:02:47 EST 2015 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Nov 18 19:07:01 EST 2015 pageSize = 15288 page = 1 @@ -493,7 +493,7 @@ page = 1 etb_pFactor = scalar, F32, 2016, "value", 1, 0, 0, 1000, 2 etb_iFactor = scalar, F32, 2020, "value", 1, 0, 0, 1000, 2 etb_dFactor = scalar, F32, 2024, "value", 1, 0, 0, 1000, 2 - cltIdleCorrRpmBins = array, F32, 2028, [16], "C", 1, 0, -100.0, 250.0, 2 + cltIdleRpmBins = array, F32, 2028, [16], "C", 1, 0, -100.0, 250.0, 2 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 diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java index 6498d37a40..4481aade06 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 Wed Nov 18 18:02:47 EST 2015 +// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Nov 18 19:07:01 EST 2015 public class Fields { public static final Field ENGINETYPE = new Field("ENGINETYPE", 0, FieldType.INT); public static final Field HEADERMAGICVALUE = new Field("HEADERMAGICVALUE", 4, FieldType.INT);