From 47be0d8b5f3270e7c262d94939ac0eca261e2bf3 Mon Sep 17 00:00:00 2001
From: Andrey Gusakov <dron0gus@gmail.com>
Date: Sat, 20 Apr 2024 12:05:44 +0300
Subject: [PATCH] tunerstudio: add separate menu for CAN and related

---
 firmware/tunerstudio/tunerstudio.template.ini | 34 +++++++++++++++----
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/firmware/tunerstudio/tunerstudio.template.ini b/firmware/tunerstudio/tunerstudio.template.ini
index 003021f704..bcc694295e 100644
--- a/firmware/tunerstudio/tunerstudio.template.ini
+++ b/firmware/tunerstudio/tunerstudio.template.ini
@@ -2076,6 +2076,14 @@ menuDialog = main
 
 		subMenu = auxLinearSensors,			"Aux Sensors"
 
+	menu = "CAN-bus"
+		subMenu = canBusMain,				"CAN Bus Settings"
+		subMenu = std_separator
+
+		subMenu = speedSensorCan			"CAN Vehicle speed sensor"
+		subMenu = uegoCan,					"CAN O2 sensors"
+		subMune = egtInputsCan				"CAN EGT sensors"
+
 	menu = "&Controller"
 		subMenu = ecuStimulator,			"ECU stimulator"
 		subMenu = ioTest,					"Bench test"
@@ -2088,7 +2096,6 @@ menuDialog = main
 		subMenu = monitoringSettings,		"rusEFI console"
 		subMenu = std_separator
 
-		subMenu = canBusMain,				"CAN Bus Communication"
 		subMenu = sdCard,					"SD Card Logger" @@if_ts_show_sd_card
 		subMenu = connection,					"Connection"
 		subMenu = std_separator
@@ -3465,17 +3472,28 @@ cmd_set_engine_type_default					= "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_
 	dialog = egoSettings_IO2,	"O2 Sensor 2 I/O"
 		field = "Input channel",						afr_hwChannel2
 
-	dialog = egoSettings, "", yAxis
-		field = "Enable CAN Wideband",			enableAemXSeries, { canReadEnabled }
+	dialog = uegoCan, "CAN UEGO/wideband O2"
+		field = "Support for AEM or RusEFI CAN UEGO"
+		field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled }
+		field = "Wideband CAN bus", widebandOnSecondBus
+		field = "Force O2 sensor heating", forceO2Heating
+
+	dialog = uegoSerial, "Innovale LC-2 serial"
 		field = "Enable Innovate LC-2 Serial",			enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin }
+
+	dialog = egoSettings, "", yAxis
+		panel = uegoCan
+		panel = uegoSerial
 		panel = egoSettings_IO1
 		panel = egoSettings_IO2, {afr_hwChannel != @@ADC_CHANNEL_NONE@@ && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
 		panel = egoSettings_sensor, {afr_hwChannel != @@ADC_CHANNEL_NONE@@ && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
 
 ;			Engine->EGT inputs
-	dialog = egtInputs, "EGT inputs"
-		field = "CAN support only EGT1 and EGT2"
+	dialog = egtInputsCan, "CAN EGT sensors"
+		field = "CAN support only EGT1 and EGT2 inputs"
 		field = "CAN EGT (AEM X series of RusEFI)"		enableAemXSeriesEgt, { canReadEnabled }
+
+	dialog = egtInputsSpi, "SPI EGT sensors"
 		field = "If both CAN and SPI EGT sensors are used, please leave two first for CAN"
 		field = "MAX31855/MAX31856 SPI",				max31855spiDevice
 		field = "CS for EGT1",							max31855_cs1
@@ -3487,6 +3505,10 @@ cmd_set_engine_type_default					= "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_
 		field = "CS for EGT7",							max31855_cs7
 		field = "CS for EGT8",							max31855_cs8
 
+	dialog = egtInputs, "EGT inputs"
+		panel = egtInputsCan
+		panel = egtInputsSpi
+
 ;			Engine->idle Settings
 	dialog = idleSolenoid, "Solenoid"
 		field = "Idle Solenoid Primary output",		idle_solenoidPin,  { idle_solenoidPin != 0 ||  !useStepperIdle }
@@ -4616,8 +4638,6 @@ dialog = tcuControls, "Transmission Settings"
 		field = "!Disconnect all controllers you don't want to set!"
 		commandButton = "Set Index 0",	cmd_set_wideband_idx_0
 		commandButton = "Set Index 1",	cmd_set_wideband_idx_1
-		field = "Wideband CAN bus", widebandOnSecondBus
-		field = "Force O2 sensor heating", forceO2Heating
 
 	dialog = engineTypeDialog, "Popular vehicles"
 		field = "!These buttons send a command to rusEFI controller to apply preset values"