From ce91877f9a9243c45bfa7860886f7aed7b658709 Mon Sep 17 00:00:00 2001 From: rusefi Date: Thu, 23 Nov 2017 02:50:04 -0500 Subject: [PATCH] #490 --- ...ngine_configuration_generated_structures.h | 38 +++++++++++++++++-- firmware/controllers/algo/rusefi_generated.h | 22 ++++++++++- firmware/integration/rusefi_config.txt | 13 ++++++- .../models/src/com/rusefi/config/Fields.java | 14 ++++++- 4 files changed, 79 insertions(+), 8 deletions(-) diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index 5b24f37e03..0011faac39 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 Nov 19 15:18:42 EST 2017 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Nov 23 02:36:23 EST 2017 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -1953,7 +1953,39 @@ typedef struct { /** * offset 2920 */ - int unusedEnd[938]; + float fsioCurve1Bins[FSIO_CURVE_16]; + /** + * offset 2984 + */ + float fsioCurve1[FSIO_CURVE_16]; + /** + * offset 3048 + */ + float fsioCurve2Bins[FSIO_CURVE_16]; + /** + * offset 3112 + */ + float fsioCurve2[FSIO_CURVE_16]; + /** + * offset 3176 + */ + float fsioCurve3Bins[FSIO_CURVE_8]; + /** + * offset 3208 + */ + float fsioCurve3[FSIO_CURVE_8]; + /** + * offset 3240 + */ + float fsioCurve4Bins[FSIO_CURVE_8]; + /** + * offset 3272 + */ + float fsioCurve4[FSIO_CURVE_8]; + /** + * offset 3304 + */ + int unusedEnd[842]; /** total size 6672*/ } engine_configuration_s; @@ -2168,4 +2200,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Nov 19 15:18:42 EST 2017 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Nov 23 02:36:23 EST 2017 diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index 8cd29254a4..d122a3c0be 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -44,6 +44,8 @@ #define FUEL_RPM_COUNT 16 #define FUEL_LOAD_COUNT 16 #define FSIO_TABLE_8 8 +#define FSIO_CURVE_8 8 +#define FSIO_CURVE_16 16 #define TPS_TPS_ACCEL_TABLE 8 #define MAP_ACCEL_TAPER 8 #define BARO_CORR_SIZE 4 @@ -1450,8 +1452,24 @@ #define oilPressure_value2_offset_hex b60 #define accelerometerSpiDevice_offset 2916 #define accelerometerSpiDevice_offset_hex b64 -#define unusedEnd_offset 2920 -#define unusedEnd_offset_hex b68 +#define fsioCurve1Bins_offset 2920 +#define fsioCurve1Bins_offset_hex b68 +#define fsioCurve1_offset 2984 +#define fsioCurve1_offset_hex ba8 +#define fsioCurve2Bins_offset 3048 +#define fsioCurve2Bins_offset_hex be8 +#define fsioCurve2_offset 3112 +#define fsioCurve2_offset_hex c28 +#define fsioCurve3Bins_offset 3176 +#define fsioCurve3Bins_offset_hex c68 +#define fsioCurve3_offset 3208 +#define fsioCurve3_offset_hex c88 +#define fsioCurve4Bins_offset 3240 +#define fsioCurve4Bins_offset_hex ca8 +#define fsioCurve4_offset 3272 +#define fsioCurve4_offset_hex cc8 +#define unusedEnd_offset 3304 +#define unusedEnd_offset_hex ce8 #define fsioFormulas1_offset 6672 #define fsioFormulas1_offset_hex 1a10 #define fsioFormulas2_offset 6872 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index a7217aa1f2..7f69f79d43 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -82,6 +82,9 @@ struct_no_prefix engine_configuration_s #define FSIO_TABLE_8 8 +#define FSIO_CURVE_8 8 +#define FSIO_CURVE_16 16 + #define TPS_TPS_ACCEL_TABLE 8 #define MAP_ACCEL_TAPER 8 @@ -827,7 +830,15 @@ brain_pin_e brakePedalPin oil_pressure_config_s oilPressure; spi_device_e accelerometerSpiDevice; - int[938] unusedEnd; + float[FSIO_CURVE_16] fsioCurve1Bins;;"x", 1, 0, -999, 1000.0, 3 + float[FSIO_CURVE_16] fsioCurve1;;"y", 1, 0, -999, 1000.0, 3 + float[FSIO_CURVE_16] fsioCurve2Bins;;"x", 1, 0, -999, 1000.0, 3 + float[FSIO_CURVE_16] fsioCurve2;;"y", 1, 0, -999, 1000.0, 3 + float[FSIO_CURVE_8] fsioCurve3Bins;;"x", 1, 0, -999, 1000.0, 3 + float[FSIO_CURVE_8] fsioCurve3;;"y", 1, 0, -999, 1000.0, 3 + float[FSIO_CURVE_8] fsioCurve4Bins;;"x", 1, 0, -999, 1000.0, 3 + float[FSIO_CURVE_8] fsioCurve4;;"y", 1, 0, -999, 1000.0, 3 + int[842] 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 ed1392f952..0e384b0bd4 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 Nov 19 15:18:42 EST 2017 +// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Nov 23 02:36:23 EST 2017 public class Fields { public static final int LE_COMMAND_LENGTH = 200; public static final int BLOCKING_FACTOR = 400; @@ -33,6 +33,8 @@ public class Fields { public static final int FUEL_RPM_COUNT = 16; public static final int FUEL_LOAD_COUNT = 16; public static final int FSIO_TABLE_8 = 8; + public static final int FSIO_CURVE_8 = 8; + public static final int FSIO_CURVE_16 = 16; public static final int TPS_TPS_ACCEL_TABLE = 8; public static final int MAP_ACCEL_TAPER = 8; public static final int BARO_CORR_SIZE = 4; @@ -973,7 +975,15 @@ public class Fields { public static final int oilPressure_v2_offset = 2908; public static final int oilPressure_value2_offset = 2912; public static final int accelerometerSpiDevice_offset = 2916; - public static final int unusedEnd_offset = 2920; + public static final int fsioCurve1Bins_offset = 2920; + public static final int fsioCurve1_offset = 2984; + public static final int fsioCurve2Bins_offset = 3048; + public static final int fsioCurve2_offset = 3112; + public static final int fsioCurve3Bins_offset = 3176; + public static final int fsioCurve3_offset = 3208; + public static final int fsioCurve4Bins_offset = 3240; + public static final int fsioCurve4_offset = 3272; + public static final int unusedEnd_offset = 3304; public static final int fsioFormulas1_offset = 6672; public static final int fsioFormulas2_offset = 6872; public static final int fsioFormulas3_offset = 7072;