From 9155e358b317d69c09c834b04d348f80698fc8cb Mon Sep 17 00:00:00 2001 From: rusefi Date: Mon, 1 Jun 2020 08:12:18 -0400 Subject: [PATCH] Fresh generated - auto --- .../algo/engine_configuration_generated_structures.h | 6 +++--- .../kinetis/config/controllers/algo/rusefi_generated.h | 1 + .../generated/engine_configuration_generated_structures.h | 6 +++--- firmware/controllers/generated/rusefi_generated.h | 1 + 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 | 7 ++++--- 11 files changed, 24 insertions(+), 21 deletions(-) diff --git a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h index 7e5cdfd4b2..f61ce8a489 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Mon Jun 01 07:55:12 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Mon Jun 01 08:12:05 EDT 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONFIG_BOARDS_KINETIS_CONFIG_CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -1936,7 +1936,7 @@ struct engine_configuration_s { uint16_t tps2SecondaryMax; /** offset 1464 bit 0 */ - bool useFSIO6ForRevLimiter : 1; + bool unusedHereWeHave : 1; /** * Enables lambda sensor closed loop feedback for fuelling. offset 1464 bit 1 */ @@ -3509,4 +3509,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 Mon Jun 01 07:55:12 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Mon Jun 01 08:12:05 EDT 2020 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 87e028c4bf..396ffff672 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1351,6 +1351,7 @@ #define unusedBit_34_31_offset 76 #define unusedFlexFuelSensor_offset 3100 #define unusedHere_offset 761 +#define unusedHereWeHave_offset 1464 #define unusedOldBiquad_offset 2332 #define unusedSomethingWasHere_offset 2417 #define unusedSpiPadding4_offset 2593 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index f152e84d9f..709ca1e7a5 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Mon Jun 01 07:54:47 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Mon Jun 01 08:11:57 EDT 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -1936,7 +1936,7 @@ struct engine_configuration_s { uint16_t tps2SecondaryMax; /** offset 1464 bit 0 */ - bool useFSIO6ForRevLimiter : 1; + bool unusedHereWeHave : 1; /** * Enables lambda sensor closed loop feedback for fuelling. offset 1464 bit 1 */ @@ -3509,4 +3509,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 Mon Jun 01 07:54:47 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Mon Jun 01 08:11:57 EDT 2020 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index d27d3212e3..0e534e687c 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1351,6 +1351,7 @@ #define unusedBit_34_31_offset 76 #define unusedFlexFuelSensor_offset 3100 #define unusedHere_offset 761 +#define unusedHereWeHave_offset 1464 #define unusedOldBiquad_offset 2332 #define unusedSomethingWasHere_offset 2417 #define unusedSpiPadding4_offset 2593 diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index fce500e5f9..ba2b43ecef 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 Mon Jun 01 07:54:47 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Mon Jun 01 08:11:57 EDT 2020 pageSize = 20000 page = 1 @@ -648,7 +648,7 @@ page = 1 ;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1200 tps2SecondaryMin = scalar, U16, 1460, "ADC", 1, 0, 0, 1000, 0 tps2SecondaryMax = scalar, U16, 1462, "ADC", 1, 0, 0, 1000, 0 - useFSIO6ForRevLimiter = bits, U32, 1464, [0:0], "false", "true" + unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true" fuelClosedLoopCorrectionEnabled= bits, U32, 1464, [1:1], "false", "true" isVerboseIAC = bits, U32, 1464, [2:2], "false", "true" isVerboseETB = bits, U32, 1464, [3:3], "false", "true" diff --git a/firmware/tunerstudio/rusefi_frankenso.ini b/firmware/tunerstudio/rusefi_frankenso.ini index 84feabcc98..4c791cfbe0 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 Mon Jun 01 08:01:23 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Mon Jun 01 08:12:01 EDT 2020 pageSize = 20000 page = 1 @@ -648,7 +648,7 @@ page = 1 ;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1200 tps2SecondaryMin = scalar, U16, 1460, "ADC", 1, 0, 0, 1000, 0 tps2SecondaryMax = scalar, U16, 1462, "ADC", 1, 0, 0, 1000, 0 - useFSIO6ForRevLimiter = bits, U32, 1464, [0:0], "false", "true" + unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true" fuelClosedLoopCorrectionEnabled= bits, U32, 1464, [1:1], "false", "true" isVerboseIAC = bits, U32, 1464, [2:2], "false", "true" isVerboseETB = bits, U32, 1464, [3:3], "false", "true" diff --git a/firmware/tunerstudio/rusefi_kinetis.ini b/firmware/tunerstudio/rusefi_kinetis.ini index 1301534c98..7270490f4d 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 Mon Jun 01 08:01:27 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Mon Jun 01 08:12:05 EDT 2020 pageSize = 20000 page = 1 @@ -648,7 +648,7 @@ page = 1 ;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1200 tps2SecondaryMin = scalar, U16, 1460, "ADC", 1, 0, 0, 1000, 0 tps2SecondaryMax = scalar, U16, 1462, "ADC", 1, 0, 0, 1000, 0 - useFSIO6ForRevLimiter = bits, U32, 1464, [0:0], "false", "true" + unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true" fuelClosedLoopCorrectionEnabled= bits, U32, 1464, [1:1], "false", "true" isVerboseIAC = bits, U32, 1464, [2:2], "false", "true" isVerboseETB = bits, U32, 1464, [3:3], "false", "true" diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini index e20da68529..0aba1bc6ca 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 Mon Jun 01 08:01:20 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Mon Jun 01 08:11:59 EDT 2020 pageSize = 20000 page = 1 @@ -648,7 +648,7 @@ page = 1 ;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1200 tps2SecondaryMin = scalar, U16, 1460, "ADC", 1, 0, 0, 1000, 0 tps2SecondaryMax = scalar, U16, 1462, "ADC", 1, 0, 0, 1000, 0 - useFSIO6ForRevLimiter = bits, U32, 1464, [0:0], "false", "true" + unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true" fuelClosedLoopCorrectionEnabled= bits, U32, 1464, [1:1], "false", "true" isVerboseIAC = bits, U32, 1464, [2:2], "false", "true" isVerboseETB = bits, U32, 1464, [3:3], "false", "true" diff --git a/firmware/tunerstudio/rusefi_prometheus.ini b/firmware/tunerstudio/rusefi_prometheus.ini index 688c2cc611..212d78a49e 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 Mon Jun 01 08:01:24 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Mon Jun 01 08:12:03 EDT 2020 pageSize = 20000 page = 1 @@ -648,7 +648,7 @@ page = 1 ;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1200 tps2SecondaryMin = scalar, U16, 1460, "ADC", 1, 0, 0, 1000, 0 tps2SecondaryMax = scalar, U16, 1462, "ADC", 1, 0, 0, 1000, 0 - useFSIO6ForRevLimiter = bits, U32, 1464, [0:0], "false", "true" + unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true" fuelClosedLoopCorrectionEnabled= bits, U32, 1464, [1:1], "false", "true" isVerboseIAC = bits, U32, 1464, [2:2], "false", "true" isVerboseETB = bits, U32, 1464, [3:3], "false", "true" diff --git a/firmware/tunerstudio/rusefi_proteus.ini b/firmware/tunerstudio/rusefi_proteus.ini index 14eee38193..b479475692 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 Mon Jun 01 07:55:07 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Mon Jun 01 08:12:04 EDT 2020 pageSize = 20000 page = 1 @@ -648,7 +648,7 @@ page = 1 ;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1200 tps2SecondaryMin = scalar, U16, 1460, "ADC", 1, 0, 0, 1000, 0 tps2SecondaryMax = scalar, U16, 1462, "ADC", 1, 0, 0, 1000, 0 - useFSIO6ForRevLimiter = bits, U32, 1464, [0:0], "false", "true" + unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true" fuelClosedLoopCorrectionEnabled= bits, U32, 1464, [1:1], "false", "true" isVerboseIAC = bits, U32, 1464, [2:2], "false", "true" isVerboseETB = bits, U32, 1464, [3:3], "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 40bb746925..ca9d0938ff 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 Mon Jun 01 07:54:47 EDT 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Mon Jun 01 08:11:57 EDT 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1314,6 +1314,7 @@ public class Fields { public static final int unusedBit_34_31_offset = 76; public static final int unusedFlexFuelSensor_offset = 3100; public static final int unusedHere_offset = 761; + public static final int unusedHereWeHave_offset = 1464; public static final int unusedOldBiquad_offset = 2332; public static final int unusedSomethingWasHere_offset = 2417; public static final int unusedSpiPadding4_offset = 2593; @@ -1933,7 +1934,7 @@ public class Fields { public static final Field TCU_SOLENOID8 = Field.create("TCU_SOLENOID8", 1199, FieldType.INT8, output_pin_e); public static final Field TPS2SECONDARYMIN = Field.create("TPS2SECONDARYMIN", 1460, FieldType.INT16); public static final Field TPS2SECONDARYMAX = Field.create("TPS2SECONDARYMAX", 1462, FieldType.INT16); - public static final Field USEFSIO6FORREVLIMITER = Field.create("USEFSIO6FORREVLIMITER", 1464, FieldType.BIT, 0); + public static final Field UNUSEDHEREWEHAVE = Field.create("UNUSEDHEREWEHAVE", 1464, FieldType.BIT, 0); public static final Field FUELCLOSEDLOOPCORRECTIONENABLED = Field.create("FUELCLOSEDLOOPCORRECTIONENABLED", 1464, FieldType.BIT, 1); public static final Field ISVERBOSEIAC = Field.create("ISVERBOSEIAC", 1464, FieldType.BIT, 2); public static final Field ISVERBOSEETB = Field.create("ISVERBOSEETB", 1464, FieldType.BIT, 3); @@ -2915,7 +2916,7 @@ public class Fields { TCU_SOLENOID8, TPS2SECONDARYMIN, TPS2SECONDARYMAX, - USEFSIO6FORREVLIMITER, + UNUSEDHEREWEHAVE, FUELCLOSEDLOOPCORRECTIONENABLED, ISVERBOSEIAC, ISVERBOSEETB,