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 3e8181ccb2..7e5cdfd4b2 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:18:46 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 07:55:12 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 unusedHereWeHave : 1; + bool useFSIO6ForRevLimiter : 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:18:46 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 07:55:12 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 396ffff672..87e028c4bf 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1351,7 +1351,6 @@ #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 77523706d6..f152e84d9f 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:18:30 EDT 2020 +// 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 // 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 unusedHereWeHave : 1; + bool useFSIO6ForRevLimiter : 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:18:30 EDT 2020 +// 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 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 0e534e687c..d27d3212e3 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1351,7 +1351,6 @@ #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/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 5b667436db..6091c69b50 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -897,7 +897,7 @@ custom maf_sensor_type_e 4 bits, S32, @OFFSET@, [0:7], @@maf_sensor_type_e_enum@ uint16_t tps2SecondaryMin;;"ADC", 1, 0, 0, 1000, 0 uint16_t tps2SecondaryMax;;"ADC", 1, 0, 0, 1000, 0 - bit unusedHereWeHave + bit useFSIO6ForRevLimiter bit fuelClosedLoopCorrectionEnabled;+Enables lambda sensor closed loop feedback for fuelling. bit isVerboseIAC;+Print details into rusEfi console bit isVerboseETB;+Prints ETB details to rusEFI console diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index a433551f94..fce500e5f9 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:18:30 EDT 2020 +; 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 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 - unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true" + useFSIO6ForRevLimiter = 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" @@ -4077,12 +4077,18 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "#1", fsioFormulas1 field = "#2", fsioFormulas2 field = "#3", fsioFormulas3 + field = "use FSIO #4 for serious engine warning",useFSIO4ForSeriousEngineWarning field = "#4", fsioFormulas4 + field = "use FSIO #5 for critical engine stop", useFSIO5ForCriticalIssueEngineStop field = "#5", fsioFormulas5 + + field = "use FSIO #6 for rev limiter", useFSIO6ForRevLimiter field = "#6", fsioFormulas6 + field = "#7", fsioFormulas7 + field = "use FSIO #8 for servo #1", useFSIO8ForServo1 field = "#8", fsioFormulas8 field = "use FSIO #9 for servo #2", useFSIO9ForServo2 diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index f6198fec85..5c97f4a400 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -2796,12 +2796,18 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "#1", fsioFormulas1 field = "#2", fsioFormulas2 field = "#3", fsioFormulas3 + field = "use FSIO #4 for serious engine warning",useFSIO4ForSeriousEngineWarning field = "#4", fsioFormulas4 + field = "use FSIO #5 for critical engine stop", useFSIO5ForCriticalIssueEngineStop field = "#5", fsioFormulas5 + + field = "use FSIO #6 for rev limiter", useFSIO6ForRevLimiter field = "#6", fsioFormulas6 + field = "#7", fsioFormulas7 + field = "use FSIO #8 for servo #1", useFSIO8ForServo1 field = "#8", fsioFormulas8 field = "use FSIO #9 for servo #2", useFSIO9ForServo2 diff --git a/firmware/tunerstudio/rusefi_proteus.ini b/firmware/tunerstudio/rusefi_proteus.ini index bfd9ce92cc..14eee38193 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:18:44 EDT 2020 +; 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 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 - unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true" + useFSIO6ForRevLimiter = 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" @@ -4044,12 +4044,18 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "#1", fsioFormulas1 field = "#2", fsioFormulas2 field = "#3", fsioFormulas3 + field = "use FSIO #4 for serious engine warning",useFSIO4ForSeriousEngineWarning field = "#4", fsioFormulas4 + field = "use FSIO #5 for critical engine stop", useFSIO5ForCriticalIssueEngineStop field = "#5", fsioFormulas5 + + field = "use FSIO #6 for rev limiter", useFSIO6ForRevLimiter field = "#6", fsioFormulas6 + field = "#7", fsioFormulas7 + field = "use FSIO #8 for servo #1", useFSIO8ForServo1 field = "#8", fsioFormulas8 field = "use FSIO #9 for servo #2", useFSIO9ForServo2 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 3846171ca2..40bb746925 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:18:30 EDT 2020 +// 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 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1314,7 +1314,6 @@ 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; @@ -1934,7 +1933,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 UNUSEDHEREWEHAVE = Field.create("UNUSEDHEREWEHAVE", 1464, FieldType.BIT, 0); + public static final Field USEFSIO6FORREVLIMITER = Field.create("USEFSIO6FORREVLIMITER", 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); @@ -2916,7 +2915,7 @@ public class Fields { TCU_SOLENOID8, TPS2SECONDARYMIN, TPS2SECONDARYMAX, - UNUSEDHEREWEHAVE, + USEFSIO6FORREVLIMITER, FUELCLOSEDLOOPCORRECTIONENABLED, ISVERBOSEIAC, ISVERBOSEETB,