fixing "Trigger Gap Override" UI

rusefi · Sep 17, 2023 · 86662f5 · 86662f5
1 parent 10fd1fa
commit 86662f5
Showing 1 changed file with 10 additions and 21 deletions.
diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input
@@ -2384,27 +2384,16 @@ cmd_set_engine_type_default					= "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_
 		field = "!This is a pretty advanced feature for when you are debugging trigger synchronization"
 		field = "Override well known trigger gaps",	overrideTriggerGaps
 		field = gapTrackingLengthOverride,				gapTrackingLengthOverride, { overrideTriggerGaps == 1 }
-		field = "First gap from",						triggerGapOverrideFrom1, { overrideTriggerGaps == 1 }
-		field = "First gap to",							triggerGapOverrideTo1  , { overrideTriggerGaps == 1 }
-
-		field = "Second gap from",						triggerGapOverrideFrom2, { overrideTriggerGaps == 1 }
-		field = "Second gap to",						triggerGapOverrideTo2, { overrideTriggerGaps == 1 }
-
-		field = "#Cam is primary if you have cam sensor as part of trigger shape"
-		; cam if
-		; two-stroke, or
-		; not crank trigger and ((vague trigger and cam choice) or not vague trigger)
-		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {twoStroke == 1 || ( !(@@TRIGGER_CRANK_BASED@@) && ( ( (@@TRIGGER_TYPE_WITHOUT_KNOWN_LOCATION@@) && skippedWheelOnCam) || !(@@TRIGGER_TYPE_WITHOUT_KNOWN_LOCATION@@)  ) )  }
-		field = "Crank Sensor (Primary channel)",		triggerInputPins1, 1, { !(twoStroke == 1 || ( !(@@TRIGGER_CRANK_BASED@@) && ( ( (@@TRIGGER_TYPE_WITHOUT_KNOWN_LOCATION@@) && skippedWheelOnCam) || !(@@TRIGGER_TYPE_WITHOUT_KNOWN_LOCATION@@)  ) )) }
-		field = "Invert Primary",						invertPrimaryTriggerSignal
-		field = "Secondary channel",					triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL@@) ) }, { triggerInputPins2 == 0 ||  (triggerInputPins1 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL@@) ) }
-		field = "!!! PLEASE UNSELECT !!!"				triggerInputPins2, 1,                                                                                               { triggerInputPins2 != 0 && !(triggerInputPins1 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL@@) ) }
-		field = "Invert Secondary",						invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL@@) }
-
-		field = "Gap #4 from",								triggerGapOverrideFrom4, { overrideTriggerGaps == 1 }
-		field = "Gap #4 to",								triggerGapOverrideTo4, { overrideTriggerGaps == 1 }
-		field = "Gap #5 from",								triggerGapOverrideFrom5, { overrideTriggerGaps == 1 }
-		field = "Gap #5 to",								triggerGapOverrideTo5, { overrideTriggerGaps == 1 }
+		field = "First gap from",	triggerGapOverrideFrom1,    { overrideTriggerGaps == 1 }
+		field = "First gap to",		triggerGapOverrideTo1,      { overrideTriggerGaps == 1 }
+		field = "Second gap from",	triggerGapOverrideFrom2,    { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 2 }
+		field = "Second gap to",	triggerGapOverrideTo2,      { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 2 }
+		field = "Gap #3 from",		triggerGapOverrideFrom3,    { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 3 }
+		field = "Gap #3 to",		triggerGapOverrideTo3,		{ overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 3 }
+		field = "Gap #4 from",		triggerGapOverrideFrom4,	{ overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 4 }
+		field = "Gap #4 to",		triggerGapOverrideTo4,		{ overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 4 }
+		field = "Gap #5 from",		triggerGapOverrideFrom5,	{ overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 }
+		field = "Gap #5 to",		triggerGapOverrideTo5,		{ overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 }
 
 	dialog = trigger_advanced,	"Advanced Trigger"
 		field = "Require cam/VVT sync for ignition",	isPhaseSyncRequiredForIgnition