diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index f85729907e..e9c8115cb7 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 Jan 06 03:15:03 PST 2019 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Jan 07 19:25:33 EST 2019 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -2210,22 +2210,23 @@ typedef struct { tChargeMode_e tChargeMode; /** * target TPS value, 0 to 100% + * TOOD: use int8 data date once we template interpolation method * offset 4116 */ - uint8_t etbBiasBins[ETB_BIAS_CURVE_LENGTH]; + float etbBiasBins[ETB_BIAS_CURVE_LENGTH]; /** * PWM bias, 0 to 100% - * offset 4124 + * offset 4148 */ float etbBiasValues[ETB_BIAS_CURVE_LENGTH]; /** - * offset 4156 + * offset 4180 */ float hip9011Gain; /** - * offset 4160 + * offset 4184 */ - int unusedEnd[580]; + int unusedEnd[574]; /** total size 6480*/ } engine_configuration_s; @@ -2472,4 +2473,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Jan 06 03:15:03 PST 2019 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Jan 07 19:25:33 EST 2019 diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index 13540a76e4..3b72d5b5de 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -1595,12 +1595,12 @@ #define tChargeMode_offset_hex 1010 #define etbBiasBins_offset 4116 #define etbBiasBins_offset_hex 1014 -#define etbBiasValues_offset 4124 -#define etbBiasValues_offset_hex 101c -#define hip9011Gain_offset 4156 -#define hip9011Gain_offset_hex 103c -#define unusedEnd_offset 4160 -#define unusedEnd_offset_hex 1040 +#define etbBiasValues_offset 4148 +#define etbBiasValues_offset_hex 1034 +#define hip9011Gain_offset 4180 +#define hip9011Gain_offset_hex 1054 +#define unusedEnd_offset 4184 +#define unusedEnd_offset_hex 1058 #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 13b360af83..5a4a08b013 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -930,11 +930,11 @@ custom tChargeMode_e 4 bits, U32, @OFFSET@, [0:0], @@tChargeMode_e_enum@@ tChargeMode_e tChargeMode; - uint8_t[ETB_BIAS_CURVE_LENGTH] etbBiasBins;target TPS value, 0 to 100%;"target TPS position", 1, 0.0, 0, 100.0, 0 + float[ETB_BIAS_CURVE_LENGTH] etbBiasBins;target TPS value, 0 to 100%\nTOOD: use int8 data date once we template interpolation method;"target TPS position", 1, 0.0, 0, 100.0, 0 float[ETB_BIAS_CURVE_LENGTH] etbBiasValues;PWM bias, 0 to 100%;"ETB duty cycle bias", 1, 0.0, -100, 100.0, 2 float hip9011Gain; - int[580] unusedEnd; + int[574] 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 138ef951c3..b80b65f203 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 Sun Jan 06 03:15:03 PST 2019 +// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Jan 07 19:25:33 EST 2019 public class Fields { public static final int LE_COMMAND_LENGTH = 200; public static final int BLOCKING_FACTOR = 400; @@ -1055,10 +1055,12 @@ public class Fields { public static final int tChargeMode_offset_hex = 1010; public static final int etbBiasBins_offset = 4116; public static final int etbBiasBins_offset_hex = 1014; - public static final int etbBiasValues_offset = 4124; - public static final int hip9011Gain_offset = 4156; - public static final int unusedEnd_offset = 4160; - public static final int unusedEnd_offset_hex = 1040; + public static final int etbBiasValues_offset = 4148; + public static final int etbBiasValues_offset_hex = 1034; + public static final int hip9011Gain_offset = 4180; + public static final int hip9011Gain_offset_hex = 1054; + public static final int unusedEnd_offset = 4184; + public static final int unusedEnd_offset_hex = 1058; public static final int cltCrankingCorrBins_offset = 6480; public static final int cltCrankingCorrBins_offset_hex = 1950; public static final int cltCrankingCorr_offset = 6512; @@ -1901,7 +1903,7 @@ public class Fields { public static final Field TCHARGEAIRDECRLIMIT = Field.create("TCHARGEAIRDECRLIMIT", 4108, FieldType.FLOAT); public static final String[] tChargeMode_e = {"RPM+TPS (Default)", "Air Mass Interpolation"}; public static final Field TCHARGEMODE = Field.create("TCHARGEMODE", 4112, FieldType.INT, tChargeMode_e); - public static final Field HIP9011GAIN = Field.create("HIP9011GAIN", 4156, FieldType.FLOAT); + public static final Field HIP9011GAIN = Field.create("HIP9011GAIN", 4180, FieldType.FLOAT); 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);