From 1cdd1b86a9b81066dbce754b7d285dbf3fa89d60 Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Tue, 10 Mar 2020 11:31:00 -0700 Subject: [PATCH] hbridge idle ui (#1178) --- firmware/tunerstudio/rusefi.input | 47 ++++++++++++++++++------------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 928169fc22..804acda0c9 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -2011,24 +2011,38 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Idle Solenoid Pin", idle_solenoidPin, !useStepperIdle field = "Second Idle Solenoid Pin", secondSolenoidPin, { !useStepperIdle && isDoubleSolenoidIdle } field = "Idle Solenoid Frequency", idle_solenoidFrequency, !useStepperIdle - + + dialog = hbridgeHardware, "H-Bridge Hardware" + field = "PWM Frequency", etbFreq + field = "Two-wire mode", etb_use_two_wires + field = "No1 Direction #1", etbIo1_directionPin1 + field = "No1 Direction #2", etbIo1_directionPin2 + field = "No1 Control #1", etbIo1_controlPin1, { etb_use_two_wires == 0 } + field = "No2 Direction #1", etbIo2_directionPin1 + field = "No2 Direction #2", etbIo2_directionPin2 + field = "No2 Control #1", etbIo2_controlPin1, { etb_use_two_wires == 0} + + dialog = idleStepperHw, "Stepper Hardware" + field = "Idle Stepper Step Pin", idle_stepperStepPin + field = "Idle Stepper Dir Pin", idle_stepperDirectionPin + field = "Idle Stepper Enable Pin", stepperEnablePin + field = "Idle Stepper Enable Pin Mode", stepperEnablePinMode + dialog = idleStepper, "Stepper" - field = "useHbridges", useHbridges - field = "Idle Stepper Step Pin", idle_stepperStepPin, useStepperIdle - field = "Idle Stepper Dir Pin", idle_stepperDirectionPin, useStepperIdle - field = "Idle Stepper Enable Pin", stepperEnablePin, useStepperIdle - field = "Idle Stepper Enable Pin Mode", stepperEnablePinMode, useStepperIdle + field = "Drive stepper with dual H bridges", useHbridges, useStepperIdle field = "Stepper reaction time", idleStepperReactionTime, useStepperIdle field = "Stepper total steps", idleStepperTotalSteps, useStepperIdle field = "Stepper parking extra steps, %", stepperParkingExtraSteps, useStepperIdle field = "Force parking every restart", stepperForceParkingEveryRestart, useStepperIdle - + panel = idleStepperHw, { useStepperIdle && !useHbridges } + panel = hbridgeHardware, { useStepperIdle && useHbridges } + dialog = idleHwType, "Idle Valve Hardware", border panel = idleSolenoid, West panel = idleStepper, East - + dialog = idlehw, "", yAxis - field = "!ECU reboot needed to apply these settings" + field = "!ECU reboot needed to apply these settings" field = "Use Stepper", useStepperIdle field = "Double Solenoid Mode", isDoubleSolenoidIdle panel = idleHwType @@ -2615,17 +2629,12 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Pause ETB control", pauseEtbControl field = "Throttle Pedal Up", throttlePedalUpVoltage field = "Throttle Pedal Wide Open", throttlePedalWOTVoltage - field = "Two-wire mode", etb_use_two_wires, {throttlePedalPositionAdcChannel != 16} - field = "PWM Frequency", etbFreq, {throttlePedalPositionAdcChannel != 16} field = etbCalibrationOnStart, etbCalibrationOnStart - field = "No1 Direction #1", etbIo1_directionPin1, {throttlePedalPositionAdcChannel != 16} - field = "No1 Direction #2", etbIo1_directionPin2, {throttlePedalPositionAdcChannel != 16} - field = "No1 Control #1", etbIo1_controlPin1, {throttlePedalPositionAdcChannel != 16 && etb_use_two_wires == 0} - field = "No2 Direction #1", etbIo2_directionPin1, {throttlePedalPositionAdcChannel != 16} - field = "No2 Direction #2", etbIo2_directionPin2, {throttlePedalPositionAdcChannel != 16} - field = "No2 Control #1", etbIo2_controlPin1, {throttlePedalPositionAdcChannel != 16 && etb_use_two_wires == 0} - field = "TPS#2 min", tps2Min, {etbIo2_directionPin1 != 0} - field = "TPS#2 max", tps2Max, {etbIo2_directionPin1 != 0} + field = "TPS#2 min", tps2Min, { tps2_1AdcChannel != 16 } + field = "TPS#2 max", tps2Max, { tps2_1AdcChannel != 16 } + ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility + ; criteria for the same panel when used in multiple places + panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 16 || useStepperIdle && useHbridges } panel = etbPidDialog dialog = etbDialogRight