diff --git a/firmware/config/boards/microrusefi/prepend.txt b/firmware/config/boards/microrusefi/prepend.txt index 372c57a679..a98dd3b79c 100644 --- a/firmware/config/boards/microrusefi/prepend.txt +++ b/firmware/config/boards/microrusefi/prepend.txt @@ -1 +1,2 @@ -#define ts_show_hip9011 false \ No newline at end of file +#define ts_show_hip9011 false +#define ts_show_cj125 false diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index 588f46ee21..deb4305c02 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -1756,6 +1756,7 @@ #define triggerSimulatorPins3_offset_hex 2e2 #define TS_FILE_VERSION 20171101 #define TS_OUTPUT_SIZE 356 +#define ts_show_cj125 true #define ts_show_etb true #define ts_show_hip9011 true #define tunerStudioSerialSpeed_offset 728 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index dba6536d63..80a9d8e6fe 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -1206,4 +1206,5 @@ end_struct ! some board files override this value using prepend file #define ts_show_hip9011 true +#define ts_show_cj125 true #define ts_show_etb true diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 62dba66d12..5a928bbeef 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 Mon Jun 03 10:01:41 EDT 2019 +; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Tue Jun 04 12:12:21 EDT 2019 pageSize = 20000 page = 1 @@ -2091,7 +2091,7 @@ menuDialog = main subMenu = std_separator subMenu = egoSettings, "EGO sensor" subMenu = narrowToWideOxygenCurve, "Narrow to Wideband approximation" - subMenu = cj125Function, "CJ125 Settings (wbo decoder)" + subMenu = cj125Function, "CJ125 Settings (wbo decoder)" subMenu = std_separator subMenu = hipFunction, "HIP9011 Settings (knock sensor) (alpha version)" subMenu = speedSensor, "Vehicle Speed sensor" diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 15964be9b9..a58588f4a9 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1157,7 +1157,7 @@ menuDialog = main subMenu = std_separator subMenu = egoSettings, "EGO sensor" subMenu = narrowToWideOxygenCurve, "Narrow to Wideband approximation" - subMenu = cj125Function, "CJ125 Settings (wbo decoder)" + subMenu = cj125Function, "CJ125 Settings (wbo decoder)" @@if_ts_show_cj125 subMenu = std_separator subMenu = hipFunction, "HIP9011 Settings (knock sensor) (alpha version)" @@if_ts_show_hip9011 subMenu = speedSensor, "Vehicle Speed sensor" diff --git a/firmware/tunerstudio/rusefi_frankenso.ini b/firmware/tunerstudio/rusefi_frankenso.ini index f2a45fa615..8676399adc 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 Mon Jun 03 10:01:47 EDT 2019 +; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Tue Jun 04 12:12:25 EDT 2019 pageSize = 20000 page = 1 @@ -2091,7 +2091,7 @@ menuDialog = main subMenu = std_separator subMenu = egoSettings, "EGO sensor" subMenu = narrowToWideOxygenCurve, "Narrow to Wideband approximation" - subMenu = cj125Function, "CJ125 Settings (wbo decoder)" + subMenu = cj125Function, "CJ125 Settings (wbo decoder)" subMenu = std_separator subMenu = hipFunction, "HIP9011 Settings (knock sensor) (alpha version)" subMenu = speedSensor, "Vehicle Speed sensor" diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini index 27458f27b8..8e77b4e514 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 Mon Jun 03 10:01:44 EDT 2019 +; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Tue Jun 04 12:12:23 EDT 2019 pageSize = 20000 page = 1 @@ -2091,7 +2091,6 @@ menuDialog = main subMenu = std_separator subMenu = egoSettings, "EGO sensor" subMenu = narrowToWideOxygenCurve, "Narrow to Wideband approximation" - subMenu = cj125Function, "CJ125 Settings (wbo decoder)" subMenu = std_separator 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 b51c4da89d..63850c6a61 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 Mon Jun 03 10:01:52 EDT 2019 +; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Tue Jun 04 12:12:28 EDT 2019 pageSize = 20000 page = 1 @@ -2089,7 +2089,7 @@ menuDialog = main subMenu = std_separator subMenu = egoSettings, "EGO sensor" subMenu = narrowToWideOxygenCurve, "Narrow to Wideband approximation" - subMenu = cj125Function, "CJ125 Settings (wbo decoder)" + subMenu = cj125Function, "CJ125 Settings (wbo decoder)" subMenu = std_separator subMenu = speedSensor, "Vehicle Speed sensor" subMenu = oilPressureSensor, "Oil Pressure sensor"