andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

idle closed loop vs open loop ui, etc (#3413) 

* open + closed

* put idle solenoid first

* actually hide etb pins

* missed a few prepends
This commit is contained in:
Matthew Kennedy 2021-10-26 12:04:09 -07:00 committed by GitHub
parent 7b8f1d3405
commit 8ed6d3bfa2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
firmware/config/boards/atlas/prepend.txt
View File

@ -0,0 +1 @@
#define ts_show_etb_pins false

1
firmware/config/boards/proteus/prepend.txt
View File

@ -15,6 +15,7 @@
#define ts_show_can2 false #define ts_show_can2 false
#define ts_show_software_knock true #define ts_show_software_knock true
#define ts_show_hardware_simulator false #define ts_show_hardware_simulator false
#define ts_show_etb_pins false
#define show_test_presets false #define show_test_presets false
#define show_Frankenso_presets false #define show_Frankenso_presets false

2
firmware/integration/rusefi_config.txt
View File

@ -1039,7 +1039,7 @@ bit unusedBitHere4
uint8_t etbNeutralPosition;+Expected neutral position;"%", 1, 0, 0, 100, 0 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 ! 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; 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. 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.

6
firmware/tunerstudio/rusefi.input
View File

@ -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 field = "Idle Solenoid Frequency", idle_solenoidFrequency, !useStepperIdle
dialog = etbHbridgeHardware, "ETB H-Bridge Hardware" dialog = etbHbridgeHardware, "ETB H-Bridge Hardware"
field = "PWM Frequency", etbFreq
field = "Two-wire mode", etb_use_two_wires field = "Two-wire mode", etb_use_two_wires
field = "No1 Direction #1", etbIo1_directionPin1 field = "No1 Direction #1", etbIo1_directionPin1
field = "No1 Direction #2", etbIo1_directionPin2 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 panel = idleStepperHwType
dialog = idleHwType, "Idle Valve Hardware", yAxis dialog = idleHwType, "Idle Valve Hardware", yAxis
panel = idleStepper
panel = idleSolenoid panel = idleSolenoid
panel = idleStepper
dialog = idlehw, "", yAxis dialog = idlehw, "", yAxis
field = "!ECU reboot needed to apply these settings" 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 = "Disable ETB Motor", pauseEtbControl
field = "H-Bridge #1 function", etbFunctions1 field = "H-Bridge #1 function", etbFunctions1
field = "H-Bridge #2 function", etbFunctions2 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 ; 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 ; criteria for the same panel when used in multiple places
; todo: report bug to TS? ; 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 ; 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" dialog = etbAutotune, "PID Autotune"
field = "First step: calibrate TPS and hit 'Burn'" field = "First step: calibrate TPS and hit 'Burn'"