From 9530d884f0a1b575201fd421b8d9ffd54344baf8 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Tue, 14 Apr 2015 18:07:22 -0400 Subject: [PATCH] auto-sync --- .../controllers/algo/engine_configuration.cpp | 27 +++++++++---------- ...ngine_configuration_generated_structures.h | 8 +++--- firmware/integration/rusefi_config.txt | 4 +-- firmware/tunerstudio/rusefi.ini | 6 ++--- 4 files changed, 22 insertions(+), 23 deletions(-) diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index d5583244ab..1cda93605f 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -181,22 +181,21 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) { initTemperatureCurve(IAT_CURVE_SIZE, config->iatFuelCorrBins, config->iatFuelCorr); initTemperatureCurve(CLT_CURVE_SIZE, config->cltFuelCorrBins, config->cltFuelCorr); - initTemperatureCurve(IAT_CURVE_SIZE, config->iatIdleCorrBins, config->iatIdleCorr); -// initTemperatureCurve(CLT_CURVE_SIZE, engineConfiguration->cltIdleCorrBins, engineConfiguration->cltIdleCorr); + initTemperatureCurve(CLT_CURVE_SIZE, config->cltIdleCorrBins, config->cltIdleCorr); - setTableValue(config->iatIdleCorrBins, config->iatIdleCorr, CLT_CURVE_SIZE, -40, 1.5); - setTableValue(config->iatIdleCorrBins, config->iatIdleCorr, CLT_CURVE_SIZE, -30, 1.5); - setTableValue(config->iatIdleCorrBins, config->iatIdleCorr, CLT_CURVE_SIZE, -20, 1.42); - setTableValue(config->iatIdleCorrBins, config->iatIdleCorr, CLT_CURVE_SIZE, -10, 1.36); - setTableValue(config->iatIdleCorrBins, config->iatIdleCorr, CLT_CURVE_SIZE, 0, 1.28); - setTableValue(config->iatIdleCorrBins, config->iatIdleCorr, CLT_CURVE_SIZE, 10, 1.19); - setTableValue(config->iatIdleCorrBins, config->iatIdleCorr, CLT_CURVE_SIZE, 20, 1.12); - setTableValue(config->iatIdleCorrBins, config->iatIdleCorr, CLT_CURVE_SIZE, 30, 1.10); - setTableValue(config->iatIdleCorrBins, config->iatIdleCorr, CLT_CURVE_SIZE, 40, 1.06); - setTableValue(config->iatIdleCorrBins, config->iatIdleCorr, CLT_CURVE_SIZE, 50, 1.06); - setTableValue(config->iatIdleCorrBins, config->iatIdleCorr, CLT_CURVE_SIZE, 60, 1.03); - setTableValue(config->iatIdleCorrBins, config->iatIdleCorr, CLT_CURVE_SIZE, 70, 1.01); + setTableValue(config->cltIdleCorrBins, config->cltIdleCorr, CLT_CURVE_SIZE, -40, 1.5); + setTableValue(config->cltIdleCorrBins, config->cltIdleCorr, CLT_CURVE_SIZE, -30, 1.5); + setTableValue(config->cltIdleCorrBins, config->cltIdleCorr, CLT_CURVE_SIZE, -20, 1.42); + setTableValue(config->cltIdleCorrBins, config->cltIdleCorr, CLT_CURVE_SIZE, -10, 1.36); + setTableValue(config->cltIdleCorrBins, config->cltIdleCorr, CLT_CURVE_SIZE, 0, 1.28); + setTableValue(config->cltIdleCorrBins, config->cltIdleCorr, CLT_CURVE_SIZE, 10, 1.19); + setTableValue(config->cltIdleCorrBins, config->cltIdleCorr, CLT_CURVE_SIZE, 20, 1.12); + setTableValue(config->cltIdleCorrBins, config->cltIdleCorr, CLT_CURVE_SIZE, 30, 1.10); + setTableValue(config->cltIdleCorrBins, config->cltIdleCorr, CLT_CURVE_SIZE, 40, 1.06); + setTableValue(config->cltIdleCorrBins, config->cltIdleCorr, CLT_CURVE_SIZE, 50, 1.06); + setTableValue(config->cltIdleCorrBins, config->cltIdleCorr, CLT_CURVE_SIZE, 60, 1.03); + setTableValue(config->cltIdleCorrBins, config->cltIdleCorr, CLT_CURVE_SIZE, 70, 1.01); setTableValue(config->cltFuelCorrBins, config->cltFuelCorr, CLT_CURVE_SIZE, -40, 1.5); diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index a59eb33173..32582babad 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 Fri Apr 10 23:17:12 EDT 2015 +// this section was generated by config_definition.jar on Tue Apr 14 17:41:48 EDT 2015 // begin #include "rusefi_types.h" typedef struct { @@ -1175,11 +1175,11 @@ typedef struct { /** * offset 6200 */ - float iatIdleCorrBins[IAT_CURVE_SIZE]; + float cltIdleCorrBins[CLT_CURVE_SIZE]; /** * offset 6264 */ - float iatIdleCorr[IAT_CURVE_SIZE]; + float cltIdleCorr[CLT_CURVE_SIZE]; /** * kg/hour value. * By the way 2.081989116 kg/h = 1 ft³/m @@ -1267,4 +1267,4 @@ typedef struct { } persistent_config_s; // end -// this section was generated by config_definition.jar on Fri Apr 10 23:17:12 EDT 2015 +// this section was generated by config_definition.jar on Tue Apr 14 17:41:48 EDT 2015 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index b644e3f6aa..4a0109d76d 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -516,8 +516,8 @@ float[IAT_CURVE_SIZE] iatFuelCorr;;"%", 1, 0, 0.0, 500.0, 2 float[CRANKING_CURVE_SIZE] crankingCycleCoef;;"%", 1, 0, 0.0, 500.0, 2 float[CRANKING_CURVE_SIZE] crankingCycleBins;;"C", 1, 0, -80.0, 170.0, 2 -float[IAT_CURVE_SIZE] iatIdleCorrBins;;"C", 1, 0, -100.0, 250.0, 2 -float[IAT_CURVE_SIZE] iatIdleCorr;;"%", 1, 0, 0.0, 500.0, 2 +float[CLT_CURVE_SIZE] cltIdleCorrBins;;"C", 1, 0, -100.0, 250.0, 2 +float[CLT_CURVE_SIZE] cltIdleCorr;;"%", 1, 0, 0.0, 500.0, 2 float[MAF_DECODING_COUNT] mafDecoding;kg/hour value.\nBy the way 2.081989116 kg/h = 1 ft³/m;"kg/hour", 1, 0, -500.0, 4000.0, 2 float[MAF_DECODING_COUNT] mafDecodingBins;; "V", 1, 0, -5.0, 150.0, 2 diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 1f5424c152..f6c1e29080 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 Sat Apr 11 18:14:13 EDT 2015 +; this section was generated by ConfigDefinition.jar on Tue Apr 14 17:41:52 EDT 2015 pageSize = 15288 page = 1 @@ -485,8 +485,8 @@ page = 1 crankingFuelBins = array, F32, 6104, [8], "C", 1, 0, -80.0, 170.0, 2 crankingCycleCoef = array, F32, 6136, [8], "%", 1, 0, 0.0, 500.0, 2 crankingCycleBins = array, F32, 6168, [8], "C", 1, 0, -80.0, 170.0, 2 - iatIdleCorrBins = array, F32, 6200, [16], "C", 1, 0, -100.0, 250.0, 2 - iatIdleCorr = array, F32, 6264, [16], "%", 1, 0, 0.0, 500.0, 2 + cltIdleCorrBins = array, F32, 6200, [16], "C", 1, 0, -100.0, 250.0, 2 + cltIdleCorr = array, F32, 6264, [16], "%", 1, 0, 0.0, 500.0, 2 mafDecoding = array, F32, 6328, [256], "kg/hour", 1, 0, -500.0, 4000.0, 2 mafDecodingBins = array, F32, 7352, [256], "V", 1, 0, -5.0, 150.0, 2 ignitionIatCorrTable = array, F32, 8376, [16x16],"deg", 1, 0, -360, 360, 2