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

UI flexibility

This commit is contained in:
rusefi 2024-07-20 00:01:46 -04:00
parent 3b10b378ce
commit dbf8a17767
2 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
firmware/integration/rusefi_config.txt
View File

@ -2051,6 +2051,7 @@ end_struct
#define INJECTOR_2_NAME "Injector #2"
#define ts_show_hbridge_function true
#define ts_show_aux_sensors true
#define ts_show_tps2_error true
#define ts_show_clutch_up true
#define ts_show_clutch_down true
@ -2278,6 +2279,7 @@ end_struct
#define ts_show_main_relay true
#define ts_show_main_relay_microRusEFI_message false
#define ts_show_etb true
#define ts_show_etb_bias_curve true
#define ts_show_etb_pins true
#define ts_show_forced_induction true
#define ts_show_vehicle_weight false
@ -2324,6 +2326,7 @@ end_struct
#define ts_show_air_conditioning true
#define ts_show_onboard_accelerometer false
#define ts_show_vvt_output true
#define show_vvt_output_pin true
! LAME! todo make this way less lame
#define ts_show_cylinder_2 true
#define ts_show_cylinder_3 true

60
firmware/tunerstudio/tunerstudio.template.ini
View File

@ -1844,8 +1844,8 @@ menuDialog = main
subMenu = injectorNonlinear, "Injector small-pulse correction", 0, {isInjectionEnabled == 1}
subMenu = stagedInjection, "Staged injection", 0, {isInjectionEnabled}@@if_ts_show_staged_injection
subMenu = stagedInjectionOutputs, "Staged injection outputs", 0, {isInjectionEnabled && enableStagedInjection}
subMenu = stagedInjectionTbl, "Staged injection % table", 0, {isInjectionEnabled && enableStagedInjection}
subMenu = stagedInjectionOutputs, "Staged injection outputs", 0, {isInjectionEnabled && enableStagedInjection}@@if_ts_show_staged_injection
subMenu = stagedInjectionTbl, "Staged injection % table", 0, {isInjectionEnabled && enableStagedInjection}@@if_ts_show_staged_injection
groupMenu = "Cylinder fuel trims"
groupChildMenu = fuelTrimTbl1, "Fuel trim cyl 1"
@ -2010,14 +2010,14 @@ menuDialog = main
subMenu = std_separator @@if_ts_show_etb
subMenu = etbDialog, "Electronic throttle body" @@if_ts_show_etb
subMenu = etbTpsBiasCurve, "ETB bias curve (feed forward)" @@if_ts_show_etb
subMenu = etbTpsBiasCurve, "ETB bias curve (feed forward)" @@if_ts_show_etb_bias_curve
subMenu = pedalToTpsTbl, "ETB pedal target" @@if_ts_show_etb
subMenu = throttle2TrimTbl, "ETB #2 Trim", { tps2_1AdcChannel != @@ADC_CHANNEL_NONE@@ } @@if_ts_show_etb
subMenu = throttle2TrimTbl, "ETB #2 Trim", { tps2_1AdcChannel != @@ADC_CHANNEL_NONE@@ } @@if_ts_show_tps2
subMenu = std_separator@@if_ts_show_vvt_output
subMenu = vvtPidDialog, "VVT outputs and PID", { vvtMode1 != @@vvt_mode_e_VVT_INACTIVE@@ }@@if_ts_show_vvt_output
subMenu = vvtTable1Tbl, "VVT intake target", { vvtMode1 != @@vvt_mode_e_VVT_INACTIVE@@ && vvtPins1 != 0 }@@if_ts_show_vvt_output
subMenu = vvtTable2Tbl, "VVT exhaust target", { vvtMode2 != @@vvt_mode_e_VVT_INACTIVE@@ && vvtPins2 != 0 }@@if_ts_show_vvt_output
subMenu = vvtTable2Tbl, "VVT exhaust target", { vvtMode2 != @@vvt_mode_e_VVT_INACTIVE@@ && vvtPins2 != 0 }@@if_ts_show_exhaust_vvt
subMenu = std_separator
subMenu = auxInputsDialog, "Lua Analog Inputs"
@ -2097,10 +2097,10 @@ menuDialog = main
subMenu = compressorDischargeTemperature, "Compressor discharge temp"
subMenu = egtInputs, "EGT" @@if_ts_show_egt
subMenu = wastegateIdlePos, "Wastegate and idle position sensors"
subMenu = acPressureSensor, "A/C Pressure"
subMenu = std_separator
subMenu = acPressureSensor, "A/C Pressure"@@if_ts_show_air_conditioning
subMenu = auxLinearSensors, "Aux Sensors"
subMenu = std_separator@@if_ts_show_aux_sensors
subMenu = auxLinearSensors, "Aux Sensors"@@if_ts_show_aux_sensors
menu = "CAN-bus"@@if_ts_show_top_level_can_menu
subMenu = canBusMain, "CAN Bus Settings"@@if_ts_show_top_level_can_menu
@ -2600,16 +2600,16 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_
dialog = cylinderBankSelect, "Cylinder Banks", yAxis
field = "Cylinder 1", cylinderBankSelect1, {isInjectionEnabled == 1}
field = "Cylinder 2", cylinderBankSelect2, {isInjectionEnabled == 1 && injectionMode != @@injection_mode_e_IM_SINGLE_POINT@@ && cylindersCount > 1}
field = "Cylinder 3", cylinderBankSelect3, {isInjectionEnabled == 1 && injectionMode != @@injection_mode_e_IM_SINGLE_POINT@@ && cylindersCount > 2}
field = "Cylinder 4", cylinderBankSelect4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3}
field = "Cylinder 5 ", cylinderBankSelect5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4}
field = "Cylinder 6 ", cylinderBankSelect6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5}
field = "Cylinder 7 ", cylinderBankSelect7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6}
field = "Cylinder 8 ", cylinderBankSelect8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7}
field = "Cylinder 9 ", cylinderBankSelect9, {isInjectionEnabled == 1 && cylindersCount > 8}
field = "Cylinder 10 ", cylinderBankSelect10, {isInjectionEnabled == 1 && cylindersCount > 9}
field = "Cylinder 11 ", cylinderBankSelect11, {isInjectionEnabled == 1 && cylindersCount > 10}
field = "Cylinder 12 ", cylinderBankSelect12, {isInjectionEnabled == 1 && cylindersCount > 11}
field = "Cylinder 3", cylinderBankSelect3, {isInjectionEnabled == 1 && injectionMode != @@injection_mode_e_IM_SINGLE_POINT@@ && cylindersCount > 2}@@if_ts_show_cylinder_3
field = "Cylinder 4", cylinderBankSelect4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3}@@if_ts_show_cylinder_4
field = "Cylinder 5 ", cylinderBankSelect5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4}@@if_ts_show_cylinder_5
field = "Cylinder 6 ", cylinderBankSelect6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5}@@if_ts_show_cylinder_6
field = "Cylinder 7 ", cylinderBankSelect7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6}@@if_ts_show_cylinder_7
field = "Cylinder 8 ", cylinderBankSelect8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7}@@if_ts_show_cylinder_8
field = "Cylinder 9 ", cylinderBankSelect9, {isInjectionEnabled == 1 && cylindersCount > 8}@@if_ts_show_cylinder_9
field = "Cylinder 10 ", cylinderBankSelect10, {isInjectionEnabled == 1 && cylindersCount > 9}@@if_ts_show_cylinder_10
field = "Cylinder 11 ", cylinderBankSelect11, {isInjectionEnabled == 1 && cylindersCount > 10}@@if_ts_show_cylinder_11
field = "Cylinder 12 ", cylinderBankSelect12, {isInjectionEnabled == 1 && cylindersCount > 11}@@if_ts_show_cylinder_12
dialog = injectorNonlinearPolynomial, "Polynomial Adder", yAxis
field = "Add nonlinearity below pulse", applyNonlinearBelowPulse
@ -2701,16 +2701,16 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_
field = "#Positive numbers retard, negative numbers advance"
field = "Offset cyl 1", timing_offset_cylinder1
field = "Offset cyl 2", timing_offset_cylinder2, {cylindersCount > 1}
field = "Offset cyl 3", timing_offset_cylinder3, {cylindersCount > 2}
field = "Offset cyl 4", timing_offset_cylinder4, {cylindersCount > 3}
field = "Offset cyl 5", timing_offset_cylinder5, {cylindersCount > 4}
field = "Offset cyl 6", timing_offset_cylinder6, {cylindersCount > 5}
field = "Offset cyl 7", timing_offset_cylinder7, {cylindersCount > 6}
field = "Offset cyl 8", timing_offset_cylinder8, {cylindersCount > 7}
field = "Offset cyl 9", timing_offset_cylinder9, {cylindersCount > 8}
field = "Offset cyl 10", timing_offset_cylinder10, {cylindersCount > 9}
field = "Offset cyl 11", timing_offset_cylinder11, {cylindersCount > 10}
field = "Offset cyl 12", timing_offset_cylinder12, {cylindersCount > 11}
field = "Offset cyl 3", timing_offset_cylinder3, {cylindersCount > 2}@@if_ts_show_cylinder_3
field = "Offset cyl 4", timing_offset_cylinder4, {cylindersCount > 3}@@if_ts_show_cylinder_4
field = "Offset cyl 5", timing_offset_cylinder5, {cylindersCount > 4}@@if_ts_show_cylinder_5
field = "Offset cyl 6", timing_offset_cylinder6, {cylindersCount > 5}@@if_ts_show_cylinder_6
field = "Offset cyl 7", timing_offset_cylinder7, {cylindersCount > 6}@@if_ts_show_cylinder_7
field = "Offset cyl 8", timing_offset_cylinder8, {cylindersCount > 7}@@if_ts_show_cylinder_8
field = "Offset cyl 9", timing_offset_cylinder9, {cylindersCount > 8}@@if_ts_show_cylinder_9
field = "Offset cyl 10", timing_offset_cylinder10, {cylindersCount > 9}@@if_ts_show_cylinder_10
field = "Offset cyl 11", timing_offset_cylinder11, {cylindersCount > 10}@@if_ts_show_cylinder_11
field = "Offset cyl 12", timing_offset_cylinder12, {cylindersCount > 11}@@if_ts_show_cylinder_12
dialog = stagedInjectionOutputs, "", yAxis
field = "Injection Stage 2 Output 1", injectionPinsStage21, {isInjectionEnabled && enableStagedInjection}
@ -4027,11 +4027,11 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_
dialog = vvtPidDialog0, "Configuration"
field = "Activation Delay", vvtActivationDelayMs
field = "Do not control below RPM", vvtControlMinRpm
field = "VVT solenoid bank 1 intake", vvtPins1
field = "VVT solenoid bank 1 intake", vvtPins1@@if_ts_show_vvt_output_pin
field = "VVT solenoid bank 1 exhaust", vvtPins2@@if_ts_show_exhaust_vvt
field = "VVT solenoid bank 2 intake", vvtPins3@@if_ts_show_second_bank
field = "VVT solenoid bank 2 exhaust", vvtPins4@@if_ts_show_exhaust_vvt
field = "PWM frequency", vvtOutputFrequency, {vvtPins1 != 0 || vvtPins2 != 0}
field = "PWM frequency", vvtOutputFrequency, {vvtPins1 != 0 || vvtPins2 != 0}@@if_ts_show_vvt_frequency
field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 }
field = "VVT solenoid exhaust cams control direction", invertVvtControlExhaust, { vvtPins2 != 0 || vvtPins4 != 0 }@@if_ts_show_exhaust_vvt