From 59e090b24e4eaa9e0ab3d60915bf9d4f6218a1d2 Mon Sep 17 00:00:00 2001 From: alrijleh Date: Wed, 18 Sep 2024 00:26:31 -0400 Subject: [PATCH 1/6] Combined ASE table into dialog with rest of ASE settings --- firmware/tunerstudio/tunerstudio.template.ini | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/firmware/tunerstudio/tunerstudio.template.ini b/firmware/tunerstudio/tunerstudio.template.ini index 9485c56132..5d910bf04c 100644 --- a/firmware/tunerstudio/tunerstudio.template.ini +++ b/firmware/tunerstudio/tunerstudio.template.ini @@ -1234,7 +1234,7 @@ curve = 32Curve, "3-2 Shift Solenoid Percent by Speed" yBins = hpfpCompensationLoadBins, running_fuel zBins = hpfpCompensation - table = postCrankingEnrichmentTable, postCrankingEnrichmentTableId, "", 1 + table = postCrankingEnrichmentTable, postCrankingEnrichmentTableId, "Enrichment Multiplier Table", 1 xBins = postCrankingEnrichRuntimeBins, running_timeSinceCrankingInSecs yBins = postCrankingEnrichTempBins, coolant zBins = postCrankingEnrichTable @@ -1819,7 +1819,6 @@ menuDialog = main menu = "&Cranking" subMenu = crankingDialog, "Cranking settings" subMenu = postCrankingEnrichment, "After-start enrichment" - subMenu = postCrankingEnrichmentTable, "After-start enrichment table", 0, {postCrankingFuelUseTable} subMenu = primingFuelPulsePanel, "Priming pulse" subMenu = std_separator @@ -3909,11 +3908,15 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_ field = "Fixed cranking advance", crankingTimingAngle, {useSeparateAdvanceForCranking == 0} field = "Fixed Cranking Dwell", ignitionDwellForCrankingMs - dialog = postCrankingEnrichment, "After start enrichment" + dialog = postCrankingEnrichmentText, "After start enrichment" field = "After start enrichment mode", postCrankingFuelUseTable field = "Post-Cranking factor", postCrankingFactor, {postCrankingFuelUseTable == 0} field = "Duration", postCrankingDurationSec, {postCrankingFuelUseTable == 0} + dialog = postCrankingEnrichment, "After start enrichment", yAxis + panel = postCrankingEnrichmentText + panel = postCrankingEnrichmentTable, 0, {postCrankingFuelUseTable} + dialog = primingFuelPulsePanel, "Priming fuel pulse" field = "Priming delay", primingDelay panel = primingPulse From 62a406b881e40430f285eab42936afc035019e18 Mon Sep 17 00:00:00 2001 From: alrijleh Date: Wed, 18 Sep 2024 01:11:13 -0400 Subject: [PATCH 2/6] Combine AE setting menu with TPS tables/curve --- firmware/tunerstudio/tunerstudio.template.ini | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/firmware/tunerstudio/tunerstudio.template.ini b/firmware/tunerstudio/tunerstudio.template.ini index 5d910bf04c..bde1fe12a1 100644 --- a/firmware/tunerstudio/tunerstudio.template.ini +++ b/firmware/tunerstudio/tunerstudio.template.ini @@ -1770,8 +1770,6 @@ menuDialog = main # Accel enrichment subMenu = AccelEnrich, "Acceleration enrichment", 0, {isInjectionEnabled} - subMenu = tpsTpsAccelTbl, "TPS/TPS acceleration extra fuel", 0, {isInjectionEnabled} - subMenu = tpsTspRpmCorrection, "TPS/TPS AE RPM correction", 0, {isInjectionEnabled} groupMenu = "Wall wetting AE" groupChildMenu = wwTauCurves, "Evap time", 0, { complexWallModel != 0 } @@ -3913,8 +3911,8 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_ field = "Post-Cranking factor", postCrankingFactor, {postCrankingFuelUseTable == 0} field = "Duration", postCrankingDurationSec, {postCrankingFuelUseTable == 0} - dialog = postCrankingEnrichment, "After start enrichment", yAxis - panel = postCrankingEnrichmentText + dialog = postCrankingEnrichment, "After start enrichment", border + panel = postCrankingEnrichmentText, North panel = postCrankingEnrichmentTable, 0, {postCrankingFuelUseTable} dialog = primingFuelPulsePanel, "Priming fuel pulse" @@ -3952,10 +3950,18 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_ ; Tuning->AccelEnrichment - dialog = AccelEnrich, "Accel/Decel Enrichment" + dialog = AccelEnrichText "" panel = TpsAccelPanel panel = WallWettingAccelPanel + dialog = TpsTpsAeTables, "TPS Acceleration Enrichment" + panel = tpsTpsAccelTbl + panel = tpsTspRpmCorrection + + dialog = AccelEnrich, "Accel/Decel Enrichment", border + panel = AccelEnrichText, West + panel = TpsTpsAeTables, Center + dialog = wwTauCurves, "Wall wetting AE evaporation time" field = "#Set a base evaporation time based on coolant temperature, and a multiplier based on MAP." panel = wwTauCltCurve From 92deb1b16bd4b6863418648b0d16aaec6de4597c Mon Sep 17 00:00:00 2001 From: alrijleh Date: Wed, 18 Sep 2024 08:06:37 -0400 Subject: [PATCH 3/6] cranking + priming pulse --- firmware/tunerstudio/tunerstudio.template.ini | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/firmware/tunerstudio/tunerstudio.template.ini b/firmware/tunerstudio/tunerstudio.template.ini index bde1fe12a1..101bfbccb4 100644 --- a/firmware/tunerstudio/tunerstudio.template.ini +++ b/firmware/tunerstudio/tunerstudio.template.ini @@ -1761,7 +1761,6 @@ menuDialog = main subMenu = iatFuelCorrCurve, "IAT multiplier", 0, {isInjectionEnabled} subMenu = fuelClosedLoopDialog, "Closed loop fuel correction", 0, {isInjectionEnabled} subMenu = coastingFuelCutControl, "Deceleration fuel cutoff (DFCO)", 0, {isInjectionEnabled} - subMenu = dfcoMapRpmCorrection, "DFCO MAP to RPM threshold", 0, {isInjectionEnabled && useTableForDfcoMap } subMenu = std_separator # Injector model @@ -1817,7 +1816,6 @@ menuDialog = main menu = "&Cranking" subMenu = crankingDialog, "Cranking settings" subMenu = postCrankingEnrichment, "After-start enrichment" - subMenu = primingFuelPulsePanel, "Priming pulse" subMenu = std_separator subMenu = crankingCltCurve, "Fuel CLT multiplier" @@ -3926,13 +3924,17 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_ field = "Use Flex Fuel cranking table", flexCranking, { flexSensorPin != @@ADC_CHANNEL_NONE@@ } ; Cranking->Cranking Settings - dialog = crankingDialog, "Cranking Settings" + dialog = crankingDialogLeft, "Cranking Settings" field = "Cranking RPM limit", cranking_rpm panel = crankingFuel panel = crankingIgnition panel = crankingIAC panel = crankingAdv + dialog = crankingDialog, "Cranking Settings",xAxis + panel = crankingDialogLeft + panel = primingFuelPulsePanel + dialog = TpsAccelPanel, "TPS" field = "Set 'Debug Mode' to see detailed 'TPS acceleration enrichment' diagnostics" field = "Length", tpsAccelLookback @@ -4497,10 +4499,11 @@ dialog = tcuControls, "Transmission Settings" field = "Vehicle speed cut above", coastingFuelCutVssHigh, {coastingFuelCutEnabled} field = "Vehicle speed restore below", coastingFuelCutVssLow, {coastingFuelCutEnabled} field = "Cut fuel below TPS", coastingFuelCutTps, {coastingFuelCutEnabled} - field = "Cut fuel below MAP mode", useTableForDfcoMap, {coastingFuelCutEnabled} - field = "Cut fuel below MAP", coastingFuelCutMap, {coastingFuelCutEnabled && !useTableForDfcoMap} field = "Fuel cut delay", dfcoDelay, {coastingFuelCutEnabled} field = "Inhibit closed loop fuel after cut", noFuelTrimAfterDfcoTime, {coastingFuelCutEnabled} + field = "Cut fuel below MAP mode", useTableForDfcoMap, {coastingFuelCutEnabled} + field = "Cut fuel below MAP", coastingFuelCutMap, {coastingFuelCutEnabled && !useTableForDfcoMap} + panel = dfcoMapRpmCorrection, {coastingFuelCutEnabled && useTableForDfcoMap} dialog = rotaryDialog, "Rotary" field = "Enable Trailing Sparks", enableTrailingSparks From 4777546ca7d29371e7b59eca96c00686aad670ac Mon Sep 17 00:00:00 2001 From: alrijleh Date: Wed, 18 Sep 2024 08:47:28 -0400 Subject: [PATCH 4/6] remove extra labels --- firmware/tunerstudio/tunerstudio.template.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/firmware/tunerstudio/tunerstudio.template.ini b/firmware/tunerstudio/tunerstudio.template.ini index 101bfbccb4..1958d58ffd 100644 --- a/firmware/tunerstudio/tunerstudio.template.ini +++ b/firmware/tunerstudio/tunerstudio.template.ini @@ -3904,7 +3904,7 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_ field = "Fixed cranking advance", crankingTimingAngle, {useSeparateAdvanceForCranking == 0} field = "Fixed Cranking Dwell", ignitionDwellForCrankingMs - dialog = postCrankingEnrichmentText, "After start enrichment" + dialog = postCrankingEnrichmentText, "" field = "After start enrichment mode", postCrankingFuelUseTable field = "Post-Cranking factor", postCrankingFactor, {postCrankingFuelUseTable == 0} field = "Duration", postCrankingDurationSec, {postCrankingFuelUseTable == 0} @@ -3931,7 +3931,7 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_ panel = crankingIAC panel = crankingAdv - dialog = crankingDialog, "Cranking Settings",xAxis + dialog = crankingDialog, "", xAxis panel = crankingDialogLeft panel = primingFuelPulsePanel @@ -3960,7 +3960,7 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_ panel = tpsTpsAccelTbl panel = tpsTspRpmCorrection - dialog = AccelEnrich, "Accel/Decel Enrichment", border + dialog = AccelEnrich, "", border panel = AccelEnrichText, West panel = TpsTpsAeTables, Center From f3278b393378b187eb683250c735b32cc03d6eef Mon Sep 17 00:00:00 2001 From: alrijleh Date: Wed, 18 Sep 2024 17:33:47 -0400 Subject: [PATCH 5/6] adjust dfco settings to better fit low resolution --- firmware/tunerstudio/tunerstudio.template.ini | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/firmware/tunerstudio/tunerstudio.template.ini b/firmware/tunerstudio/tunerstudio.template.ini index 1958d58ffd..ea0da760ee 100644 --- a/firmware/tunerstudio/tunerstudio.template.ini +++ b/firmware/tunerstudio/tunerstudio.template.ini @@ -4491,7 +4491,7 @@ dialog = tcuControls, "Transmission Settings" panel = IgnRetardTableALS - dialog = coastingFuelCutControl, "Coasting Fuel Cutoff Settings" + dialog = coastingFuelCutControlText, "Coasting Fuel Cutoff Settings" field = "Enable Coasting Fuel Cutoff", coastingFuelCutEnabled field = "No cut below CLT", coastingFuelCutClt, {coastingFuelCutEnabled} field = "RPM cut fuel above", coastingFuelCutRpmHigh, {coastingFuelCutEnabled} @@ -4503,6 +4503,9 @@ dialog = tcuControls, "Transmission Settings" field = "Inhibit closed loop fuel after cut", noFuelTrimAfterDfcoTime, {coastingFuelCutEnabled} field = "Cut fuel below MAP mode", useTableForDfcoMap, {coastingFuelCutEnabled} field = "Cut fuel below MAP", coastingFuelCutMap, {coastingFuelCutEnabled && !useTableForDfcoMap} + + dialog = coastingFuelCutControl, "Coasting Fuel Cutoff Settings", xAxis + panel = coastingFuelCutControlText panel = dfcoMapRpmCorrection, {coastingFuelCutEnabled && useTableForDfcoMap} dialog = rotaryDialog, "Rotary" From a12065262b27d6a14c7d675aa26ee0326bdbfacb Mon Sep 17 00:00:00 2001 From: alrijleh Date: Wed, 18 Sep 2024 17:38:34 -0400 Subject: [PATCH 6/6] removed extra label from dfco --- firmware/tunerstudio/tunerstudio.template.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firmware/tunerstudio/tunerstudio.template.ini b/firmware/tunerstudio/tunerstudio.template.ini index ea0da760ee..f36c13d018 100644 --- a/firmware/tunerstudio/tunerstudio.template.ini +++ b/firmware/tunerstudio/tunerstudio.template.ini @@ -4491,7 +4491,7 @@ dialog = tcuControls, "Transmission Settings" panel = IgnRetardTableALS - dialog = coastingFuelCutControlText, "Coasting Fuel Cutoff Settings" + dialog = coastingFuelCutControlText, "" field = "Enable Coasting Fuel Cutoff", coastingFuelCutEnabled field = "No cut below CLT", coastingFuelCutClt, {coastingFuelCutEnabled} field = "RPM cut fuel above", coastingFuelCutRpmHigh, {coastingFuelCutEnabled}