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

TS to show warning text

This commit is contained in:
rusEfi 2020-04-19 21:42:00 -04:00
parent a3202ca612
commit 2203b2867a
16 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h
View File

@ -1,4 +1,4 @@
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Sun Apr 19 18:32:08 EDT 2020
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Sun Apr 19 21:16:42 EDT 2020
// by class com.rusefi.output.CHeaderConsumer
// begin
#ifndef CONFIG_BOARDS_KINETIS_CONFIG_CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H
@ -3063,7 +3063,7 @@ struct persistent_config_s {
/**
* offset 6000
*/
critical_error_message_t critical_error_message;
error_message_t warning_message;
/**
* offset 6120
*/
@ -3351,4 +3351,4 @@ typedef struct persistent_config_s persistent_config_s;
#endif
// end
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Sun Apr 19 18:32:08 EDT 2020
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Sun Apr 19 21:16:42 EDT 2020

4
firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h
View File

@ -496,8 +496,6 @@
#define crankingTpsBins_offset_hex 688
#define crankingTpsCoef_offset 1640
#define crankingTpsCoef_offset_hex 668
#define critical_error_message_offset 6000
#define critical_error_message_offset_hex 1770
#define CRITICAL_PREFIX "CRITICAL"
#define cutFuelOnHardLimit_offset 1464
#define cutFuelOnHardLimit_offset_hex 5b8
@ -2366,6 +2364,8 @@
#define vvtMode_offset_hex 918
#define vvtOffset_offset 2052
#define vvtOffset_offset_hex 804
#define warning_message_offset 6000
#define warning_message_offset_hex 1770
#define warningLedPin_offset 2041
#define warningLedPin_offset_hex 7f9
#define warningPeriod_offset 1498

2
firmware/controllers/algo/rusefi_types.h
View File

@ -81,7 +81,7 @@ typedef float percent_t;
typedef void (*Void)(void);
typedef char critical_error_message_t[ERROR_BUFFER_SIZE];
typedef char error_message_t[ERROR_BUFFER_SIZE];
typedef char le_formula_t[LE_COMMAND_LENGTH];

16
firmware/controllers/core/error_handling.cpp
View File

@ -107,6 +107,14 @@ static void printWarning(const char *fmt, va_list ap) {
printToStream(&warningStream, fmt, ap);
#if EFI_TUNER_STUDIO
#if defined(EFI_NO_CONFIG_WORKING_COPY)
memcpy(persistentState.persistentConfiguration.warning_message, warningBuffer, sizeof(warningBuffer));
#else /* defined(EFI_NO_CONFIG_WORKING_COPY) */
memcpy(configWorkingCopy.warning_message, warningBuffer, sizeof(warningBuffer));
#endif /* defined(EFI_NO_CONFIG_WORKING_COPY) */
#endif /* EFI_TUNER_STUDIO */
logger.append(warningBuffer);
append(&logger, DELIMETER);
scheduleLogging(&logger);
@ -245,14 +253,6 @@ void firmwareError(obd_code_e code, const char *fmt, ...) {
firmwareErrorMessageStream.buffer[firmwareErrorMessageStream.eos] = 0; // need to terminate explicitly
}
#if EFI_TUNER_STUDIO
#if defined(EFI_NO_CONFIG_WORKING_COPY)
memcpy(persistentState.persistentConfiguration.critical_error_message, criticalErrorMessageBuffer, sizeof(criticalErrorMessageBuffer));
#else /* defined(EFI_NO_CONFIG_WORKING_COPY) */
memcpy(configWorkingCopy.critical_error_message, criticalErrorMessageBuffer, sizeof(criticalErrorMessageBuffer));
#endif /* defined(EFI_NO_CONFIG_WORKING_COPY) */
#endif /* EFI_TUNER_STUDIO */
#else
printf("firmwareError [%s]\r\n", fmt);

2
firmware/controllers/flash_main.cpp
View File

@ -150,7 +150,7 @@ persisted_configuration_state_e readConfiguration(Logging * logger) {
}
// we can only change the state after the CRC check
engineConfiguration->byFirmwareVersion = getRusEfiVersion();
memset(persistentState.persistentConfiguration.critical_error_message, 0, ERROR_BUFFER_SIZE);
memset(persistentState.persistentConfiguration.warning_message , 0, ERROR_BUFFER_SIZE);
validateConfiguration(PASS_ENGINE_PARAMETER_SIGNATURE);
return result;
}

6
firmware/controllers/generated/engine_configuration_generated_structures.h
View File

@ -1,4 +1,4 @@
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun Apr 19 18:31:50 EDT 2020
// this section 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
// by class com.rusefi.output.CHeaderConsumer
// begin
#ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H
@ -3063,7 +3063,7 @@ struct persistent_config_s {
/**
* offset 6000
*/
critical_error_message_t critical_error_message;
error_message_t warning_message;
/**
* offset 6120
*/
@ -3351,4 +3351,4 @@ typedef struct persistent_config_s persistent_config_s;
#endif
// end
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun Apr 19 18:31:50 EDT 2020
// this section 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

4
firmware/controllers/generated/rusefi_generated.h
View File

@ -496,8 +496,6 @@
#define crankingTpsBins_offset_hex 688
#define crankingTpsCoef_offset 1640
#define crankingTpsCoef_offset_hex 668
#define critical_error_message_offset 6000
#define critical_error_message_offset_hex 1770
#define CRITICAL_PREFIX "CRITICAL"
#define cutFuelOnHardLimit_offset 1464
#define cutFuelOnHardLimit_offset_hex 5b8
@ -2366,6 +2364,8 @@
#define vvtMode_offset_hex 918
#define vvtOffset_offset 2052
#define vvtOffset_offset_hex 804
#define warning_message_offset 6000
#define warning_message_offset_hex 1770
#define warningLedPin_offset 2041
#define warningLedPin_offset_hex 7f9
#define warningPeriod_offset 1498

4
firmware/integration/rusefi_config.txt
View File

@ -781,7 +781,7 @@ custom maf_sensor_type_e 4 bits, S32, @OFFSET@, [0:7], @@maf_sensor_type_e_enum@
! same length used for critical and soft error messages
#define ERROR_BUFFER_SIZE 120
custom critical_error_message_t @@ERROR_BUFFER_SIZE@@ string, ASCII, @OFFSET@, @@ERROR_BUFFER_SIZE@@
custom error_message_t @@ERROR_BUFFER_SIZE@@ string, ASCII, @OFFSET@, @@ERROR_BUFFER_SIZE@@
custom le_formula_t @@LE_COMMAND_LENGTH@@ string, ASCII, @OFFSET@, @@LE_COMMAND_LENGTH@@
brain_pin_e[FSIO_COMMAND_COUNT iterate] fsioDigitalInputs;todo:not finished\nThese input pins allow us to pull toggle buttons state;
@ -1250,7 +1250,7 @@ end_struct
engine_configuration_s engineConfiguration;
critical_error_message_t critical_error_message;
error_message_t warning_message;
float[AFTERSTART_HOLD_CURVE_SIZE] afterstartCoolantBins;;"C", 1, 0, -100.0, 250.0, 0
float[AFTERSTART_HOLD_CURVE_SIZE] afterstartHoldTime;;"Seconds", 1, 0, 0, 100, 1

8
firmware/tunerstudio/rusefi.ini
View File

@ -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 gen_config.bat integration\rusefi_config.txt Sun Apr 19 18:31:50 EDT 2020
; this section 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
pageSize = 20000
page = 1
@ -1038,7 +1038,7 @@ page = 1
iacPidMultRpmBins = array, U08, 4132, [8], "RPM", 50, 0, 0.0, 12000.0, 0
canVssNbcType = bits, U32, 4140, [0:7], "BMW_e46", "W202"
;no TS info - skipping mainUnusedEnd offset 4144
critical_error_message = string, ASCII, 6000, 120
warning_message = string, ASCII, 6000, 120
afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100.0, 250.0, 0
afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1
afterstartEnrich = array, F32, 6184, [8], "%", 1, 0, 0, 600, 1
@ -1626,7 +1626,7 @@ fileVersion = { 20200310 }
requiresPowerCycle = fsioAdc3
requiresPowerCycle = fsioAdc4
readOnly = critical_error_message
readOnly = warning_message
[CurveEditor]
@ -3648,7 +3648,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
dialog = debugging, "Debug"
field = "!https://rusefi.com/s/debugmode"
field = "Debug mode", debugMode
field = "Critical Error", critical_error_message
field = "Warning Text", warning_message
dialog = limits, "Limits"

4
firmware/tunerstudio/rusefi.input
View File

@ -457,7 +457,7 @@ fileVersion = { @@TS_FILE_VERSION@@ }
requiresPowerCycle = fsioAdc3
requiresPowerCycle = fsioAdc4
readOnly = critical_error_message
readOnly = warning_message
[CurveEditor]
@ -2480,7 +2480,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
dialog = debugging, "Debug"
field = "!https://rusefi.com/s/debugmode"
field = "Debug mode", debugMode
field = "Critical Error", critical_error_message
field = "Warning Text", warning_message
dialog = limits, "Limits"

8
firmware/tunerstudio/rusefi_frankenso.ini
View File

@ -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 gen_config.bat integration\rusefi_config.txt Sun Apr 19 18:32:00 EDT 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun Apr 19 21:15:47 EDT 2020
pageSize = 20000
page = 1
@ -1038,7 +1038,7 @@ page = 1
iacPidMultRpmBins = array, U08, 4132, [8], "RPM", 50, 0, 0.0, 12000.0, 0
canVssNbcType = bits, U32, 4140, [0:7], "BMW_e46", "W202"
;no TS info - skipping mainUnusedEnd offset 4144
critical_error_message = string, ASCII, 6000, 120
warning_message = string, ASCII, 6000, 120
afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100.0, 250.0, 0
afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1
afterstartEnrich = array, F32, 6184, [8], "%", 1, 0, 0, 600, 1
@ -1626,7 +1626,7 @@ fileVersion = { 20200310 }
requiresPowerCycle = fsioAdc3
requiresPowerCycle = fsioAdc4
readOnly = critical_error_message
readOnly = warning_message
[CurveEditor]
@ -3648,7 +3648,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
dialog = debugging, "Debug"
field = "!https://rusefi.com/s/debugmode"
field = "Debug mode", debugMode
field = "Critical Error", critical_error_message
field = "Warning Text", warning_message
dialog = limits, "Limits"

8
firmware/tunerstudio/rusefi_kinetis.ini
View File

@ -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 Sun Apr 19 18:32:08 EDT 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Sun Apr 19 21:16:42 EDT 2020
pageSize = 20000
page = 1
@ -1038,7 +1038,7 @@ page = 1
iacPidMultRpmBins = array, U08, 4132, [8], "RPM", 50, 0, 0.0, 12000.0, 0
canVssNbcType = bits, U32, 4140, [0:7], "BMW_e46", "W202"
;no TS info - skipping mainUnusedEnd offset 4144
critical_error_message = string, ASCII, 6000, 120
warning_message = string, ASCII, 6000, 120
afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100.0, 250.0, 0
afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1
afterstartEnrich = array, F32, 6184, [8], "%", 1, 0, 0, 600, 1
@ -1626,7 +1626,7 @@ fileVersion = { 20200310 }
requiresPowerCycle = fsioAdc3
requiresPowerCycle = fsioAdc4
readOnly = critical_error_message
readOnly = warning_message
[CurveEditor]
@ -3649,7 +3649,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
dialog = debugging, "Debug"
field = "!https://rusefi.com/s/debugmode"
field = "Debug mode", debugMode
field = "Critical Error", critical_error_message
field = "Warning Text", warning_message
dialog = limits, "Limits"

8
firmware/tunerstudio/rusefi_microrusefi.ini
View File

@ -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 gen_config.bat integration\rusefi_config.txt Sun Apr 19 18:31:57 EDT 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun Apr 19 21:15:27 EDT 2020
pageSize = 20000
page = 1
@ -1038,7 +1038,7 @@ page = 1
iacPidMultRpmBins = array, U08, 4132, [8], "RPM", 50, 0, 0.0, 12000.0, 0
canVssNbcType = bits, U32, 4140, [0:7], "BMW_e46", "W202"
;no TS info - skipping mainUnusedEnd offset 4144
critical_error_message = string, ASCII, 6000, 120
warning_message = string, ASCII, 6000, 120
afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100.0, 250.0, 0
afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1
afterstartEnrich = array, F32, 6184, [8], "%", 1, 0, 0, 600, 1
@ -1626,7 +1626,7 @@ fileVersion = { 20200310 }
requiresPowerCycle = fsioAdc3
requiresPowerCycle = fsioAdc4
readOnly = critical_error_message
readOnly = warning_message
[CurveEditor]
@ -3608,7 +3608,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
dialog = debugging, "Debug"
field = "!https://rusefi.com/s/debugmode"
field = "Debug mode", debugMode
field = "Critical Error", critical_error_message
field = "Warning Text", warning_message
dialog = limits, "Limits"

8
firmware/tunerstudio/rusefi_prometheus.ini
View File

@ -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 gen_config.bat integration\rusefi_config.txt Sun Apr 19 18:32:02 EDT 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun Apr 19 21:16:06 EDT 2020
pageSize = 20000
page = 1
@ -1038,7 +1038,7 @@ page = 1
iacPidMultRpmBins = array, U08, 4132, [8], "RPM", 50, 0, 0.0, 12000.0, 0
canVssNbcType = bits, U32, 4140, [0:7], "BMW_e46", "W202"
;no TS info - skipping mainUnusedEnd offset 4144
critical_error_message = string, ASCII, 6000, 120
warning_message = string, ASCII, 6000, 120
afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100.0, 250.0, 0
afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1
afterstartEnrich = array, F32, 6184, [8], "%", 1, 0, 0, 600, 1
@ -1626,7 +1626,7 @@ fileVersion = { 20200310 }
requiresPowerCycle = fsioAdc3
requiresPowerCycle = fsioAdc4
readOnly = critical_error_message
readOnly = warning_message
[CurveEditor]
@ -3644,7 +3644,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
dialog = debugging, "Debug"
field = "!https://rusefi.com/s/debugmode"
field = "Debug mode", debugMode
field = "Critical Error", critical_error_message
field = "Warning Text", warning_message
dialog = limits, "Limits"

8
firmware/tunerstudio/rusefi_proteus.ini
View File

@ -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 gen_config.bat integration\rusefi_config.txt Sun Apr 19 18:32:06 EDT 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun Apr 19 21:16:26 EDT 2020
pageSize = 20000
page = 1
@ -1038,7 +1038,7 @@ page = 1
iacPidMultRpmBins = array, U08, 4132, [8], "RPM", 50, 0, 0.0, 12000.0, 0
canVssNbcType = bits, U32, 4140, [0:7], "BMW_e46", "W202"
;no TS info - skipping mainUnusedEnd offset 4144
critical_error_message = string, ASCII, 6000, 120
warning_message = string, ASCII, 6000, 120
afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100.0, 250.0, 0
afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1
afterstartEnrich = array, F32, 6184, [8], "%", 1, 0, 0, 600, 1
@ -1626,7 +1626,7 @@ fileVersion = { 20200310 }
requiresPowerCycle = fsioAdc3
requiresPowerCycle = fsioAdc4
readOnly = critical_error_message
readOnly = warning_message
[CurveEditor]
@ -3616,7 +3616,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
dialog = debugging, "Debug"
field = "!https://rusefi.com/s/debugmode"
field = "Debug mode", debugMode
field = "Critical Error", critical_error_message
field = "Warning Text", warning_message
dialog = limits, "Limits"

10
java_console/models/src/com/rusefi/config/generated/Fields.java
View File

@ -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 18:31:50 EDT 2020
// 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
// by class com.rusefi.output.FileJavaFieldsConsumer
import com.rusefi.config.*;
@ -326,8 +326,6 @@ public class Fields {
public static final int crankingTpsBins_offset_hex = 688;
public static final int crankingTpsCoef_offset = 1640;
public static final int crankingTpsCoef_offset_hex = 668;
public static final int critical_error_message_offset = 6000;
public static final int critical_error_message_offset_hex = 1770;
public static final String CRITICAL_PREFIX = "CRITICAL";
public static final int cutFuelOnHardLimit_offset = 1464;
public static final int cutSparkOnHardLimit_offset = 1464;
@ -1548,6 +1546,8 @@ public class Fields {
public static final int vvtMode_offset_hex = 918;
public static final int vvtOffset_offset = 2052;
public static final int vvtOffset_offset_hex = 804;
public static final int warning_message_offset = 6000;
public static final int warning_message_offset_hex = 1770;
public static final int warningLedPin_offset = 2041;
public static final int warningPeriod_offset = 1498;
public static final int wboHeaterPin_offset = 673;
@ -2457,7 +2457,7 @@ public class Fields {
public static final Field IDLERPMPID2_MAXVALUE = Field.create("IDLERPMPID2_MAXVALUE", 4058, FieldType.INT16);
public static final Field IACPIDMULTTABLE = Field.create("IACPIDMULTTABLE", 4060, FieldType.INT);
public static final Field CANVSSNBCTYPE = Field.create("CANVSSNBCTYPE", 4140, FieldType.INT);
public static final Field CRITICAL_ERROR_MESSAGE = Field.create("CRITICAL_ERROR_MESSAGE", 6000, FieldType.INT);
public static final Field WARNING_MESSAGE = Field.create("WARNING_MESSAGE", 6000, FieldType.INT);
public static final Field BOOSTTABLEOPENLOOP = Field.create("BOOSTTABLEOPENLOOP", 6248, FieldType.INT);
public static final Field BOOSTTABLECLOSEDLOOP = Field.create("BOOSTTABLECLOSEDLOOP", 6328, FieldType.INT);
public static final Field PEDALTOTPSTABLE = Field.create("PEDALTOTPSTABLE", 6400, FieldType.INT);
@ -3376,7 +3376,7 @@ public class Fields {
IDLERPMPID2_MAXVALUE,
IACPIDMULTTABLE,
CANVSSNBCTYPE,
CRITICAL_ERROR_MESSAGE,
WARNING_MESSAGE,
BOOSTTABLEOPENLOOP,
BOOSTTABLECLOSEDLOOP,
PEDALTOTPSTABLE,