From f24021980d1d809f463d80947b2463a876f2d5d9 Mon Sep 17 00:00:00 2001 From: rusefi Date: Fri, 24 Nov 2017 15:40:52 -0500 Subject: [PATCH] #4 docs --- .../engine_configuration_generated_structures.h | 8 +++++--- firmware/integration/rusefi_config.txt | 6 +++--- firmware/tunerstudio/rusefi.ini | 17 +++++++++++++---- firmware/tunerstudio/rusefi.input | 5 +++-- 4 files changed, 24 insertions(+), 12 deletions(-) diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index 0011faac39..84f72a1532 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 Thu Nov 23 02:36:23 EST 2017 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Fri Nov 24 15:40:28 EST 2017 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -1353,6 +1353,7 @@ typedef struct { uint32_t engineChartSize; /** * set idle_rpm X + * See also cltIdleCorr * offset 1492 */ int targetIdleRpm; @@ -2039,11 +2040,12 @@ typedef struct { */ float crankingCycleBins[CRANKING_CURVE_SIZE]; /** - * CLT-based idle position multiplier for simple manual idle controller + * CLT-based idle position multiplier for simple manual idle controller, or target RPM multiplier for PID-based idle * offset 10656 */ float cltIdleCorrBins[CLT_CURVE_SIZE]; /** + * CLT-based idle position multiplier for simple manual idle controller, or target RPM multiplier for PID-based idle * offset 10720 */ float cltIdleCorr[CLT_CURVE_SIZE]; @@ -2200,4 +2202,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Nov 23 02:36:23 EST 2017 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Fri Nov 24 15:40:28 EST 2017 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 7f69f79d43..f8a32dce60 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -645,7 +645,7 @@ custom idle_mode_e 4 bits, U32, @OFFSET@, [0:0], "false", "true" uint32_t engineChartSize;;"count", 1, 0, 0, 300, 0 - int targetIdleRpm;set idle_rpm X;"RPM", 1, 0, 0, 7000, 0 + int targetIdleRpm;set idle_rpm X\nSee also cltIdleCorr;"RPM", 1, 0, 0, 7000, 0 adc_channel_e acSwitchAdc;A/C button input handled as analog input @@ -861,8 +861,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;;"counter", 1, 0, -80.0, 170.0, 2 -float[CLT_CURVE_SIZE] cltIdleCorrBins;CLT-based idle position multiplier for simple manual idle controller;"C", 1, 0, -100.0, 250.0, 2 -float[CLT_CURVE_SIZE] cltIdleCorr;;"%", 1, 0, 0.0, 500.0, 2 +float[CLT_CURVE_SIZE] cltIdleCorrBins;CLT-based idle position multiplier for simple manual idle controller, or target RPM multiplier for PID-based idle;"C", 1, 0, -100.0, 250.0, 2 +float[CLT_CURVE_SIZE] cltIdleCorr; CLT-based idle position multiplier for simple manual idle controller, or target RPM multiplier for PID-based idle;"%", 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 f209099297..6dfd7043cb 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -63,7 +63,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 Sun Nov 19 15:18:42 EST 2017 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Fri Nov 24 15:40:28 EST 2017 pageSize = 20000 page = 1 @@ -732,7 +732,15 @@ page = 1 oilPressure_v2 = scalar, F32, 2908, "volts", 1, 0.0, 0, 10.0, 2 oilPressure_value2 = scalar, F32, 2912, "kPa", 1, 0.0, 0, 1000.0, 2 accelerometerSpiDevice = bits,U32, 2916, [0:1], "Off", "SPI1", "SPI2", "SPI3" -;skipping unusedEnd offset 2920 + fsioCurve1Bins = array, F32, 2920, [16], "x", 1, 0, -999, 1000.0, 3 + fsioCurve1 = array, F32, 2984, [16], "y", 1, 0, -999, 1000.0, 3 + fsioCurve2Bins = array, F32, 3048, [16], "x", 1, 0, -999, 1000.0, 3 + fsioCurve2 = array, F32, 3112, [16], "y", 1, 0, -999, 1000.0, 3 + fsioCurve3Bins = array, F32, 3176, [8], "x", 1, 0, -999, 1000.0, 3 + fsioCurve3 = array, F32, 3208, [8], "y", 1, 0, -999, 1000.0, 3 + fsioCurve4Bins = array, F32, 3240, [8], "x", 1, 0, -999, 1000.0, 3 + fsioCurve4 = array, F32, 3272, [8], "y", 1, 0, -999, 1000.0, 3 +;skipping unusedEnd offset 3304 fsioFormulas1 = string, ASCII, 6672, 200 fsioFormulas2 = string, ASCII, 6872, 200 fsioFormulas3 = string, ASCII, 7072, 200 @@ -1163,7 +1171,7 @@ fileVersion = { 20161225 } yBins = crankingCycleCoef - curve = cltIdleCurve, "Warmup IAC position manual Multiplier" + curve = cltIdleCurve, "Warmup Idle multipplier" columnLabel = "Coolant", "Multiplier" xAxis = -40, 120, 10 yAxis = 0, 50, 100 @@ -1649,7 +1657,7 @@ gaugeCategory = Fuel Data subMenu = warmupFuelDialog, "Warmup fuel closed-loop" subMenu = cltFuelCorrCurve, "Warmup fuel manual Multiplier", 0, {useWarmupPidAfr == 0} subMenu = warmupTargetAfrCurve, "Warmup fuel auto correction AFR target", 0, {useWarmupPidAfr == 1} - subMenu = cltIdleCurve, "Warmup IAC position manual Multiplier" + subMenu = cltIdleCurve, "Warmup Idle multipplier" subMenu = cltTimingCorrCurve, "Warmup timing correction" subMenu = std_separator subMenu = fuelTableDialog, "Fuel Table", 0, {fuelAlgorithm != LM_SPEED_DENSITY} @@ -2191,6 +2199,7 @@ cmd_stop_engine = "w\x00\x99\x00\x00" field = "#Automatic Mode is still Alpha Version" field = "Manual mode", idleMode field = "Cranking Idle Air", crankingIACposition + field = "# Warmup Idle multipplier is apploed to target RPM" field = "Auto target", targetIdleRpm, { idleMode == 0} field = "idle P", idleRpmPid_pFactor, { idleMode == 0} field = "idle I", idleRpmPid_iFactor, { idleMode == 0} diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 7116dfa0da..054ae22a4c 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -391,7 +391,7 @@ fileVersion = { 20161225 } yBins = crankingCycleCoef - curve = cltIdleCurve, "Warmup IAC position manual Multiplier" + curve = cltIdleCurve, "Warmup Idle multipplier" columnLabel = "Coolant", "Multiplier" xAxis = -40, 120, 10 yAxis = 0, 50, 100 @@ -877,7 +877,7 @@ gaugeCategory = Fuel Data subMenu = warmupFuelDialog, "Warmup fuel closed-loop" subMenu = cltFuelCorrCurve, "Warmup fuel manual Multiplier", 0, {useWarmupPidAfr == 0} subMenu = warmupTargetAfrCurve, "Warmup fuel auto correction AFR target", 0, {useWarmupPidAfr == 1} - subMenu = cltIdleCurve, "Warmup IAC position manual Multiplier" + subMenu = cltIdleCurve, "Warmup Idle multipplier" subMenu = cltTimingCorrCurve, "Warmup timing correction" subMenu = std_separator subMenu = fuelTableDialog, "Fuel Table", 0, {fuelAlgorithm != LM_SPEED_DENSITY} @@ -1419,6 +1419,7 @@ cmd_stop_engine = "w\x00\x99\x00\x00" field = "#Automatic Mode is still Alpha Version" field = "Manual mode", idleMode field = "Cranking Idle Air", crankingIACposition + field = "# Warmup Idle multipplier is apploed to target RPM" field = "Auto target", targetIdleRpm, { idleMode == 0} field = "idle P", idleRpmPid_pFactor, { idleMode == 0} field = "idle I", idleRpmPid_iFactor, { idleMode == 0}