From f0aa088053ebadea520ab1f9c243f0e536bc0e25 Mon Sep 17 00:00:00 2001 From: rusefi Date: Mon, 12 Feb 2018 21:44:39 +0300 Subject: [PATCH] tiny project file progress --- firmware/tunerstudio/rusefi.ini | 35 ++++++++++++++++++------------- firmware/tunerstudio/rusefi.input | 33 ++++++++++++++++------------- 2 files changed, 39 insertions(+), 29 deletions(-) diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 09f89cf5a2..49da7bc25a 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 Mon Feb 12 21:12:29 MSK 2018 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Feb 12 21:44:19 MSK 2018 pageSize = 20000 page = 1 @@ -1738,9 +1738,6 @@ gaugeCategory = Fuel Data subMenu = engineChars, "Base Engine Settings" subMenu = triggerConfiguration, "Trigger Configuration" subMenu = std_separator - subMenu = injectionSettings, "Injection Settings" - subMenu = ignitionSettings, "Ignition Settings" - subMenu = std_separator subMenu = analogInputs, "Analog inputs" subMenu = cltSensor, "CLT Sensor Settings" subMenu = iatSensor, "IAT Sensor Settings" @@ -1765,6 +1762,25 @@ gaugeCategory = Fuel Data subMenu = cj125Function, "CJ125 Settings (wbo decoder)" subMenu = spiFunction, "SPI Settings" subMenu = etbDialog, "Electronic Thtottle Body (alpha version)" + + menu = "Injection" + subMenu = injectionSettings, "Injection Settings" + subMenu = std_separator + subMenu = fuelTableDialog, "Fuel Table", 0, {fuelAlgorithm != LM_SPEED_DENSITY} + subMenu = veTableDialog, "VE Table", 0, {fuelAlgorithm == LM_SPEED_DENSITY} + subMenu = afrTableTbl, "Target AFR Table", 0, {fuelAlgorithm == LM_SPEED_DENSITY} + subMenu = injPhaseTableTbl, "Injection Phase" + subMenu = std_separator + 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 Idle multiplier" + + menu = "Ignition" + subMenu = ignitionSettings, "Ignition Settings" + subMenu = ignitionTableTbl, "Ignition Advance Table" + subMenu = cltTimingCorrCurve, "Warmup timing correction" + menu = "Tuning" subMenu = generalSettings, "General" subMenu = monitoringSettings, "rusEfi Console Settings" @@ -1774,28 +1790,17 @@ gaugeCategory = Fuel Data subMenu = crankingTpsCurve, "Cranking TPS Multiplier" subMenu = crankingDurationCurve, "Cranking Duration Multiplier" subMenu = cltCrankingCurve, "Cranking IAC multiplier", 0, {overrideCrankingIacSetting == 1} - subMenu = std_separator - 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 Idle multiplier" - subMenu = cltTimingCorrCurve, "Warmup timing correction" subMenu = idleSettings, "Idle Settings" subMenu = cltIdleRPMCurve, "Idle Target RPM", 0, {idleMode == 0} subMenu = std_separator - subMenu = fuelTableDialog, "Fuel Table", 0, {fuelAlgorithm != LM_SPEED_DENSITY} - subMenu = veTableDialog, "VE Table", 0, {fuelAlgorithm == LM_SPEED_DENSITY} subMenu = idleVeCurve, "Idle VE Table", 0, {useSeparateVeForIdle == 1} - subMenu = afrTableTbl, "Target AFR Table", 0, {fuelAlgorithm == LM_SPEED_DENSITY} subMenu = iatFuelCorrCurve, "Intake air temperature fuel Multiplier" - subMenu = injPhaseTableTbl, "Injection Phase" subMenu = mapAccelTaper, "Engine Load Acceleration Enrichment Taper" subMenu = std_separator subMenu = fuelClosedLoopDialog, "Fuel short-term closed-loop correction" subMenu = AccelEnrich, "Accel/Decel Enrichment/Enleanment" subMenu = tpsTpsAccelTbl, "TPS/TPS Acceleration Extra Fuel" subMenu = std_separator - subMenu = ignitionTableTbl, "Ignition Advance Table" subMenu = idleAdvanceCurve, "Idle Ignition Advance Table", 0, {useSeparateAdvanceForIdle == 1} subMenu = crankingAdvanceCurve, "Cranking Ignition Advance Table", 0, {useSeparateAdvanceForCranking == 1} subMenu = ignitionIatCorrTableTbl, "Ignition Intake Air Temp correction" diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 5a6f6e962c..f4ed69bb1b 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -917,9 +917,6 @@ gaugeCategory = Fuel Data subMenu = engineChars, "Base Engine Settings" subMenu = triggerConfiguration, "Trigger Configuration" subMenu = std_separator - subMenu = injectionSettings, "Injection Settings" - subMenu = ignitionSettings, "Ignition Settings" - subMenu = std_separator subMenu = analogInputs, "Analog inputs" subMenu = cltSensor, "CLT Sensor Settings" subMenu = iatSensor, "IAT Sensor Settings" @@ -944,6 +941,25 @@ gaugeCategory = Fuel Data subMenu = cj125Function, "CJ125 Settings (wbo decoder)" subMenu = spiFunction, "SPI Settings" subMenu = etbDialog, "Electronic Thtottle Body (alpha version)" + + menu = "Injection" + subMenu = injectionSettings, "Injection Settings" + subMenu = std_separator + subMenu = fuelTableDialog, "Fuel Table", 0, {fuelAlgorithm != LM_SPEED_DENSITY} + subMenu = veTableDialog, "VE Table", 0, {fuelAlgorithm == LM_SPEED_DENSITY} + subMenu = afrTableTbl, "Target AFR Table", 0, {fuelAlgorithm == LM_SPEED_DENSITY} + subMenu = injPhaseTableTbl, "Injection Phase" + subMenu = std_separator + 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 Idle multiplier" + + menu = "Ignition" + subMenu = ignitionSettings, "Ignition Settings" + subMenu = ignitionTableTbl, "Ignition Advance Table" + subMenu = cltTimingCorrCurve, "Warmup timing correction" + menu = "Tuning" subMenu = generalSettings, "General" subMenu = monitoringSettings, "rusEfi Console Settings" @@ -953,28 +969,17 @@ gaugeCategory = Fuel Data subMenu = crankingTpsCurve, "Cranking TPS Multiplier" subMenu = crankingDurationCurve, "Cranking Duration Multiplier" subMenu = cltCrankingCurve, "Cranking IAC multiplier", 0, {overrideCrankingIacSetting == 1} - subMenu = std_separator - 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 Idle multiplier" - subMenu = cltTimingCorrCurve, "Warmup timing correction" subMenu = idleSettings, "Idle Settings" subMenu = cltIdleRPMCurve, "Idle Target RPM", 0, {idleMode == 0} subMenu = std_separator - subMenu = fuelTableDialog, "Fuel Table", 0, {fuelAlgorithm != LM_SPEED_DENSITY} - subMenu = veTableDialog, "VE Table", 0, {fuelAlgorithm == LM_SPEED_DENSITY} subMenu = idleVeCurve, "Idle VE Table", 0, {useSeparateVeForIdle == 1} - subMenu = afrTableTbl, "Target AFR Table", 0, {fuelAlgorithm == LM_SPEED_DENSITY} subMenu = iatFuelCorrCurve, "Intake air temperature fuel Multiplier" - subMenu = injPhaseTableTbl, "Injection Phase" subMenu = mapAccelTaper, "Engine Load Acceleration Enrichment Taper" subMenu = std_separator subMenu = fuelClosedLoopDialog, "Fuel short-term closed-loop correction" subMenu = AccelEnrich, "Accel/Decel Enrichment/Enleanment" subMenu = tpsTpsAccelTbl, "TPS/TPS Acceleration Extra Fuel" subMenu = std_separator - subMenu = ignitionTableTbl, "Ignition Advance Table" subMenu = idleAdvanceCurve, "Idle Ignition Advance Table", 0, {useSeparateAdvanceForIdle == 1} subMenu = crankingAdvanceCurve, "Cranking Ignition Advance Table", 0, {useSeparateAdvanceForCranking == 1} subMenu = ignitionIatCorrTableTbl, "Ignition Intake Air Temp correction"