From f1683c34c4cb659031bea11ccac7b8795627e69a Mon Sep 17 00:00:00 2001 From: rusEfi Date: Tue, 11 Oct 2016 22:01:50 -0400 Subject: [PATCH] auto-sync --- .../engine_configuration_generated_structures.h | 15 ++++++++++++--- firmware/controllers/algo/rusefi_generated.h | 5 ++++- firmware/integration/rusefi_config.txt | 5 ++++- .../models/src/com/rusefi/config/Fields.java | 7 +++++-- 4 files changed, 25 insertions(+), 7 deletions(-) diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index a1323af7b8..d538f6f0f5 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 Tue Oct 11 20:15:08 EDT 2016 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Oct 11 21:20:18 EDT 2016 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -1742,9 +1742,18 @@ typedef struct { */ bi_quard_s biQuad; /** + * CLT-based timing correction * offset 2576 */ - int unused[118]; + float cltTimingBins[CLT_TIMING_CURVE_SIZE]; + /** + * offset 2608 + */ + float cltTimingExtra[CLT_TIMING_CURVE_SIZE]; + /** + * offset 2640 + */ + int unused[102]; /** total size 3048*/ } engine_configuration_s; @@ -1959,4 +1968,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Oct 11 20:15:08 EDT 2016 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Oct 11 21:20:18 EDT 2016 diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index 87196956e3..61c1a337d3 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -6,6 +6,7 @@ #define MAP_WINDOW_SIZE 8 #define CLT_CURVE_SIZE 16 #define ENGINE_NOISE_CURVE_SIZE 8 +#define CLT_TIMING_CURVE_SIZE 8 #define IAT_CURVE_SIZE 16 #define VBAT_INJECTOR_CURVE_SIZE 8 #define DWELL_CURVE_SIZE 8 @@ -883,7 +884,9 @@ #define biQuad_a2_offset 2564 #define biQuad_b1_offset 2568 #define biQuad_b2_offset 2572 -#define unused_offset 2576 +#define cltTimingBins_offset 2576 +#define cltTimingExtra_offset 2608 +#define unused_offset 2640 #define le_formulas1_offset 3048 #define le_formulas2_offset 3248 #define le_formulas3_offset 3448 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 77761618f0..e3c27f9c0c 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -43,6 +43,7 @@ struct_no_prefix engine_configuration_s #define CLT_CURVE_SIZE 16 #define ENGINE_NOISE_CURVE_SIZE 8 +#define CLT_TIMING_CURVE_SIZE 8 #define IAT_CURVE_SIZE 16 @@ -745,7 +746,9 @@ float[MAP_ACCEL_TAPER] mapAccelTaperMult;;"mult", 1, 0, 0.0, 300, pid_s[AUX_PID_COUNT iterate] auxPid; vvt_mode_e vvtMode; bi_quard_s biQuad; - int[118] unused; + float[CLT_TIMING_CURVE_SIZE] cltTimingBins;CLT-based timing correction;"C", 1, 0, -100.0, 250.0, 1 + float[CLT_TIMING_CURVE_SIZE] cltTimingExtra;;"degree", 1, 0, -400.0, 400.0, 0 + int[102] unused; 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 8e8d2c2a2e..aa232a879c 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 Oct 02 13:12:05 EDT 2016 +// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Oct 11 21:20:18 EDT 2016 public class Fields { public static final int LE_COMMAND_LENGTH = 200; public static final int FSIO_ADC_COUNT = 4; @@ -10,6 +10,7 @@ public class Fields { public static final int MAP_WINDOW_SIZE = 8; public static final int CLT_CURVE_SIZE = 16; public static final int ENGINE_NOISE_CURVE_SIZE = 8; + public static final int CLT_TIMING_CURVE_SIZE = 8; public static final int IAT_CURVE_SIZE = 16; public static final int VBAT_INJECTOR_CURVE_SIZE = 8; public static final int DWELL_CURVE_SIZE = 8; @@ -887,7 +888,9 @@ public class Fields { public static final int biQuad_a2_offset = 2564; public static final int biQuad_b1_offset = 2568; public static final int biQuad_b2_offset = 2572; - public static final int unused_offset = 2576; + public static final int cltTimingBins_offset = 2576; + public static final int cltTimingExtra_offset = 2608; + public static final int unused_offset = 2640; public static final int le_formulas1_offset = 3048; public static final int le_formulas2_offset = 3248; public static final int le_formulas3_offset = 3448;