ini07 Ignition & Injection refactor (#580)

* Ignition refactor

* Injection refactor

* Base Engine Settings refactor

firmware/tunerstudio/rusefi.input

@@ -924,24 +924,32 @@ menuDialog = main
 		
 	menu = "Injection"
 		subMenu = injectionSettings,		"Injection Settings"
+		subMenu = injectionDeadTime,		"Injector Dead Time"
 		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 = injPhaseTableTbl,         "Injection Phase Table"
 		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 = iatFuelCorrCurve,			"Intake air temperature fuel Multiplier"
+		subMenu = std_separator
+		subMenu = fuelClosedLoopDialog, 	"Fuel short-term closed-loop correction"
 
 	menu = "Ignition"
 		subMenu = ignitionSettings,			"Ignition Settings"
+		subMenu = dwellSettings,			"Dwell time"
+		subMenu = ignitionCylExtra,			"Ignition Cylinder Extra"
+		subMenu = std_separator
 		subMenu = ignitionTableTbl,			"Ignition Advance Table"
+		subMenu = std_separator
 		subMenu = cltTimingCorrCurve,		"Warmup timing correction"
+		subMenu = ignitionIatCorrTableTbl,	"Ignition IAT correction Table"
 		
 	menu = "Tuning"
-		subMenu = generalSettings,			"General"
 		subMenu = std_separator
 		subMenu = crankingDialog,           "Cranking"
 		subMenu = crankingCltCurve,	    	"Cranking Coolant Temp Multiplier"
@@ -1008,6 +1016,8 @@ menuDialog = main
 		subMenu = tachSettings,				"Tachometer output"
 		subMenu = idlehw,					"Idle Valve Hardware"
 		subMenu	= std_separator
+		subMenu = injectorOutputSettings,	"Injector Outputs"
+		subMenu = ignitionOutputSettings,	"Ignition Outputs"
 		subMenu = deviceOutputSettings,		"Actuator Outputs"
 		subMenu	= std_separator
 		subMenu = joystickPanel,			"Joystick"
@@ -1107,13 +1117,13 @@ cmd_stop_engine              = "w\x00\x99\x00\x00"
 		field = "maxRPM minTPS", tChargeMaxRpmMinTps
 		field = "maxRPM maxTPS", tChargeMaxRpmMaxTps
 
-	dialog = baseInjection, "Injection"
+	dialog = baseInjection, "General"
 		field = "Enabled",						isInjectionEnabled
 		field = "Mode",							injectionMode, {isInjectionEnabled == 1}
 		field = "#Batch injection with individual wiring"
 		field = "Two wire batch",				twoWireBatchInjection, {isInjectionEnabled == 1 && injectionMode == 2}
 
-	dialog = baseIgnition, "Ignition"		
+	dialog = ignitionSettings, "Ignition Settings"
 		field = "Enabled",						isIgnitionEnabled
 		field = "Mode",							ignitionMode, {isIgnitionEnabled == 1}
 		field = "#Wasted spark with individual coils"
@@ -1122,17 +1132,13 @@ cmd_stop_engine              = "w\x00\x99\x00\x00"
 		field = "#Use fixed timing while validating with a timing gun"
 		field = "Fixed Timinig",				fixedTiming, {isIgnitionEnabled == 1 && timingMode == 1}
 
-
-;			Engine->Base Engine Settings
-	dialog = engineChars,	"Base Engine Settings"
+	dialog = baseEngineConfig, "Engine Configuration"
 ;		field = "Engine Preset",						engineType
 		field = "Number of Cylinders",					cylindersCount
 		field = "Engine Displacement",         			displacement
 		field = "debug fields",							debugMode
 		field = ""
 		field = "Firing Order",							firingOrder
-		panel = baseInjection
-		panel = baseIgnition
 
 ;			Engine->Trigger configuration
 	dialog = triggerConfiguration_settings,	"Settings Trigger"
@@ -1174,7 +1180,7 @@ cmd_stop_engine              = "w\x00\x99\x00\x00"
 		field = "!phase offset is usually not needed"
 		field = "phase offset",				extraInjectionOffset
 		
-	dialog = injIO, "Injector Output",	yAxis
+	dialog = injectorOutputSettings, "Injector Outputs",	yAxis
 		field = "!ECU reboot needed to apply these settings"
 		field = "injection Pin Mode",       			injectionPinMode
 		field = "Injection Pin 1",						injectionPins1
@@ -1190,12 +1196,11 @@ cmd_stop_engine              = "w\x00\x99\x00\x00"
 		field = "Injection Pin 11 ",					injectionPins11, {cylindersCount > 10}
 		field = "Injection Pin 12 ",					injectionPins12, {cylindersCount > 11}	
 	
-	dialog = injectorSetting, "", yAxis
-		panel = injChars,				North
-		panel = injIO,					East
+	dialog = injectionSettings,	""
+		panel = baseInjection
+		panel = injChars
 		
-	dialog = injectionSettings,	"",	xAxis
-		panel = injectorSetting,		West
+	dialog = injectionDeadTime,	"", yAxis
 		panel = injectorsDeadTime,		East
 
 	dialog = ignitionCylExtra, "Ignition Cylinder Extra"
@@ -1232,10 +1237,11 @@ cmd_stop_engine              = "w\x00\x99\x00\x00"
 		field = "Dizzy out Pin",         	    	    dizzySparkOutputPin
 		field = "Dizzy out Pin Mode",                   dizzySparkOutputPinMode 
 		
-	dialog = ignitionSettings, "", xAxis
-		panel = ignitionOutputs,	West
+	dialog = ignitionOutputSettings, "", xAxis
+		panel = ignitionOutputs
+	
+	dialog = dwellSettings, "", yAxis
 		panel = dwellCorrection,	Center
-		panel = ignitionCylExtra,	East
 		
 ;			Engine->Aux1 Thermistor Settings
 	dialog = auxTempSensor1Sensor,	"aux1 Thermistor Settings"
@@ -1839,6 +1845,11 @@ cmd_stop_engine              = "w\x00\x99\x00\x00"
 		field = "comm status pin",						communicationPin
 		field = "running status",						runningPin
 		
+;			Engine->Base Engine Settings
+	dialog = engineChars, "Base Engine Settings"
+		panel = baseEngineConfig
+		panel = generalSettings
+
 	dialog = crankingFuel, "Fuel"
 		field = "Injection Mode",						crankingInjectionMode
 		field = "Base Fuel Pulse Width", 				cranking_baseFuel