From ecf6a6663446c7e85dce5ec0af2335a027b4c606 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sat, 11 May 2019 13:39:27 -0400 Subject: [PATCH] Trigger: warning code on normal engine start up #669 --- .../algo/engine_configuration_generated_structures.h | 12 +++++++++--- firmware/controllers/algo/rusefi_generated.h | 8 ++++++-- firmware/integration/rusefi_config.txt | 4 +++- firmware/tunerstudio/rusefi.ini | 7 +++++-- firmware/tunerstudio/rusefi.input | 1 + .../models/src/com/rusefi/config/Fields.java | 10 +++++++--- 6 files changed, 31 insertions(+), 11 deletions(-) diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index c188242f11..6913de0823 100644 --- a/firmware/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon May 06 09:14:48 EDT 2019 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat May 11 13:38:32 EDT 2019 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -1044,7 +1044,7 @@ typedef struct { bool etb2_use_two_wires : 1; /** offset 76 bit 14 */ - bool issue_294_14 : 1; + bool showSdCardWarning : 1; /** offset 76 bit 15 */ bool issue_294_15 : 1; @@ -1087,6 +1087,12 @@ typedef struct { /** offset 76 bit 28 */ bool issue_294_29 : 1; + /** + offset 76 bit 29 */ + bool issue_294_30 : 1; + /** + offset 76 bit 30 */ + bool issue_294_31 : 1; /** * Closed throttle. todo: extract these two fields into a structure * todo: we need two sets of TPS parameters - modern ETBs have two sensors @@ -2733,4 +2739,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon May 06 09:14:48 EDT 2019 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat May 11 13:38:32 EDT 2019 diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index 4484159e1b..029171dc85 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -1229,8 +1229,6 @@ #define isPrintTriggerSynchDetails_offset_hex 5c4 #define isSdCardEnabled_offset 744 #define isSdCardEnabled_offset_hex 2e8 -#define issue_294_14_offset 76 -#define issue_294_14_offset_hex 4c #define issue_294_15_offset 76 #define issue_294_15_offset_hex 4c #define issue_294_16_offset 76 @@ -1259,6 +1257,10 @@ #define issue_294_28_offset_hex 4c #define issue_294_29_offset 76 #define issue_294_29_offset_hex 4c +#define issue_294_30_offset 76 +#define issue_294_30_offset_hex 4c +#define issue_294_31_offset 76 +#define issue_294_31_offset_hex 4c #define isTunerStudioEnabled_offset 1476 #define isTunerStudioEnabled_offset_hex 5c4 #define isVerboseAlternator_offset 744 @@ -1508,6 +1510,8 @@ #define servoOutputPins7_offset_hex c62 #define servoOutputPins8_offset 3171 #define servoOutputPins8_offset_hex c63 +#define showSdCardWarning_offset 76 +#define showSdCardWarning_offset_hex 4c #define silentTriggerError_offset 1464 #define silentTriggerError_offset_hex 5b8 #define slowAdcAlpha_offset 2108 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 954179de91..ea4cc2c611 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -283,7 +283,7 @@ bit cj125isUaDivided; bit cj125isLsu49; bit etb1_use_two_wires; bit etb2_use_two_wires; -bit issue_294_14; +bit showSdCardWarning; bit issue_294_15; bit issue_294_16; bit issue_294_17; @@ -298,6 +298,8 @@ bit issue_294_26; bit issue_294_27; bit issue_294_28; bit issue_294_29; +bit issue_294_30; +bit issue_294_31; int16_t tpsMin;Closed throttle. todo: extract these two fields into a structure\ntodo: we need two sets of TPS parameters - modern ETBs have two sensors\nSee also tps1_1AdcChannel\nset tps_min X;"ADC", 1, 0, 0, 1023, 0 diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 707ffed517..7445306423 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 rusefi_config.txt Sat May 11 10:55:06 EDT 2019 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat May 11 13:38:32 EDT 2019 pageSize = 20000 page = 1 @@ -95,7 +95,7 @@ page = 1 cj125isLsu49 = bits, U32, 76, [11:11], "false", "true" etb1_use_two_wires = bits, U32, 76, [12:12], "false", "true" etb2_use_two_wires = bits, U32, 76, [13:13], "false", "true" - issue_294_14 = bits, U32, 76, [14:14], "false", "true" + showSdCardWarning = bits, U32, 76, [14:14], "false", "true" issue_294_15 = bits, U32, 76, [15:15], "false", "true" issue_294_16 = bits, U32, 76, [16:16], "false", "true" issue_294_17 = bits, U32, 76, [17:17], "false", "true" @@ -110,6 +110,8 @@ page = 1 issue_294_27 = bits, U32, 76, [26:26], "false", "true" issue_294_28 = bits, U32, 76, [27:27], "false", "true" issue_294_29 = bits, U32, 76, [28:28], "false", "true" + issue_294_30 = bits, U32, 76, [29:29], "false", "true" + issue_294_31 = bits, U32, 76, [30:30], "false", "true" tpsMin = scalar, S16, 80, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 82, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 84, "%", 1, 0, -40, 200, 0 @@ -3009,6 +3011,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = sdCard, "SD Card Logger" field = "SdCard", isSdCardEnabled + field = "showSdCardWarning", showSdCardWarning field = "CS Pin", sdCardCsPin field = "SPI", sdCardSpiDevice field = "log format", logFormat diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 100b062b7f..5db01a4079 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -2080,6 +2080,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = sdCard, "SD Card Logger" field = "SdCard", isSdCardEnabled + field = "showSdCardWarning", showSdCardWarning field = "CS Pin", sdCardCsPin field = "SPI", sdCardSpiDevice field = "log format", logFormat diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java index d039c22f84..26d579dcf2 100644 --- a/java_console/models/src/com/rusefi/config/Fields.java +++ b/java_console/models/src/com/rusefi/config/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config; -// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat May 11 10:55:06 EDT 2019 +// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat May 11 13:38:32 EDT 2019 public class Fields { public static final int accelerometerSpiDevice_offset = 2736; public static final int acCutoffHighRpm_offset = 1498; @@ -811,7 +811,6 @@ public class Fields { public static final int isMapAveragingEnabled_offset = 1476; public static final int isPrintTriggerSynchDetails_offset = 1476; public static final int isSdCardEnabled_offset = 744; - public static final int issue_294_14_offset = 76; public static final int issue_294_15_offset = 76; public static final int issue_294_16_offset = 76; public static final int issue_294_17_offset = 76; @@ -826,6 +825,8 @@ public class Fields { public static final int issue_294_27_offset = 76; public static final int issue_294_28_offset = 76; public static final int issue_294_29_offset = 76; + public static final int issue_294_30_offset = 76; + public static final int issue_294_31_offset = 76; public static final int isTunerStudioEnabled_offset = 1476; public static final int isVerboseAlternator_offset = 744; public static final int isVerboseAuxPid1_offset = 76; @@ -980,6 +981,7 @@ public class Fields { public static final int servoOutputPins6_offset = 3169; public static final int servoOutputPins7_offset = 3170; public static final int servoOutputPins8_offset = 3171; + public static final int showSdCardWarning_offset = 76; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2108; public static final int sparkDwellRpmBins_offset = 332; @@ -1249,7 +1251,7 @@ public class Fields { public static final Field CJ125ISLSU49 = Field.create("CJ125ISLSU49", 76, FieldType.BIT, 11); public static final Field ETB1_USE_TWO_WIRES = Field.create("ETB1_USE_TWO_WIRES", 76, FieldType.BIT, 12); public static final Field ETB2_USE_TWO_WIRES = Field.create("ETB2_USE_TWO_WIRES", 76, FieldType.BIT, 13); - public static final Field ISSUE_294_14 = Field.create("ISSUE_294_14", 76, FieldType.BIT, 14); + public static final Field SHOWSDCARDWARNING = Field.create("SHOWSDCARDWARNING", 76, FieldType.BIT, 14); public static final Field ISSUE_294_15 = Field.create("ISSUE_294_15", 76, FieldType.BIT, 15); public static final Field ISSUE_294_16 = Field.create("ISSUE_294_16", 76, FieldType.BIT, 16); public static final Field ISSUE_294_17 = Field.create("ISSUE_294_17", 76, FieldType.BIT, 17); @@ -1264,6 +1266,8 @@ public class Fields { public static final Field ISSUE_294_27 = Field.create("ISSUE_294_27", 76, FieldType.BIT, 26); public static final Field ISSUE_294_28 = Field.create("ISSUE_294_28", 76, FieldType.BIT, 27); public static final Field ISSUE_294_29 = Field.create("ISSUE_294_29", 76, FieldType.BIT, 28); + public static final Field ISSUE_294_30 = Field.create("ISSUE_294_30", 76, FieldType.BIT, 29); + public static final Field ISSUE_294_31 = Field.create("ISSUE_294_31", 76, FieldType.BIT, 30); public static final Field TPSMIN = Field.create("TPSMIN", 80, FieldType.INT16); public static final Field TPSMAX = Field.create("TPSMAX", 82, FieldType.INT16); public static final Field TPSERRORDETECTIONTOOLOW = Field.create("TPSERRORDETECTIONTOOLOW", 84, FieldType.INT16);