From 5fc35e21e91f3b8d281c54304709f7b748a38cd7 Mon Sep 17 00:00:00 2001 From: Josh Stewart Date: Wed, 17 Feb 2021 09:48:40 +1100 Subject: [PATCH] Add back missing mixed-mode idle condition removed in last commit --- reference/speeduino.ini | 76 ++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/reference/speeduino.ini b/reference/speeduino.ini index 62e50e3e..c6beafaa 100644 --- a/reference/speeduino.ini +++ b/reference/speeduino.ini @@ -2382,54 +2382,54 @@ menuDialog = main dialog = egoControl, "" topicHelp = "https://wiki.speeduino.com/en/configuration/O2" - field = "Sensor Type", egoType + field = "Sensor Type", egoType field = "#Please ensure you calibrate your O2 sensor in the Tools menu", { egoType } - field = "Algorithm", egoAlgorithm, { egoType } - field = "Ignition Events per Step", egoCount, { egoType && (egoAlgorithm < 3) } - field = "Controller Auth +/-", egoLimit, { egoType && (egoAlgorithm < 3) } - field = "Only correct above:", ego_min, { egoType && (egoAlgorithm < 3) } - field = "and correct below:", ego_max, { egoType && (egoAlgorithm < 3) } + field = "Algorithm", egoAlgorithm, { egoType } + field = "Ignition Events per Step", egoCount, { egoType && (egoAlgorithm < 3) } + field = "Controller Auth +/-", egoLimit, { egoType && (egoAlgorithm < 3) } + field = "Only correct above:", ego_min, { egoType && (egoAlgorithm < 3) } + field = "and correct below:", ego_max, { egoType && (egoAlgorithm < 3) } - field = "Active Above Coolant", egoTemp, { egoType && (egoAlgorithm < 3) } - field = "Active Above RPM", egoRPM, { egoType && (egoAlgorithm < 3) } - field = "Active Below TPS", egoTPSMax, { egoType && (egoAlgorithm < 3) } - field = "EGO delay after start", ego_sdelay, { (egoAlgorithm < 3) } - field = "PID Proportional Gain", egoKP, { egoType && (egoAlgorithm == 2) } - field = "PID Integral", egoKI, { egoType && (egoAlgorithm == 2) } - field = "PID Derivative", egoKD, { egoType && (egoAlgorithm == 2) } + field = "Active Above Coolant", egoTemp, { egoType && (egoAlgorithm < 3) } + field = "Active Above RPM", egoRPM, { egoType && (egoAlgorithm < 3) } + field = "Active Below TPS", egoTPSMax, { egoType && (egoAlgorithm < 3) } + field = "EGO delay after start", ego_sdelay, { (egoAlgorithm < 3) } + field = "PID Proportional Gain", egoKP, { egoType && (egoAlgorithm == 2) } + field = "PID Integral", egoKI, { egoType && (egoAlgorithm == 2) } + field = "PID Derivative", egoKD, { egoType && (egoAlgorithm == 2) } dialog = fanSettings,"Fan Settings",7 topicHelp = "https://wiki.speeduino.com/en/configuration/Thermo_fan" - field = "Fan Mode", fanEnable - field = "Allow fan when off", fanWhenOff, { fanEnable } - field = "Allow fan when cranking", fanWhenCranking, { fanEnable } - field = "Fan output pin", fanPin, { fanEnable } - field = "Fan Output Inverted", fanInv , { fanEnable } - field = "Fan switching temperature", fanSP, { fanEnable } - field = "Fan hysteresis", fanHyster, { fanEnable } + field = "Fan Mode", fanEnable + field = "Allow fan when off", fanWhenOff, { fanEnable } + field = "Allow fan when cranking", fanWhenCranking, { fanEnable } + field = "Fan output pin", fanPin, { fanEnable } + field = "Fan Output Inverted", fanInv, { fanEnable } + field = "Fan switching temperature",fanSP, { fanEnable } + field = "Fan hysteresis", fanHyster, { fanEnable } dialog = stepper_idle, "Stepper Idle" - field = "Step time (ms)", iacStepTime, { iacAlgorithm == 4 || iacAlgorithm == 5 } - field = "Cool time (ms)", iacCoolTime, { iacAlgorithm == 4 || iacAlgorithm == 5 } - field = "Home steps", iacStepHome, { iacAlgorithm == 4 || iacAlgorithm == 5 } - field = "Minimum Steps", iacStepHyster, { iacAlgorithm == 4 || iacAlgorithm == 5 } - field = "Don't exceed", iacMaxSteps, { iacAlgorithm == 4 || iacAlgorithm == 5 } - field = "Stepper Inverted", iacStepperInv, { iacAlgorithm == 4 || iacAlgorithm == 5 } + field = "Step time (ms)", iacStepTime, { iacAlgorithm == 4 || iacAlgorithm == 5 } + field = "Cool time (ms)", iacCoolTime, { iacAlgorithm == 4 || iacAlgorithm == 5 } + field = "Home steps", iacStepHome, { iacAlgorithm == 4 || iacAlgorithm == 5 } + field = "Minimum Steps", iacStepHyster, { iacAlgorithm == 4 || iacAlgorithm == 5 } + field = "Don't exceed", iacMaxSteps, { iacAlgorithm == 4 || iacAlgorithm == 5 } + field = "Stepper Inverted", iacStepperInv, { iacAlgorithm == 4 || iacAlgorithm == 5 } dialog = pwm_idle, "PWM Idle" - field = "Number of outputs", iacChannels, { iacAlgorithm == 2 || iacAlgorithm == 3 } - field = "Idle valve frequency", idleFreq, { iacAlgorithm == 2 || iacAlgorithm == 3 } - field = "Idle valve direction", iacPWMdir, { iacAlgorithm == 2 || iacAlgorithm == 3 } - field = "Run before start", iacPWMrun, { iacAlgorithm == 2 || iacAlgorithm == 3 } + field = "Number of outputs", iacChannels, { iacAlgorithm == 2 || iacAlgorithm == 3 || iacAlgorithm == 6 } + field = "Idle valve frequency", idleFreq, { iacAlgorithm == 2 || iacAlgorithm == 3 || iacAlgorithm == 6 } + field = "Idle valve direction", iacPWMdir, { iacAlgorithm == 2 || iacAlgorithm == 3 || iacAlgorithm == 6 } + field = "Run before start", iacPWMrun, { iacAlgorithm == 2 || iacAlgorithm == 3 || iacAlgorithm == 6 } dialog = closedloop_idle, "Closed loop Idle" - field = "P", idleKP, { iacAlgorithm == 3 || iacAlgorithm == 5 || iacAlgorithm == 6} - field = "I", idleKI, { iacAlgorithm == 3 || iacAlgorithm == 5 || iacAlgorithm == 6} - field = "D", idleKD, { iacAlgorithm == 3 || iacAlgorithm == 5 || iacAlgorithm == 6} - field = "Minimum valve duty", iacCLminDuty, { iacAlgorithm == 3 || iacAlgorithm == 6} - field = "Maximum valve duty", iacCLmaxDuty, { iacAlgorithm == 3 || iacAlgorithm == 6} - field = "Integeral reset above TPS", iacTPSlimit { iacAlgorithm == 6 } - field = "Integeral reset RPM Hysteresis", iacRPMlimitHysteresis { iacAlgorithm == 6 } + field = "P", idleKP, { iacAlgorithm == 3 || iacAlgorithm == 5 || iacAlgorithm == 6} + field = "I", idleKI, { iacAlgorithm == 3 || iacAlgorithm == 5 || iacAlgorithm == 6} + field = "D", idleKD, { iacAlgorithm == 3 || iacAlgorithm == 5 || iacAlgorithm == 6} + field = "Minimum valve duty", iacCLminDuty, { iacAlgorithm == 3 || iacAlgorithm == 6} + field = "Maximum valve duty", iacCLmaxDuty, { iacAlgorithm == 3 || iacAlgorithm == 6} + field = "Integeral reset above TPS", iacTPSlimit, { iacAlgorithm == 6 } + field = "Integeral reset RPM Hysteresis", iacRPMlimitHysteresis, { iacAlgorithm == 6 } dialog = idleSettings, "Idle Settings" topicHelp = "https://wiki.speeduino.com/en/configuration/Idle" @@ -2448,7 +2448,7 @@ menuDialog = main field = "Idle Up Amount", idleUpAdder, { idleUpEnabled } dialog = idleUpOutputSettingsPanel, "Idle Up Output Settings", yAxis - field = "Idle Up Output Enabled", idleUpOutputEnabled, { idleUpEnabled } + field = "Idle Up Output Enabled", idleUpOutputEnabled, { idleUpEnabled } field = "Idle Up Output Inverted", idleUpOutputInv, { idleUpEnabled && idleUpOutputEnabled field = "Idle Up Output Pin", idleUpOutputPin, { idleUpEnabled && idleUpOutputEnabled }