From 119ad7cc137689af40f4d1de9f1ad471a35bd13b Mon Sep 17 00:00:00 2001 From: rusefi Date: Wed, 5 Jun 2019 00:36:35 -0400 Subject: [PATCH] board-specific usability #808 hiding more stuff from MRE --- firmware/config/boards/microrusefi/prepend.txt | 4 ++++ firmware/controllers/algo/rusefi_generated.h | 4 ++++ firmware/integration/rusefi_config.txt | 5 +++++ firmware/tunerstudio/rusefi.ini | 12 ++++++------ firmware/tunerstudio/rusefi.input | 10 +++++----- firmware/tunerstudio/rusefi_frankenso.ini | 12 ++++++------ firmware/tunerstudio/rusefi_microrusefi.ini | 7 +------ firmware/tunerstudio/rusefi_prometheus.ini | 12 ++++++------ 8 files changed, 37 insertions(+), 29 deletions(-) diff --git a/firmware/config/boards/microrusefi/prepend.txt b/firmware/config/boards/microrusefi/prepend.txt index a98dd3b79c..be1de5e491 100644 --- a/firmware/config/boards/microrusefi/prepend.txt +++ b/firmware/config/boards/microrusefi/prepend.txt @@ -1,2 +1,6 @@ #define ts_show_hip9011 false #define ts_show_cj125 false +#define ts_show_full_pinout false +#define ts_show_lcd false +#define ts_show_joystick false +#define ts_show_egt false diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index deb4305c02..46e5c2a17c 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -1757,8 +1757,12 @@ #define TS_FILE_VERSION 20171101 #define TS_OUTPUT_SIZE 356 #define ts_show_cj125 true +#define ts_show_egt true #define ts_show_etb true +#define ts_show_full_pinout true #define ts_show_hip9011 true +#define ts_show_joystick true +#define ts_show_lcd true #define tunerStudioSerialSpeed_offset 728 #define tunerStudioSerialSpeed_offset_hex 2d8 #define twoWireBatchIgnition_offset 1476 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 80a9d8e6fe..15340933c8 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -1208,3 +1208,8 @@ end_struct #define ts_show_hip9011 true #define ts_show_cj125 true #define ts_show_etb true +#define ts_show_full_pinout true +#define ts_show_lcd true +#define ts_show_joystick true +#define ts_show_egt true + diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index a6844a8d77..b186102f4d 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 Tue Jun 04 23:57:46 EDT 2019 +; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Wed Jun 05 00:34:45 EDT 2019 pageSize = 20000 page = 1 @@ -2120,7 +2120,7 @@ menuDialog = main # Misc sensors subMenu = speedSensor, "Vehicle speed sensor" subMenu = oilPressureSensor, "Oil pressure" - subMenu = egtInputs, "EGT" + subMenu = egtInputs, "EGT" menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" @@ -2128,15 +2128,15 @@ menuDialog = main subMenu = engineTypeDialog, "Popular vehicles" subMenu = std_separator - subMenu = lcdScreen, "LCD" - subMenu = joystickPanel, "Joystick" + subMenu = lcdScreen, "LCD" + subMenu = joystickPanel, "Joystick" subMenu = spiFunction, "SPI" subMenu = monitoringSettings, "rusEfi console" subMenu = std_separator subMenu = connection, "Connection" - subMenu = allPins1, "Full pinout 1/2" - subMenu = allPins2, "Full pinout 2/2" + subMenu = allPins1, "Full pinout 1/2" + subMenu = allPins2, "Full pinout 2/2" subMenu = std_separator diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 15cc9d8529..2adfe283fd 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1186,7 +1186,7 @@ menuDialog = main # Misc sensors subMenu = speedSensor, "Vehicle speed sensor" subMenu = oilPressureSensor, "Oil pressure" - subMenu = egtInputs, "EGT" + subMenu = egtInputs, "EGT" @@if_ts_show_egt menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" @@ -1194,15 +1194,15 @@ menuDialog = main subMenu = engineTypeDialog, "Popular vehicles" subMenu = std_separator - subMenu = lcdScreen, "LCD" - subMenu = joystickPanel, "Joystick" + subMenu = lcdScreen, "LCD" @@if_ts_show_lcd + subMenu = joystickPanel, "Joystick" @@if_ts_show_joystick subMenu = spiFunction, "SPI" subMenu = monitoringSettings, "rusEfi console" subMenu = std_separator subMenu = connection, "Connection" - subMenu = allPins1, "Full pinout 1/2" - subMenu = allPins2, "Full pinout 2/2" + subMenu = allPins1, "Full pinout 1/2" @@if_ts_show_full_pinout + subMenu = allPins2, "Full pinout 2/2" @@if_ts_show_full_pinout subMenu = std_separator diff --git a/firmware/tunerstudio/rusefi_frankenso.ini b/firmware/tunerstudio/rusefi_frankenso.ini index 9aa77079f1..5dbef1af18 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 Tue Jun 04 23:57:51 EDT 2019 +; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Wed Jun 05 00:34:50 EDT 2019 pageSize = 20000 page = 1 @@ -2120,7 +2120,7 @@ menuDialog = main # Misc sensors subMenu = speedSensor, "Vehicle speed sensor" subMenu = oilPressureSensor, "Oil pressure" - subMenu = egtInputs, "EGT" + subMenu = egtInputs, "EGT" menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" @@ -2128,15 +2128,15 @@ menuDialog = main subMenu = engineTypeDialog, "Popular vehicles" subMenu = std_separator - subMenu = lcdScreen, "LCD" - subMenu = joystickPanel, "Joystick" + subMenu = lcdScreen, "LCD" + subMenu = joystickPanel, "Joystick" subMenu = spiFunction, "SPI" subMenu = monitoringSettings, "rusEfi console" subMenu = std_separator subMenu = connection, "Connection" - subMenu = allPins1, "Full pinout 1/2" - subMenu = allPins2, "Full pinout 2/2" + subMenu = allPins1, "Full pinout 1/2" + subMenu = allPins2, "Full pinout 2/2" subMenu = std_separator diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini index 20ba559282..86083db47d 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 Tue Jun 04 23:57:49 EDT 2019 +; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Wed Jun 05 00:34:48 EDT 2019 pageSize = 20000 page = 1 @@ -2119,7 +2119,6 @@ menuDialog = main # Misc sensors subMenu = speedSensor, "Vehicle speed sensor" subMenu = oilPressureSensor, "Oil pressure" - subMenu = egtInputs, "EGT" menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" @@ -2127,15 +2126,11 @@ menuDialog = main subMenu = engineTypeDialog, "Popular vehicles" subMenu = std_separator - subMenu = lcdScreen, "LCD" - subMenu = joystickPanel, "Joystick" subMenu = spiFunction, "SPI" subMenu = monitoringSettings, "rusEfi console" subMenu = std_separator subMenu = connection, "Connection" - subMenu = allPins1, "Full pinout 1/2" - subMenu = allPins2, "Full pinout 2/2" subMenu = std_separator diff --git a/firmware/tunerstudio/rusefi_prometheus.ini b/firmware/tunerstudio/rusefi_prometheus.ini index 4adbc2e154..38b9f02810 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 Tue Jun 04 23:57:53 EDT 2019 +; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Wed Jun 05 00:34:53 EDT 2019 pageSize = 20000 page = 1 @@ -2120,7 +2120,7 @@ menuDialog = main # Misc sensors subMenu = speedSensor, "Vehicle speed sensor" subMenu = oilPressureSensor, "Oil pressure" - subMenu = egtInputs, "EGT" + subMenu = egtInputs, "EGT" menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" @@ -2128,15 +2128,15 @@ menuDialog = main subMenu = engineTypeDialog, "Popular vehicles" subMenu = std_separator - subMenu = lcdScreen, "LCD" - subMenu = joystickPanel, "Joystick" + subMenu = lcdScreen, "LCD" + subMenu = joystickPanel, "Joystick" subMenu = spiFunction, "SPI" subMenu = monitoringSettings, "rusEfi console" subMenu = std_separator subMenu = connection, "Connection" - subMenu = allPins1, "Full pinout 1/2" - subMenu = allPins2, "Full pinout 2/2" + subMenu = allPins1, "Full pinout 1/2" + subMenu = allPins2, "Full pinout 2/2" subMenu = std_separator