diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index f620b74bdd..041281a6c3 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 by config_definition.jar on Tue Aug 18 23:29:59 EDT 2015 +// this section was generated by config_definition.jar on Fri Aug 21 15:51:56 EDT 2015 // begin #include "rusefi_types.h" typedef struct { @@ -1259,7 +1259,23 @@ typedef struct { /** * offset 1832 */ - int unused3[81]; + float suckedOffCoef; + /** + * offset 1836 + */ + float unused71[7]; + /** + * offset 1864 + */ + float addedToWallCoef; + /** + * offset 1868 + */ + float unused72[7]; + /** + * offset 1896 + */ + int unused3[65]; /** * offset 2156 */ @@ -1470,4 +1486,4 @@ typedef struct { } persistent_config_s; // end -// this section was generated by config_definition.jar on Tue Aug 18 23:29:59 EDT 2015 +// this section was generated by config_definition.jar on Fri Aug 21 15:51:56 EDT 2015 diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index a6e8c6dad8..5474c84542 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -655,8 +655,14 @@ #define tachPulseDuractionMs_offset_hex 720 #define tachPulseTriggerIndex_offset 1828 #define tachPulseTriggerIndex_offset_hex 724 -#define unused3_offset 1832 -#define unused3_offset_hex 728 +#define suckedOffCoef_offset 1832 +#define suckedOffCoef_offset_hex 728 +#define unused71_offset 1836 +#define addedToWallCoef_offset 1864 +#define addedToWallCoef_offset_hex 748 +#define unused72_offset 1868 +#define unused3_offset 1896 +#define unused3_offset_hex 768 #define targetVBatt_offset 2156 #define alternatorOffAboveTps_offset 2160 #define alternatorOffAboveTps_offset_hex 870 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index a680d5e3c8..c3c3149299 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -572,7 +572,12 @@ baro_corr_table_t baroCorrTable; float tachPulseDuractionMs;;"ms", 1, 0, 0.0, 100.0, 2 int tachPulseTriggerIndex;trigger cycle index at which we start tach pulse (performance consideration);"index", 1, 0, 0.0, 360.0, 0 - int[81] unused3; + + float suckedOffCoef;;"%", 1, 0, 0.0, 300.0, 2 + float[7] unused71; + float addedToWallCoef;;"%", 1, 0, 0.0, 300.0, 2 + float[7] unused72; + int[65] unused3; float targetVBatt;;"Volts", 1, 0, 0,30, 1 float alternatorOffAboveTps;Turn off alternator output above specified TPS;"%", 1, 0, 0, 200, 2 diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index ec593073b6..30ac817d75 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -40,7 +40,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated by ConfigDefinition.jar on Wed Aug 19 20:32:13 EDT 2015 +; this section was generated by ConfigDefinition.jar on Fri Aug 21 15:51:57 EDT 2015 pageSize = 15288 page = 1 @@ -467,7 +467,11 @@ page = 1 crankingTpsBins = array, F32, 1792, [8], "%", 1, 0, 0.0, 100.0, 2 tachPulseDuractionMs = scalar, F32, 1824, "ms", 1, 0, 0.0, 100.0, 2 tachPulseTriggerIndex = scalar, S32, 1828, "index", 1, 0, 0.0, 360.0, 0 -;skipping unused3 offset 1832 + suckedOffCoef = scalar, F32, 1832, "%", 1, 0, 0.0, 300.0, 2 +;skipping unused71 offset 1836 + addedToWallCoef = scalar, F32, 1864, "%", 1, 0, 0.0, 300.0, 2 +;skipping unused72 offset 1868 +;skipping unused3 offset 1896 targetVBatt = scalar, F32, 2156, "Volts", 1, 0, 0,30, 1 alternatorOffAboveTps = scalar, F32, 2160, "%", 1, 0, 0, 200, 2 alternatorDT = scalar, S32, 2164, "ms", 1, 0, 0, 3000, 0 diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java index ec2ea556ea..8c76983f4f 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 Mon Jul 13 18:45:30 EDT 2015 +// this file was generated automatically by ConfigDefinition.jar Fri Aug 21 15:51:57 EDT 2015 public class Fields { public static final Field ENGINETYPE = new Field("ENGINETYPE", 0, FieldType.INT); public static final Field HEADERMAGICVALUE = new Field("HEADERMAGICVALUE", 4, FieldType.INT); @@ -176,6 +176,8 @@ public class Fields { public static final Field AFR_TYPE = new Field("AFR_TYPE", 900, FieldType.INT, ego_sensor_e); public static final Field ETBDT = new Field("ETBDT", 904, FieldType.INT); public static final Field HIP9011CSPINMODE = new Field("HIP9011CSPINMODE", 908, FieldType.INT, pin_output_mode_e); + public static final Field TACHOUTPUTPIN = new Field("TACHOUTPUTPIN", 912, FieldType.INT, brain_pin_e); + public static final Field TACHOUTPUTPINMODE = new Field("TACHOUTPUTPINMODE", 916, FieldType.INT, pin_output_mode_e); public static final String[] brain_input_pin_e = {"INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA5", "INVALID", "INVALID", "PA8", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PE5", "INVALID", "PE7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"}; public static final Field TRIGGERINPUTPINS1 = new Field("TRIGGERINPUTPINS1", 920, FieldType.INT, brain_input_pin_e); public static final Field TRIGGERINPUTPINS2 = new Field("TRIGGERINPUTPINS2", 924, FieldType.INT, brain_input_pin_e); @@ -414,6 +416,10 @@ public class Fields { public static final Field SPI2SCKMODE = new Field("SPI2SCKMODE", 1748, FieldType.INT); public static final Field SPI2MOSIMODE = new Field("SPI2MOSIMODE", 1752, FieldType.INT); public static final Field SPI2MISOMODE = new Field("SPI2MISOMODE", 1756, FieldType.INT); + public static final Field TACHPULSEDURACTIONMS = new Field("TACHPULSEDURACTIONMS", 1824, FieldType.FLOAT); + public static final Field TACHPULSETRIGGERINDEX = new Field("TACHPULSETRIGGERINDEX", 1828, FieldType.INT); + public static final Field SUCKEDOFFCOEF = new Field("SUCKEDOFFCOEF", 1832, FieldType.FLOAT); + public static final Field ADDEDTOWALLCOEF = new Field("ADDEDTOWALLCOEF", 1864, FieldType.FLOAT); public static final Field TARGETVBATT = new Field("TARGETVBATT", 2156, FieldType.FLOAT); public static final Field ALTERNATOROFFABOVETPS = new Field("ALTERNATOROFFABOVETPS", 2160, FieldType.FLOAT); public static final Field ALTERNATORDT = new Field("ALTERNATORDT", 2164, FieldType.INT);