diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index cc8c4ebdf5..99113ad380 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 Sun Mar 04 23:08:53 EST 2018 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Mar 17 19:54:04 EDT 2018 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -645,7 +645,7 @@ typedef struct { bool isFasterEngineSpinUpEnabled : 1; /** offset 376 bit 21 */ - bool unused_board_984_21 : 1; + bool coastingFuelCutEnabled : 1; /** offset 376 bit 22 */ bool unused_board_984_22 : 1; @@ -2101,7 +2101,24 @@ typedef struct { /** * offset 3376 */ - int unusedEnd[776]; + int16_t coastingFuelCutRpmHigh; + /** + * offset 3378 + */ + int16_t coastingFuelCutRpmLow; + /** + * percent between 0 and 100 + * offset 3380 + */ + int16_t coastingFuelCutTps; + /** + * offset 3382 + */ + int16_t unusedInt; + /** + * offset 3384 + */ + int unusedEnd[774]; /** total size 6480*/ } engine_configuration_s; @@ -2347,4 +2364,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Mar 04 23:08:53 EST 2018 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Mar 17 19:54:04 EDT 2018 diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index 098904845c..b3d7466812 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -586,8 +586,8 @@ #define stepperForceParkingEveryRestart_offset_hex 3d8 #define isFasterEngineSpinUpEnabled_offset 984 #define isFasterEngineSpinUpEnabled_offset_hex 3d8 -#define unused_board_984_21_offset 984 -#define unused_board_984_21_offset_hex 3d8 +#define coastingFuelCutEnabled_offset 984 +#define coastingFuelCutEnabled_offset_hex 3d8 #define unused_board_984_22_offset 984 #define unused_board_984_22_offset_hex 3d8 #define unused_board_984_23_offset 984 @@ -1552,8 +1552,16 @@ #define servoOutputPins7_offset_hex d28 #define servoOutputPins8_offset 3372 #define servoOutputPins8_offset_hex d2c -#define unusedEnd_offset 3376 -#define unusedEnd_offset_hex d30 +#define coastingFuelCutRpmHigh_offset 3376 +#define coastingFuelCutRpmHigh_offset_hex d30 +#define coastingFuelCutRpmLow_offset 3378 +#define coastingFuelCutRpmLow_offset_hex d32 +#define coastingFuelCutTps_offset 3380 +#define coastingFuelCutTps_offset_hex d34 +#define unusedInt_offset 3382 +#define unusedInt_offset_hex d36 +#define unusedEnd_offset 3384 +#define unusedEnd_offset_hex d38 #define cltCrankingCorrBins_offset 6480 #define cltCrankingCorrBins_offset_hex 1950 #define cltCrankingCorr_offset 6512 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 65edd38db5..6b260ce06e 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -548,7 +548,7 @@ bit is_enabled_spi_2 bit measureMapOnlyInOneCylinder;+Useful for individual intakes bit stepperForceParkingEveryRestart bit isFasterEngineSpinUpEnabled - bit unused_board_984_21 + bit coastingFuelCutEnabled bit unused_board_984_22 bit unused_board_984_23 bit unused_board_984_24 @@ -896,7 +896,12 @@ float[CRANKING_ADVANCE_CURVE_SIZE] crankingAdvanceBins;Optional timing advance t float[CRANKING_ADVANCE_CURVE_SIZE] crankingAdvance ;Optional timing advance table for Cranking (see useSeparateAdvanceForCranking);"deg", 1, 0, -20, 90, 2 brain_pin_e[SERVO_COUNT iterate] servoOutputPins;todo: more comments - int[776] unusedEnd; + int16_t coastingFuelCutRpmHigh; + int16_t coastingFuelCutRpmLow; + int16_t coastingFuelCutTps;percent between 0 and 100 + int16_t unusedInt; + + int[774] unusedEnd; end_struct diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java index 6977e7dba7..c3c4699697 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 Mar 03 08:46:57 EST 2018 +// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Mar 17 19:54:04 EDT 2018 public class Fields { public static final int LE_COMMAND_LENGTH = 200; public static final int BLOCKING_FACTOR = 400; @@ -403,7 +403,7 @@ public class Fields { public static final int measureMapOnlyInOneCylinder_offset = 984; public static final int stepperForceParkingEveryRestart_offset = 984; public static final int isFasterEngineSpinUpEnabled_offset = 984; - public static final int unused_board_984_21_offset = 984; + public static final int coastingFuelCutEnabled_offset = 984; public static final int unused_board_984_22_offset = 984; public static final int unused_board_984_23_offset = 984; public static final int unused_board_984_24_offset = 984; @@ -1028,7 +1028,11 @@ public class Fields { public static final int servoOutputPins6_offset = 3364; public static final int servoOutputPins7_offset = 3368; public static final int servoOutputPins8_offset = 3372; - public static final int unusedEnd_offset = 3376; + public static final int coastingFuelCutRpmHigh_offset = 3376; + public static final int coastingFuelCutRpmLow_offset = 3378; + public static final int coastingFuelCutTps_offset = 3380; + public static final int unusedInt_offset = 3382; + public static final int unusedEnd_offset = 3384; public static final int cltCrankingCorrBins_offset = 6480; public static final int cltCrankingCorrBins_offset_hex = 1950; public static final int cltCrankingCorr_offset = 6512; @@ -1407,7 +1411,7 @@ public class Fields { public static final Field MEASUREMAPONLYINONECYLINDER = Field.create("MEASUREMAPONLYINONECYLINDER", 984, FieldType.BIT, 18); public static final Field STEPPERFORCEPARKINGEVERYRESTART = Field.create("STEPPERFORCEPARKINGEVERYRESTART", 984, FieldType.BIT, 19); public static final Field ISFASTERENGINESPINUPENABLED = Field.create("ISFASTERENGINESPINUPENABLED", 984, FieldType.BIT, 20); - public static final Field UNUSED_BOARD_984_21 = Field.create("UNUSED_BOARD_984_21", 984, FieldType.BIT, 21); + public static final Field COASTINGFUELCUTENABLED = Field.create("COASTINGFUELCUTENABLED", 984, FieldType.BIT, 21); public static final Field UNUSED_BOARD_984_22 = Field.create("UNUSED_BOARD_984_22", 984, FieldType.BIT, 22); public static final Field UNUSED_BOARD_984_23 = Field.create("UNUSED_BOARD_984_23", 984, FieldType.BIT, 23); public static final Field UNUSED_BOARD_984_24 = Field.create("UNUSED_BOARD_984_24", 984, FieldType.BIT, 24); @@ -1852,6 +1856,10 @@ public class Fields { public static final Field SERVOOUTPUTPINS6 = Field.create("SERVOOUTPUTPINS6", 3364, FieldType.INT, brain_pin_e); public static final Field SERVOOUTPUTPINS7 = Field.create("SERVOOUTPUTPINS7", 3368, FieldType.INT, brain_pin_e); public static final Field SERVOOUTPUTPINS8 = Field.create("SERVOOUTPUTPINS8", 3372, FieldType.INT, brain_pin_e); + public static final Field COASTINGFUELCUTRPMHIGH = Field.create("COASTINGFUELCUTRPMHIGH", 3376, FieldType.INT); + public static final Field COASTINGFUELCUTRPMLOW = Field.create("COASTINGFUELCUTRPMLOW", 3378, FieldType.INT); + public static final Field COASTINGFUELCUTTPS = Field.create("COASTINGFUELCUTTPS", 3380, FieldType.INT); + public static final Field UNUSEDINT = Field.create("UNUSEDINT", 3382, FieldType.INT); public static final Field FSIOFORMULAS1 = Field.create("FSIOFORMULAS1", 6672, FieldType.INT); public static final Field FSIOFORMULAS2 = Field.create("FSIOFORMULAS2", 6872, FieldType.INT); public static final Field FSIOFORMULAS3 = Field.create("FSIOFORMULAS3", 7072, FieldType.INT);