From 5b8dfbf4445b30006683d1074e02e4e1bc81b1cb Mon Sep 17 00:00:00 2001 From: rusefi Date: Sat, 1 Jun 2019 18:29:50 -0400 Subject: [PATCH] board-specific usability #808 hiding menu items for specific boards --- firmware/config/boards/frankenso/prepend.txt | 1 + firmware/config/boards/microrusefi/prepend.txt | 1 + firmware/config/boards/prometheus/prepend.txt | 2 ++ firmware/integration/rusefi_config.txt | 4 ++++ firmware/tunerstudio/rusefi.ini | 8 ++++---- firmware/tunerstudio/rusefi.input | 6 +++--- firmware/tunerstudio/rusefi_frankenso.ini | 8 ++++---- firmware/tunerstudio/rusefi_microrusefi.ini | 7 +++---- firmware/tunerstudio/rusefi_prometheus.ini | 5 +---- 9 files changed, 23 insertions(+), 19 deletions(-) create mode 100644 firmware/config/boards/frankenso/prepend.txt create mode 100644 firmware/config/boards/microrusefi/prepend.txt create mode 100644 firmware/config/boards/prometheus/prepend.txt diff --git a/firmware/config/boards/frankenso/prepend.txt b/firmware/config/boards/frankenso/prepend.txt new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/firmware/config/boards/frankenso/prepend.txt @@ -0,0 +1 @@ + diff --git a/firmware/config/boards/microrusefi/prepend.txt b/firmware/config/boards/microrusefi/prepend.txt new file mode 100644 index 0000000000..372c57a679 --- /dev/null +++ b/firmware/config/boards/microrusefi/prepend.txt @@ -0,0 +1 @@ +#define ts_show_hip9011 false \ No newline at end of file diff --git a/firmware/config/boards/prometheus/prepend.txt b/firmware/config/boards/prometheus/prepend.txt new file mode 100644 index 0000000000..38eb5328e4 --- /dev/null +++ b/firmware/config/boards/prometheus/prepend.txt @@ -0,0 +1,2 @@ +#define ts_show_hip9011 false +#define ts_show_etb false \ No newline at end of file diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 44b357283c..de17bc5748 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -1203,3 +1203,7 @@ end_struct #define GAUGE_NAME_DWELL_DUTY "dwell: coil duty cycle" #define GAUGE_COIL_DWELL_TIME "dwell: coil charge time" + +! some board files override this value using prepend file +#define ts_show_hip9011 true +#define ts_show_etb true diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 72bcab64fa..3e7194d2cc 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -72,7 +72,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Sat Jun 01 17:13:22 EDT 2019 +; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Sat Jun 01 18:20:38 EDT 2019 pageSize = 20000 page = 1 @@ -1999,8 +1999,8 @@ menuDialog = main subMenu = std_separator subMenu = fanSetting, "Fan Settings" subMenu = malfunction, "MIL Settings" - subMenu = etbDialog, "Electronic Throttle Body (beta version)" - subMenu = etbTpsBiasCurve, "Electronic Throttle Body Bias Curve" + subMenu = etbDialog, "Electronic Throttle Body (beta version)" + subMenu = etbTpsBiasCurve, "Electronic Throttle Body Bias Curve" subMenu = std_separator subMenu = std_realtime, "&Realtime Display", 0 @@ -2093,7 +2093,7 @@ menuDialog = main subMenu = narrowToWideOxygenCurve, "Narrow to Wideband approximation" subMenu = cj125Function, "CJ125 Settings (wbo decoder)" subMenu = std_separator - subMenu = hipFunction, "HIP9011 Settings (knock sensor) (alpha version)" + subMenu = hipFunction, "HIP9011 Settings (knock sensor) (alpha version)" subMenu = speedSensor, "Vehicle Speed sensor" subMenu = oilPressureSensor, "Oil Pressure sensor" diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 9f933f4237..15964be9b9 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1065,8 +1065,8 @@ menuDialog = main subMenu = std_separator subMenu = fanSetting, "Fan Settings" subMenu = malfunction, "MIL Settings" - subMenu = etbDialog, "Electronic Throttle Body (beta version)" - subMenu = etbTpsBiasCurve, "Electronic Throttle Body Bias Curve" + subMenu = etbDialog, "Electronic Throttle Body (beta version)" @@if_ts_show_etb + subMenu = etbTpsBiasCurve, "Electronic Throttle Body Bias Curve" @@if_ts_show_etb subMenu = std_separator subMenu = std_realtime, "&Realtime Display", 0 @@ -1159,7 +1159,7 @@ menuDialog = main subMenu = narrowToWideOxygenCurve, "Narrow to Wideband approximation" subMenu = cj125Function, "CJ125 Settings (wbo decoder)" subMenu = std_separator - subMenu = hipFunction, "HIP9011 Settings (knock sensor) (alpha version)" + subMenu = hipFunction, "HIP9011 Settings (knock sensor) (alpha version)" @@if_ts_show_hip9011 subMenu = speedSensor, "Vehicle Speed sensor" subMenu = oilPressureSensor, "Oil Pressure sensor" diff --git a/firmware/tunerstudio/rusefi_frankenso.ini b/firmware/tunerstudio/rusefi_frankenso.ini index 19f90d4bf5..7bc10608b1 100644 --- a/firmware/tunerstudio/rusefi_frankenso.ini +++ b/firmware/tunerstudio/rusefi_frankenso.ini @@ -72,7 +72,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Sat Jun 01 17:13:23 EDT 2019 +; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Sat Jun 01 18:20:42 EDT 2019 pageSize = 20000 page = 1 @@ -1999,8 +1999,8 @@ menuDialog = main subMenu = std_separator subMenu = fanSetting, "Fan Settings" subMenu = malfunction, "MIL Settings" - subMenu = etbDialog, "Electronic Throttle Body (beta version)" - subMenu = etbTpsBiasCurve, "Electronic Throttle Body Bias Curve" + subMenu = etbDialog, "Electronic Throttle Body (beta version)" + subMenu = etbTpsBiasCurve, "Electronic Throttle Body Bias Curve" subMenu = std_separator subMenu = std_realtime, "&Realtime Display", 0 @@ -2093,7 +2093,7 @@ menuDialog = main subMenu = narrowToWideOxygenCurve, "Narrow to Wideband approximation" subMenu = cj125Function, "CJ125 Settings (wbo decoder)" subMenu = std_separator - subMenu = hipFunction, "HIP9011 Settings (knock sensor) (alpha version)" + subMenu = hipFunction, "HIP9011 Settings (knock sensor) (alpha version)" subMenu = speedSensor, "Vehicle Speed sensor" subMenu = oilPressureSensor, "Oil Pressure sensor" diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini index 85344c6475..1671c16269 100644 --- a/firmware/tunerstudio/rusefi_microrusefi.ini +++ b/firmware/tunerstudio/rusefi_microrusefi.ini @@ -72,7 +72,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Sat Jun 01 17:13:23 EDT 2019 +; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Sat Jun 01 18:23:17 EDT 2019 pageSize = 20000 page = 1 @@ -1999,8 +1999,8 @@ menuDialog = main subMenu = std_separator subMenu = fanSetting, "Fan Settings" subMenu = malfunction, "MIL Settings" - subMenu = etbDialog, "Electronic Throttle Body (beta version)" - subMenu = etbTpsBiasCurve, "Electronic Throttle Body Bias Curve" + subMenu = etbDialog, "Electronic Throttle Body (beta version)" + subMenu = etbTpsBiasCurve, "Electronic Throttle Body Bias Curve" subMenu = std_separator subMenu = std_realtime, "&Realtime Display", 0 @@ -2093,7 +2093,6 @@ menuDialog = main subMenu = narrowToWideOxygenCurve, "Narrow to Wideband approximation" subMenu = cj125Function, "CJ125 Settings (wbo decoder)" subMenu = std_separator - subMenu = hipFunction, "HIP9011 Settings (knock sensor) (alpha version)" subMenu = speedSensor, "Vehicle Speed sensor" subMenu = oilPressureSensor, "Oil Pressure sensor" diff --git a/firmware/tunerstudio/rusefi_prometheus.ini b/firmware/tunerstudio/rusefi_prometheus.ini index ef22b5a105..130fbdf52e 100644 --- a/firmware/tunerstudio/rusefi_prometheus.ini +++ b/firmware/tunerstudio/rusefi_prometheus.ini @@ -72,7 +72,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Sat Jun 01 17:13:24 EDT 2019 +; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Sat Jun 01 18:23:19 EDT 2019 pageSize = 20000 page = 1 @@ -1999,8 +1999,6 @@ menuDialog = main subMenu = std_separator subMenu = fanSetting, "Fan Settings" subMenu = malfunction, "MIL Settings" - subMenu = etbDialog, "Electronic Throttle Body (beta version)" - subMenu = etbTpsBiasCurve, "Electronic Throttle Body Bias Curve" subMenu = std_separator subMenu = std_realtime, "&Realtime Display", 0 @@ -2093,7 +2091,6 @@ menuDialog = main subMenu = narrowToWideOxygenCurve, "Narrow to Wideband approximation" subMenu = cj125Function, "CJ125 Settings (wbo decoder)" subMenu = std_separator - subMenu = hipFunction, "HIP9011 Settings (knock sensor) (alpha version)" subMenu = speedSensor, "Vehicle Speed sensor" subMenu = oilPressureSensor, "Oil Pressure sensor"