From 49d4b0acee2bce239797e85827d637a422110f21 Mon Sep 17 00:00:00 2001 From: rusefi Date: Wed, 6 May 2020 22:04:53 -0400 Subject: [PATCH] Fresh generated - auto --- .../kinetis/config/controllers/algo/rusefi_generated.h | 4 ++-- firmware/controllers/generated/rusefi_generated.h | 4 ++-- firmware/tunerstudio/rusefi.ini | 4 ++-- firmware/tunerstudio/rusefi_frankenso.ini | 4 ++-- firmware/tunerstudio/rusefi_kinetis.ini | 4 ++-- firmware/tunerstudio/rusefi_microrusefi.ini | 4 ++-- firmware/tunerstudio/rusefi_prometheus.ini | 4 ++-- firmware/tunerstudio/rusefi_proteus.ini | 4 ++-- .../models/src/com/rusefi/config/generated/Fields.java | 8 ++++---- 9 files changed, 20 insertions(+), 20 deletions(-) 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 b3251ecb5e..1732eaec94 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1979,6 +1979,8 @@ #define stft_offset_hex 428 #define stft_startupDelay_offset 1071 #define stft_startupDelay_offset_hex 42f +#define stftIgnoreErrorMagnitude_offset 976 +#define stftIgnoreErrorMagnitude_offset_hex 3d0 #define storageMode_offset 2260 #define storageMode_offset_hex 8d4 #define switch_input_pin_e_enum "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "N/A", "N/A", "PA10", "PA11", "PA12", "PA13", "N/A", "N/A", "N/A", "N/A", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "N/A", "N/A", "N/A", "N/A", "PB12", "PB13", "N/A", "N/A", "N/A", "N/A", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "N/A", "N/A", "N/A", "N/A", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "PD15", "PD16", "N/A", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A" @@ -2299,8 +2301,6 @@ #define unusedAtOldBoardConfigurationEnd_offset_hex 488 #define unusedBit4_1476_offset 1476 #define unusedBit4_1476_offset_hex 5c4 -#define unusedBit_251_10_offset 976 -#define unusedBit_251_10_offset_hex 3d0 #define unusedBit_251_11_offset 976 #define unusedBit_251_11_offset_hex 3d0 #define unusedBit_251_12_offset 976 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 59b90f2549..b610100f15 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1979,6 +1979,8 @@ #define stft_offset_hex 428 #define stft_startupDelay_offset 1071 #define stft_startupDelay_offset_hex 42f +#define stftIgnoreErrorMagnitude_offset 976 +#define stftIgnoreErrorMagnitude_offset_hex 3d0 #define storageMode_offset 2260 #define storageMode_offset_hex 8d4 #define switch_input_pin_e_enum "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -2299,8 +2301,6 @@ #define unusedAtOldBoardConfigurationEnd_offset_hex 488 #define unusedBit4_1476_offset 1476 #define unusedBit4_1476_offset_hex 5c4 -#define unusedBit_251_10_offset 976 -#define unusedBit_251_10_offset_hex 3d0 #define unusedBit_251_11_offset 976 #define unusedBit_251_11_offset_hex 3d0 #define unusedBit_251_12_offset 976 diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 97a29fe70c..b22a5ac5ed 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.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 gen_config.bat integration\rusefi_config.txt Wed May 06 12:32:31 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Wed May 06 22:04:17 EDT 2020 pageSize = 20000 page = 1 @@ -551,7 +551,7 @@ page = 1 enableCanVss = bits, U32, 976, [7:7], "false", "true" enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" showHumanReadableWarning= bits, U32, 976, [9:9], "false", "true" - unusedBit_251_10 = bits, U32, 976, [10:10], "false", "true" + stftIgnoreErrorMagnitude= 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" unusedBit_251_13 = bits, U32, 976, [13:13], "false", "true" diff --git a/firmware/tunerstudio/rusefi_frankenso.ini b/firmware/tunerstudio/rusefi_frankenso.ini index bceef54cd5..ff21c638ed 100644 --- a/firmware/tunerstudio/rusefi_frankenso.ini +++ b/firmware/tunerstudio/rusefi_frankenso.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 gen_config.bat integration\rusefi_config.txt Wed May 06 12:32:54 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Wed May 06 22:04:23 EDT 2020 pageSize = 20000 page = 1 @@ -551,7 +551,7 @@ page = 1 enableCanVss = bits, U32, 976, [7:7], "false", "true" enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" showHumanReadableWarning= bits, U32, 976, [9:9], "false", "true" - unusedBit_251_10 = bits, U32, 976, [10:10], "false", "true" + stftIgnoreErrorMagnitude= 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" unusedBit_251_13 = bits, U32, 976, [13:13], "false", "true" diff --git a/firmware/tunerstudio/rusefi_kinetis.ini b/firmware/tunerstudio/rusefi_kinetis.ini index 847c3ee7a5..fda686a82d 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 May 06 12:33:00 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Wed May 06 22:04:30 EDT 2020 pageSize = 20000 page = 1 @@ -551,7 +551,7 @@ page = 1 enableCanVss = bits, U32, 976, [7:7], "false", "true" enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" showHumanReadableWarning= bits, U32, 976, [9:9], "false", "true" - unusedBit_251_10 = bits, U32, 976, [10:10], "false", "true" + stftIgnoreErrorMagnitude= 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" unusedBit_251_13 = bits, U32, 976, [13:13], "false", "true" diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini index a4fedd3c09..96c7ee0e6a 100644 --- a/firmware/tunerstudio/rusefi_microrusefi.ini +++ b/firmware/tunerstudio/rusefi_microrusefi.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 gen_config.bat integration\rusefi_config.txt Wed May 06 12:32:52 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Wed May 06 22:04:20 EDT 2020 pageSize = 20000 page = 1 @@ -551,7 +551,7 @@ page = 1 enableCanVss = bits, U32, 976, [7:7], "false", "true" enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" showHumanReadableWarning= bits, U32, 976, [9:9], "false", "true" - unusedBit_251_10 = bits, U32, 976, [10:10], "false", "true" + stftIgnoreErrorMagnitude= 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" unusedBit_251_13 = bits, U32, 976, [13:13], "false", "true" diff --git a/firmware/tunerstudio/rusefi_prometheus.ini b/firmware/tunerstudio/rusefi_prometheus.ini index 5c3aa9e6da..046c79dc7f 100644 --- a/firmware/tunerstudio/rusefi_prometheus.ini +++ b/firmware/tunerstudio/rusefi_prometheus.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 gen_config.bat integration\rusefi_config.txt Wed May 06 12:32:56 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Wed May 06 22:04:25 EDT 2020 pageSize = 20000 page = 1 @@ -551,7 +551,7 @@ page = 1 enableCanVss = bits, U32, 976, [7:7], "false", "true" enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" showHumanReadableWarning= bits, U32, 976, [9:9], "false", "true" - unusedBit_251_10 = bits, U32, 976, [10:10], "false", "true" + stftIgnoreErrorMagnitude= 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" unusedBit_251_13 = bits, U32, 976, [13:13], "false", "true" diff --git a/firmware/tunerstudio/rusefi_proteus.ini b/firmware/tunerstudio/rusefi_proteus.ini index 3d40be877f..fb0e06b799 100644 --- a/firmware/tunerstudio/rusefi_proteus.ini +++ b/firmware/tunerstudio/rusefi_proteus.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 gen_config.bat integration\rusefi_config.txt Wed May 06 12:32:58 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Wed May 06 22:04:28 EDT 2020 pageSize = 20000 page = 1 @@ -551,7 +551,7 @@ page = 1 enableCanVss = bits, U32, 976, [7:7], "false", "true" enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" showHumanReadableWarning= bits, U32, 976, [9:9], "false", "true" - unusedBit_251_10 = bits, U32, 976, [10:10], "false", "true" + stftIgnoreErrorMagnitude= 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" unusedBit_251_13 = bits, U32, 976, [13:13], "false", "true" 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 6945ba9399..821c9363d6 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 Wed May 06 12:32:31 EDT 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Wed May 06 22:04:17 EDT 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1335,6 +1335,7 @@ public class Fields { public static final int stft_offset = 1064; public static final int stft_offset_hex = 428; public static final int stft_startupDelay_offset = 1071; + public static final int stftIgnoreErrorMagnitude_offset = 976; public static final int storageMode_offset = 2260; public static final int tachOutputPin_offset = 704; public static final int tachOutputPinMode_offset = 705; @@ -1548,7 +1549,6 @@ public class Fields { public static final int unusedAtOldBoardConfigurationEnd_offset = 1160; public static final int unusedAtOldBoardConfigurationEnd_offset_hex = 488; public static final int unusedBit4_1476_offset = 1476; - public static final int unusedBit_251_10_offset = 976; public static final int unusedBit_251_11_offset = 976; public static final int unusedBit_251_12_offset = 976; public static final int unusedBit_251_13_offset = 976; @@ -2105,7 +2105,7 @@ public class Fields { 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 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 STFTIGNOREERRORMAGNITUDE = Field.create("STFTIGNOREERRORMAGNITUDE", 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); public static final Field UNUSEDBIT_251_13 = Field.create("UNUSEDBIT_251_13", 976, FieldType.BIT, 13); @@ -3077,7 +3077,7 @@ public class Fields { ENABLECANVSS, ENABLEINNOVATELC2, SHOWHUMANREADABLEWARNING, - UNUSEDBIT_251_10, + STFTIGNOREERRORMAGNITUDE, UNUSEDBIT_251_11, UNUSEDBIT_251_12, UNUSEDBIT_251_13,