From 8ed6d3bfa2cb62d7a6acdbc43b50e3612b23efb7 Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Tue, 26 Oct 2021 12:04:09 -0700 Subject: [PATCH] idle closed loop vs open loop ui, etc (#3413) * open + closed * put idle solenoid first * actually hide etb pins * missed a few prepends --- firmware/config/boards/atlas/prepend.txt | 1 + firmware/config/boards/proteus/prepend.txt | 1 + firmware/integration/rusefi_config.txt | 2 +- firmware/tunerstudio/rusefi.input | 6 +++--- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/firmware/config/boards/atlas/prepend.txt b/firmware/config/boards/atlas/prepend.txt index e69de29bb2..3753309391 100644 --- a/firmware/config/boards/atlas/prepend.txt +++ b/firmware/config/boards/atlas/prepend.txt @@ -0,0 +1 @@ +#define ts_show_etb_pins false diff --git a/firmware/config/boards/proteus/prepend.txt b/firmware/config/boards/proteus/prepend.txt index 0f00bef89d..eb259fe914 100644 --- a/firmware/config/boards/proteus/prepend.txt +++ b/firmware/config/boards/proteus/prepend.txt @@ -15,6 +15,7 @@ #define ts_show_can2 false #define ts_show_software_knock true #define ts_show_hardware_simulator false +#define ts_show_etb_pins false #define show_test_presets false #define show_Frankenso_presets false diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 6c7514cfc7..fb1879c764 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -1039,7 +1039,7 @@ bit unusedBitHere4 uint8_t etbNeutralPosition;+Expected neutral position;"%", 1, 0, 0, 100, 0 ! todo: convert this into a bit setting no need for 4 bytes and we do not expect a third option any day soon -custom idle_mode_e 4 bits, U32, @OFFSET@, [0:0], "Closed Loop", "Open Loop" +custom idle_mode_e 4 bits, U32, @OFFSET@, [0:0], "Open Loop + Closed Loop", "Open Loop" idle_mode_e idleMode;See also idleRpmPid; bit isInjectionEnabled;+Enable fuel injection - This is default off for new projects as a safety feature, set to "true" to enable fuel injection and further injector settings. diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index ed7b7385a3..d0c7a6a7af 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -2675,7 +2675,6 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00" field = "Idle Solenoid Frequency", idle_solenoidFrequency, !useStepperIdle dialog = etbHbridgeHardware, "ETB 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 @@ -2727,8 +2726,8 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00" panel = idleStepperHwType dialog = idleHwType, "Idle Valve Hardware", yAxis - panel = idleStepper panel = idleSolenoid + panel = idleStepper dialog = idlehw, "", yAxis field = "!ECU reboot needed to apply these settings" @@ -3470,11 +3469,12 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00" field = "Disable ETB Motor", pauseEtbControl field = "H-Bridge #1 function", etbFunctions1 field = "H-Bridge #2 function", etbFunctions2 + field = "PWM Frequency", etbFreq ; 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 ; todo: report bug to TS? ; another todo: split panel into two panels so that we can enable/disable h-bridge #1 separately from h-bridge #2 - panel = etbHbridgeHardware, { etbFunctions1 != @@etb_function_e_ETB_None@@ || etbFunctions2 != @@etb_function_e_ETB_None@@ || (useStepperIdle && useHbridgesToDriveIdleStepper) } + panel = etbHbridgeHardware, { etbFunctions1 != @@etb_function_e_ETB_None@@ || etbFunctions2 != @@etb_function_e_ETB_None@@ || (useStepperIdle && useHbridgesToDriveIdleStepper) } @@if_ts_show_etb_pins dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'"