Rearrange protection options in TS #436

FOME-Tech · Aug 6, 2024 · 7ee3e87 · 7ee3e87
1 parent af1b88a
commit 7ee3e87
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 22 deletions.
diff --git a/firmware/CHANGELOG.md b/firmware/CHANGELOG.md
@@ -40,14 +40,15 @@ or
  - Add options to enable/disable optional CAN frames (cams, EGT so far)
  - Add 1-5-4-8-3-7-2-6 and 1-6-5-10-2-7-3-8-4-9 firing orders
  - Console command `set_sensor_mock` now accepts a sensor by name, instead of index. Example: `set_sensor_mock CLT 85.5`
+ - TunerStudio UI improvements (#436, etc)
 
 ### Fixed
  - Improve performance with Lua CAN reception of a high volume of frames
  - Displayed units in TunerStudio change when switching between volume vs. mass injector flow modes #42
  - Make Toyota "3 Tooth Cam" decoder more robust #382
  - Flex sensor-derived fuel temperature indication works properly
  - Fix a scenario where noisy trigger can cause overdwell [rusefi/rusefi#6349](https://github.com/rusefi/rusefi/issues/6349)
- - Fix DFCO on engines without a MAP sensor #457
+ - Fix decel fuel cutoff (DFCO) on engines without a MAP sensor #457
 
 ## December 2023 Release
 

diff --git a/firmware/tunerstudio/tunerstudio.template.ini b/firmware/tunerstudio/tunerstudio.template.ini
@@ -1665,8 +1665,11 @@ menuDialog = main
 		subMenu = engineChars,				"Base engine"
 
 		groupMenu = "Limits and protection"
-			groupChildMenu = limitsAndFallback,		"Limits and fallbacks"
-			groupChildMenu = lambdaProtection,		"Lambda Protection", 0, { isInjectionEnabled }
+			groupChildMenu = revLimits,				"Rev limiter"
+			groupChildMenu = boostCutSettings,		"Boost cut"
+			groupChildMenu = dutyCycleLimiting,		"Injector duty cycle cut"
+			groupChildMenu = oilPressureProtection,		"Oil pressure protection"
+			groupChildMenu = lambdaProtection,		"Lambda protection", 0, { isInjectionEnabled }
 
 		subMenu = triggerConfiguration,		"Trigger"
 		subMenu = trigger_advanced, "Advanced Trigger"
@@ -3596,9 +3599,9 @@ cmd_set_engine_type_default					= "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_
 	dialog = lambdaProtectionRight, "Lambda Difference Table"
 		panel = lambdaMaxDeviationTableTbl
 
-	dialog = lambdaProtection, "Lambda Protection", border
-		panel = lambdaProtectionLeft, West
-		panel = lambdaProtectionRight, East
+	dialog = lambdaProtection, "Lambda Protection", xAxis
+		panel = lambdaProtectionLeft
+		panel = lambdaProtectionRight
 
 	dialog = vvtTargetBumping, "VVT Testing"
 		field = "Pressing the below buttons will move the respective cam's"
@@ -3795,36 +3798,36 @@ cmd_set_engine_type_default					= "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_
 		field = "!https://wiki.fome.tech/r/debugmode"
 		field = "Debug mode",							debugMode
 
-	dialog = dutyCycleLimiting, "Injector Duty Cycle Limiter"
+	dialog = dutyCycleLimiting, "Injector duty cycle cut"
 		field = "Instantaneous injector duty cycle limit",	maxInjectorDutyInstant, {isInjectionEnabled}
 		field = "Sustained injector duty cycle limit",	maxInjectorDutySustained, {isInjectionEnabled}
 		field = "Sustained injector duty cycle delay",	maxInjectorDutySustainedTimeout, {isInjectionEnabled}
 
-	dialog = limitsSettings, "Limits"
-		field = "Cut fuel on RPM limit",				cutFuelOnHardLimit
-		field = "Cut spark on RPM limit",				cutSparkOnHardLimit
-		field = "Use CLT-based RPM limit curve",		useCltBasedRpmLimit, { cutFuelOnHardLimit || cutSparkOnHardLimit }
-		field = "RPM hard limit",						rpmHardLimit, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && !useCltBasedRpmLimit }
-		field = "Hard limit hysteresis",				rpmHardLimitHyst, { cutFuelOnHardLimit || cutSparkOnHardLimit }
-		field = "Boost cut pressure",					boostCutPressure
+	dialog = oilPressureProtection, "Oil pressure protection"
 		field = "Minimum oil pressure after start",		minOilPressureAfterStart
-		panel = dutyCycleLimiting
 
 	dialog = etbLimits, "Electronic Throttle Limiting"
 		field = "Smoothly close the throttle to limit RPM."
 		field = "Soft limiter start",				etbRevLimitStart
 		field = "Soft limiter range",				etbRevLimitRange
 
-	dialog = limitsAndFallbackLeft
-		panel = limitsSettings
+	dialog = revLimitsLeft
+		field = "Cut fuel on RPM limit",				cutFuelOnHardLimit
+		field = "Cut spark on RPM limit",				cutSparkOnHardLimit
+		field = "Use CLT-based RPM limit curve",		useCltBasedRpmLimit, { cutFuelOnHardLimit || cutSparkOnHardLimit }
+		field = "RPM hard limit",						rpmHardLimit, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && !useCltBasedRpmLimit }
+		field = "Hard limit hysteresis",				rpmHardLimitHyst, { cutFuelOnHardLimit || cutSparkOnHardLimit }
 		panel = etbLimits
 
-    dialog = limitsAndFallbackCenter, "CLT-based RPM Limit"
-        panel = cltRevLimitCurve
+	dialog = revLimitsRight, "CLT-based RPM Limit"
+		panel = cltRevLimitCurve
+
+	dialog = revLimits, "Rev limiter", border
+		panel = revLimitsLeft, West
+		panel = revLimitsRight, East, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit }
 
-	dialog = limitsAndFallback, "Limits and fallbacks", border
-	    panel = limitsAndFallbackLeft, West
-   		panel = limitsAndFallbackCenter, Center, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit }
+	dialog = boostCutSettings, "Boost cut"
+		field = "Boost cut pressure",	boostCutPressure
 
 ;			Engine->Base Engine Settings
 	dialog = engineChars, "Base Engine Settings"