From f8b568f8c09657743764088694d313b0530c71f6 Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Fri, 31 May 2019 16:11:34 -0700 Subject: [PATCH] consolidate ign/inj outputs in to respective settings pages (#812) --- firmware/tunerstudio/rusefi.input | 85 ++++++++++++++++--------------- 1 file changed, 44 insertions(+), 41 deletions(-) diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 8be31c0774..388558d137 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1172,8 +1172,6 @@ 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" @@ -1323,7 +1321,26 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Use TPS instead of Load for VE table", useTPSBasedVeTable, {0} #endif - dialog = ignitionSettings, "Ignition Settings" + dialog = ignitionOutputs, "Ignition Outputs" + field = "Ignition Pin Mode", ignitionPinMode + field = "Ignition Pin 1", ignitionPins1, {isIgnitionEnabled == 1} + field = "Ignition Pin 2", ignitionPins2, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount > 1) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 2) || (firingOrder == 7) || (firingOrder == 9) || (firingOrder == 11) || (firingOrder == 12)))} + field = "Ignition Pin 3", ignitionPins3, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount > 2) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 1) || (firingOrder == 3) || (firingOrder == 4) || (firingOrder == 5) || (firingOrder == 9)))} + field = "Ignition Pin 4", ignitionPins4, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount > 3) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 5) || (firingOrder == 7) || (firingOrder == 12)))} + field = "Ignition Pin 5", ignitionPins5, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount > 4) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 4) || (firingOrder == 12)))} + field = "Ignition Pin 6", ignitionPins6, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount > 5) && (ignitionMode !=2 || twoWireBatchIgnition == 1 )} + field = "Ignition Pin 7", ignitionPins7, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount > 6) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 11)))} + field = "Ignition Pin 8", ignitionPins8, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount > 7) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 5) || (firingOrder == 11)))} + field = "Ignition Pin 9", ignitionPins9, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount > 8) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 5) || (firingOrder == 11)))} + field = "Ignition Pin 10", ignitionPins10, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount > 9) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 5) || (firingOrder == 11)))} + field = "Ignition Pin 11", ignitionPins11, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount > 10) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 5) || (firingOrder == 11)))} + field = "Ignition Pin 12", ignitionPins12, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount > 11) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 5) || (firingOrder == 11)))} + field = "This is useful to have tachometer working" + field = " while converting from distributor" + field = "Dizzy out Pin", dizzySparkOutputPin, {isIgnitionEnabled == 1} + field = "Dizzy out Pin Mode", dizzySparkOutputPinMode, {isIgnitionEnabled == 1} + + dialog = ignitionBasic, "" field = "Enabled", isIgnitionEnabled field = "Mode", ignitionMode, {isIgnitionEnabled == 1} field = "#Wasted spark with individual coils" @@ -1333,6 +1350,10 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "#Use fixed timing while validating with a timing gun" field = "Fixed Timinig", fixedTiming, {isIgnitionEnabled == 1 && timingMode == 1} + dialog = ignitionSettings, "", xAxis + panel = ignitionBasic + panel = ignitionOutputs + dialog = baseEngineConfig, "Engine Configuration" ; field = "Engine Preset", engineType field = "Number of Cylinders", cylindersCount @@ -1381,25 +1402,30 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = injectorOutputSettings, "Injector Outputs", yAxis field = "!ECU reboot needed to apply these settings" field = "injection Pin Mode", injectionPinMode - field = "With batched injection without 'Two wire batch emulation' fill only first count / 2 values" - field = "Injection Pin 1", injectionPins1 - field = "Injection Pin 2", injectionPins2, {injectionMode != 3 && cylindersCount > 1} - field = "Injection Pin 3", injectionPins3, {injectionMode != 3 && cylindersCount > 2} - field = "Injection Pin 4", injectionPins4, {injectionMode != 3 && cylindersCount > 3} - field = "Injection Pin 5 ", injectionPins5, {injectionMode != 3 && cylindersCount > 4} - field = "Injection Pin 6 ", injectionPins6, {injectionMode != 3 && cylindersCount > 5} - field = "Injection Pin 7 ", injectionPins7, {injectionMode != 3 && cylindersCount > 6} - field = "Injection Pin 8 ", injectionPins8, {injectionMode != 3 && cylindersCount > 7} - field = "Injection Pin 9 ", injectionPins9, {cylindersCount > 8} - field = "Injection Pin 10 ", injectionPins10, {cylindersCount > 9} - field = "Injection Pin 11 ", injectionPins11, {cylindersCount > 10} - field = "Injection Pin 12 ", injectionPins12, {cylindersCount > 11} + field = "With batched injection without 'Two wire batch emulation'" + field = " fill only first count / 2 values" + field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1} + field = "Injection Pin 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} + field = "Injection Pin 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} + field = "Injection Pin 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} + field = "Injection Pin 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} + field = "Injection Pin 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} + field = "Injection Pin 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} + field = "Injection Pin 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} + field = "Injection Pin 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} + field = "Injection Pin 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} + field = "Injection Pin 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} + field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} - dialog = injectionSettings, "" + dialog = injectionBasic, "" topicHelp = "fuelHelp" panel = baseInjection panel = injChars - + + dialog = injectionSettings, "", xAxis + panel = injectionBasic + panel = injectorOutputSettings + dialog = injectionDeadTime, "", yAxis panel = injectorsDeadTime, East @@ -1416,29 +1442,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Extra cyl #10", timing_offset_cylinder10, {cylindersCount > 9} field = "Extra cyl #11", timing_offset_cylinder11, {cylindersCount > 10} field = "Extra cyl #12", timing_offset_cylinder12, {cylindersCount > 11} - - -; Engine->Ignition Settings - dialog = ignitionOutputs, "Ignition Outputs" - field = "Ignition Pin Mode", ignitionPinMode - field = "Ignition Pin 1", ignitionPins1 - field = "Ignition Pin 2", ignitionPins2, {(ignitionMode != 0 && cylindersCount > 1) && (ignitionMode !=2 || twoWireBatchIgnition == 1 @@ignitionPin2logic@@)} - field = "Ignition Pin 3", ignitionPins3, {(ignitionMode != 0 && cylindersCount > 2) && (ignitionMode !=2 || twoWireBatchIgnition == 1 @@ignitionPin3logic@@)} - field = "Ignition Pin 4", ignitionPins4, {(ignitionMode != 0 && cylindersCount > 3) && (ignitionMode !=2 || twoWireBatchIgnition == 1 @@ignitionPin4logic@@)} - field = "Ignition Pin 5", ignitionPins5, {(ignitionMode != 0 && cylindersCount > 4) && (ignitionMode !=2 || twoWireBatchIgnition == 1 @@ignitionPin5logic@@)} - field = "Ignition Pin 6", ignitionPins6, {(ignitionMode != 0 && cylindersCount > 5) && (ignitionMode !=2 || twoWireBatchIgnition == 1 @@ignitionPin6logic@@)} - field = "Ignition Pin 7", ignitionPins7, {(ignitionMode != 0 && cylindersCount > 6) && (ignitionMode !=2 || twoWireBatchIgnition == 1 @@ignitionPin7logic@@)} - field = "Ignition Pin 8", ignitionPins8, {(ignitionMode != 0 && cylindersCount > 7) && (ignitionMode !=2 || twoWireBatchIgnition == 1 @@ignitionPin8logic@@)} - field = "Ignition Pin 9", ignitionPins9, {(ignitionMode != 0 && cylindersCount > 8) && (ignitionMode !=2 || twoWireBatchIgnition == 1 @@ignitionPin8logic@@)} - field = "Ignition Pin 10", ignitionPins10, {(ignitionMode != 0 && cylindersCount > 9) && (ignitionMode !=2 || twoWireBatchIgnition == 1 @@ignitionPin8logic@@)} - field = "Ignition Pin 11", ignitionPins11, {(ignitionMode != 0 && cylindersCount > 10) && (ignitionMode !=2 || twoWireBatchIgnition == 1 @@ignitionPin8logic@@)} - field = "Ignition Pin 12", ignitionPins12, {(ignitionMode != 0 && cylindersCount > 11) && (ignitionMode !=2 || twoWireBatchIgnition == 1 @@ignitionPin8logic@@)} - field = "This is useful to have tachometer working while converting from distributor" - field = "Dizzy out Pin", dizzySparkOutputPin - field = "Dizzy out Pin Mode", dizzySparkOutputPinMode - - dialog = ignitionOutputSettings, "", xAxis - panel = ignitionOutputs dialog = dwellSettings, "", yAxis panel = dwellCorrection, Center