Skip to content

Consolidate Tunerstudio panels #491

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alrijleh wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Consolidate Tunerstudio panels #491

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
59e090b
Combined ASE table into dialog with rest of ASE settings
alrijleh Sep 18, 2024
62a406b
Combine AE setting menu with TPS tables/curve
alrijleh Sep 18, 2024
92deb1b
cranking + priming pulse
alrijleh Sep 18, 2024
4777546
remove extra labels
alrijleh Sep 18, 2024
f3278b3
adjust dfco settings to better fit low resolution
alrijleh Sep 18, 2024
a120652
removed extra label from dfco
alrijleh Sep 18, 2024
17be7d5
Merge branch 'master' into ts-combine-panels
mck1117 Nov 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 27 additions & 12 deletions firmware/tunerstudio/tunerstudio.template.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1231,7 +1231,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
Expand Down Expand Up @@ -1764,7 +1764,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
Expand All @@ -1773,8 +1772,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 }
Expand Down Expand Up @@ -1822,8 +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

subMenu = crankingCltCurve, "Fuel CLT multiplier"
Expand Down Expand Up @@ -3905,11 +3900,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, ""
field = "After start enrichment mode", postCrankingFuelUseTable
field = "Post-Cranking factor", postCrankingFactor, {postCrankingFuelUseTable == 0}
field = "Duration", postCrankingDurationSec, {postCrankingFuelUseTable == 0}

dialog = postCrankingEnrichment, "After start enrichment", border
panel = postCrankingEnrichmentText, North
panel = postCrankingEnrichmentTable, 0, {postCrankingFuelUseTable}

dialog = primingFuelPulsePanel, "Priming fuel pulse"
field = "Priming delay", primingDelay
panel = primingPulse
Expand All @@ -3921,13 +3920,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, "", xAxis
panel = crankingDialogLeft
panel = primingFuelPulsePanel

dialog = TpsAccelPanel, "TPS"
field = "Set 'Debug Mode' to see detailed 'TPS acceleration enrichment' diagnostics"
field = "Length", tpsAccelLookback
Expand All @@ -3945,10 +3948,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, "", 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
Expand Down Expand Up @@ -4478,7 +4489,7 @@ dialog = tcuControls, "Transmission Settings"
panel = IgnRetardTableALS


dialog = coastingFuelCutControl, "Coasting Fuel Cutoff Settings"
dialog = coastingFuelCutControlText, ""
field = "Enable Coasting Fuel Cutoff", coastingFuelCutEnabled
field = ""
field = "Disable fuel cut on clutch", disableFuelCutOnClutch, {coastingFuelCutEnabled && clutchUpPin != @@ADC_CHANNEL_NONE@@}
Expand All @@ -4488,10 +4499,14 @@ 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}

dialog = coastingFuelCutControl, "Coasting Fuel Cutoff Settings", xAxis
panel = coastingFuelCutControlText
panel = dfcoMapRpmCorrection, {coastingFuelCutEnabled && useTableForDfcoMap}

dialog = rotaryDialog, "Rotary"
field = "Enable Trailing Sparks", enableTrailingSparks
Expand Down