diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index 9a717b4d50..5d5d913017 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1756,6 +1756,8 @@ #define servoOutputPins7_offset_hex c4a #define servoOutputPins8_offset 3147 #define servoOutputPins8_offset_hex c4b +#define showHumanReadableWarning_offset 976 +#define showHumanReadableWarning_offset_hex 3d0 #define showSdCardWarning_offset 76 #define showSdCardWarning_offset_hex 4c #define silentTriggerError_offset 1464 @@ -2229,8 +2231,6 @@ #define unusedBit_251_28_offset_hex 3d0 #define unusedBit_251_29_offset 976 #define unusedBit_251_29_offset_hex 3d0 -#define unusedBit_251_9_offset 976 -#define unusedBit_251_9_offset_hex 3d0 #define unusedBit_282_30_offset 976 #define unusedBit_282_30_offset_hex 3d0 #define unusedBit_282_31_offset 976 diff --git a/firmware/controllers/core/error_handling.cpp b/firmware/controllers/core/error_handling.cpp index 61d0c4918b..1ab32d445b 100644 --- a/firmware/controllers/core/error_handling.cpp +++ b/firmware/controllers/core/error_handling.cpp @@ -107,6 +107,7 @@ static void printWarning(const char *fmt, va_list ap) { printToStream(&warningStream, fmt, ap); + if (CONFIG(showHumanReadableWarning)) { #if EFI_TUNER_STUDIO #if defined(EFI_NO_CONFIG_WORKING_COPY) memcpy(persistentState.persistentConfiguration.warning_message, warningBuffer, sizeof(warningBuffer)); @@ -114,6 +115,7 @@ static void printWarning(const char *fmt, va_list ap) { memcpy(configWorkingCopy.warning_message, warningBuffer, sizeof(warningBuffer)); #endif /* defined(EFI_NO_CONFIG_WORKING_COPY) */ #endif /* EFI_TUNER_STUDIO */ + } logger.append(warningBuffer); append(&logger, DELIMETER); diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 5c4309a4bd..6a5cd53fac 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -801,7 +801,7 @@ custom maf_sensor_type_e 4 bits, S32, @OFFSET@, [0:7], @@maf_sensor_type_e_enum@ bit launchDisableBySpeed bit enableCanVss bit enableInnovateLC2 - bit unusedBit_251_9 + bit showHumanReadableWarning bit unusedBit_251_10 bit unusedBit_251_11 bit unusedBit_251_12 diff --git a/firmware/tunerstudio/rusefi_kinetis.ini b/firmware/tunerstudio/rusefi_kinetis.ini index 1c57390ff5..ff7d3f2d37 100644 --- a/firmware/tunerstudio/rusefi_kinetis.ini +++ b/firmware/tunerstudio/rusefi_kinetis.ini @@ -89,7 +89,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Wed Apr 22 15:21:06 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Wed Apr 22 18:25:40 EDT 2020 pageSize = 20000 page = 1 @@ -550,7 +550,7 @@ page = 1 launchDisableBySpeed = bits, U32, 976, [6:6], "false", "true" enableCanVss = bits, U32, 976, [7:7], "false", "true" enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" - unusedBit_251_9 = bits, U32, 976, [9:9], "false", "true" + showHumanReadableWarning= bits, U32, 976, [9:9], "false", "true" unusedBit_251_10 = bits, U32, 976, [10:10], "false", "true" unusedBit_251_11 = bits, U32, 976, [11:11], "false", "true" unusedBit_251_12 = bits, U32, 976, [12:12], "false", "true" @@ -3650,6 +3650,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "!https://rusefi.com/s/debugmode" field = "Debug mode", debugMode field = "Warning Text", warning_message + field = "showHumanReadableWarning (affects Burn)", showHumanReadableWarning dialog = limits, "Limits" @@ -3967,7 +3968,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" commandButton = "Injector #8", cmd_test_inj8 dialog = testMisc, "Misc" - commandButton = "Come To Pit", cmd_call_from_pit +; commandButton = "Come To Pit", cmd_call_from_pit commandButton = "Fuel Pump", cmd_test_fuel_pump commandButton = "Radiator Fan", cmd_test_radiator_fan commandButton = "Check Engine", cmd_test_check_engine_light diff --git a/java_console/models/src/com/rusefi/config/generated/Fields.java b/java_console/models/src/com/rusefi/config/generated/Fields.java index 669959cdaf..28e1df9790 100644 --- a/java_console/models/src/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun Apr 19 21:15:09 EDT 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Wed Apr 22 18:25:23 EDT 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1165,6 +1165,7 @@ public class Fields { public static final int servoOutputPins6_offset = 3145; public static final int servoOutputPins7_offset = 3146; public static final int servoOutputPins8_offset = 3147; + public static final int showHumanReadableWarning_offset = 976; public static final int showSdCardWarning_offset = 76; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; @@ -1472,7 +1473,6 @@ public class Fields { public static final int unusedBit_251_27_offset = 976; public static final int unusedBit_251_28_offset = 976; public static final int unusedBit_251_29_offset = 976; - public static final int unusedBit_251_9_offset = 976; public static final int unusedBit_282_30_offset = 976; public static final int unusedBit_282_31_offset = 976; public static final int unusedBit_34_31_offset = 76; @@ -2007,7 +2007,7 @@ public class Fields { public static final Field LAUNCHDISABLEBYSPEED = Field.create("LAUNCHDISABLEBYSPEED", 976, FieldType.BIT, 6); public static final Field ENABLECANVSS = Field.create("ENABLECANVSS", 976, FieldType.BIT, 7); public static final Field ENABLEINNOVATELC2 = Field.create("ENABLEINNOVATELC2", 976, FieldType.BIT, 8); - public static final Field UNUSEDBIT_251_9 = Field.create("UNUSEDBIT_251_9", 976, FieldType.BIT, 9); + public static final Field SHOWHUMANREADABLEWARNING = Field.create("SHOWHUMANREADABLEWARNING", 976, FieldType.BIT, 9); public static final Field UNUSEDBIT_251_10 = Field.create("UNUSEDBIT_251_10", 976, FieldType.BIT, 10); public static final Field UNUSEDBIT_251_11 = Field.create("UNUSEDBIT_251_11", 976, FieldType.BIT, 11); public static final Field UNUSEDBIT_251_12 = Field.create("UNUSEDBIT_251_12", 976, FieldType.BIT, 12); @@ -2933,7 +2933,7 @@ public class Fields { LAUNCHDISABLEBYSPEED, ENABLECANVSS, ENABLEINNOVATELC2, - UNUSEDBIT_251_9, + SHOWHUMANREADABLEWARNING, UNUSEDBIT_251_10, UNUSEDBIT_251_11, UNUSEDBIT_251_12,