From ab48cbd9a57f4c460a1fc88a66dcdaec2c03c875 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Fri, 5 Feb 2016 00:02:06 -0500 Subject: [PATCH] auto-sync --- .../algo/engine_configuration_generated_structures.h | 11 +++-------- firmware/controllers/algo/rusefi_generated.h | 3 +-- firmware/integration/rusefi_config.txt | 2 +- firmware/tunerstudio/rusefi.ini | 5 ++--- java_console/models/src/com/rusefi/config/Fields.java | 9 +++++++-- 5 files changed, 14 insertions(+), 16 deletions(-) diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index 151c23008f..0afd88d537 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 Thu Feb 04 22:34:53 EST 2016 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Feb 04 23:55:22 EST 2016 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -1472,14 +1472,9 @@ typedef struct { */ debug_mode_e debugMode; /** - * offset 2246 + * offset 2248 */ int unused[192]; - /** - * need 4 byte alignment - * offset 3014 - */ - uint8_t alignmentFill[2]; /** total size 3016*/ } engine_configuration_s; @@ -1629,4 +1624,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Feb 04 22:34:53 EST 2016 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Feb 04 23:55:22 EST 2016 diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index 0a6709c29d..46633123ac 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -733,8 +733,7 @@ #define tpsDecelEnleanmentMultiplier_offset 2236 #define slowAdcAlpha_offset 2240 #define debugMode_offset 2244 -#define unused_offset 2246 -#define alignmentFill_offset 3014 +#define unused_offset 2248 #define le_formulas1_offset 3016 #define le_formulas2_offset 3216 #define le_formulas3_offset 3416 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 60f8473036..b17b32eca2 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -81,7 +81,7 @@ int16_t rpm;This value controls what RPM values we consider 'cranking' (any RPM end_struct #define debug_mode_e_enum "ALTERNATOR", "TPS_ACCEL", "mode2", "mode3" -custom debug_mode_e 2 bits, U32, @OFFSET@, [0:1], @@debug_mode_e_enum@@ +custom debug_mode_e 4 bits, U32, @OFFSET@, [0:1], @@debug_mode_e_enum@@ #define brain_input_pin_e_enum "INVALID", "INVALID", "PA2", "PA3", "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" diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 1f6ff33f82..f1cc2131e8 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -41,7 +41,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Feb 04 22:34:53 EST 2016 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Feb 04 23:55:22 EST 2016 pageSize = 16088 page = 1 @@ -521,8 +521,7 @@ page = 1 tpsDecelEnleanmentMultiplier = scalar, F32, 2236, "coeff", 1, 0, 0, 200, 3 slowAdcAlpha = scalar, F32, 2240, "coeff", 1, 0, 0, 200, 3 debugMode = bits, U32, 2244, [0:1], "ALTERNATOR", "TPS_ACCEL", "mode2", "mode3" -;skipping unused offset 2246 -;skipping alignmentFill offset 3014 +;skipping unused offset 2248 le_formulas1 = array, U08, 3016, [200],"char", 1, 0, 0.0, 3.0, 2 le_formulas2 = array, U08, 3216, [200],"char", 1, 0, 0.0, 3.0, 2 le_formulas3 = array, U08, 3416, [200],"char", 1, 0, 0.0, 3.0, 2 diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java index b8d0449c3f..121ceb5fa1 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 Fri Jan 29 20:39:58 EST 2016 +// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Feb 04 23:55:22 EST 2016 public class Fields { public static final int LE_COMMAND_LENGTH = 200; public static final int TS_FILE_VERSION = 20160122; @@ -363,6 +363,7 @@ public class Fields { public static final int enabledStep1Limiter_offset = 1008; public static final int useTpicAdvancedMode_offset = 1008; public static final int useLcdScreen_offset = 1008; + public static final int startConsoleInBinaryMode_offset = 1008; public static final int logicAnalyzerPins1_offset = 1012; public static final int logicAnalyzerPins2_offset = 1016; public static final int logicAnalyzerPins3_offset = 1020; @@ -735,7 +736,8 @@ public class Fields { public static final int tpsDecelEnleanmentThreshold_offset = 2232; public static final int tpsDecelEnleanmentMultiplier_offset = 2236; public static final int slowAdcAlpha_offset = 2240; - public static final int unused_offset = 2244; + public static final int debugMode_offset = 2244; + public static final int unused_offset = 2248; public static final int le_formulas1_offset = 3016; public static final int le_formulas2_offset = 3216; public static final int le_formulas3_offset = 3416; @@ -1011,6 +1013,7 @@ public class Fields { public static final Field ENABLEDSTEP1LIMITER = Field.create("ENABLEDSTEP1LIMITER", 1008, FieldType.BIT, 10); public static final Field USETPICADVANCEDMODE = Field.create("USETPICADVANCEDMODE", 1008, FieldType.BIT, 11); public static final Field USELCDSCREEN = Field.create("USELCDSCREEN", 1008, FieldType.BIT, 12); + public static final Field STARTCONSOLEINBINARYMODE = Field.create("STARTCONSOLEINBINARYMODE", 1008, FieldType.BIT, 13); public static final Field LOGICANALYZERPINS1 = Field.create("LOGICANALYZERPINS1", 1012, FieldType.INT, brain_input_pin_e); public static final Field LOGICANALYZERPINS2 = Field.create("LOGICANALYZERPINS2", 1016, FieldType.INT, brain_input_pin_e); public static final Field LOGICANALYZERPINS3 = Field.create("LOGICANALYZERPINS3", 1020, FieldType.INT, brain_input_pin_e); @@ -1260,6 +1263,8 @@ public class Fields { public static final Field TPSDECELENLEANMENTTHRESHOLD = Field.create("TPSDECELENLEANMENTTHRESHOLD", 2232, FieldType.FLOAT); public static final Field TPSDECELENLEANMENTMULTIPLIER = Field.create("TPSDECELENLEANMENTMULTIPLIER", 2236, FieldType.FLOAT); public static final Field SLOWADCALPHA = Field.create("SLOWADCALPHA", 2240, FieldType.FLOAT); + public static final String[] debug_mode_e = {"ALTERNATOR", "TPS_ACCEL", "mode2", "mode3"}; + public static final Field DEBUGMODE = Field.create("DEBUGMODE", 2244, FieldType.INT, debug_mode_e); public static final Field LE_FORMULAS1 = Field.create("LE_FORMULAS1", 3016, FieldType.INT); public static final Field LE_FORMULAS2 = Field.create("LE_FORMULAS2", 3216, FieldType.INT); public static final Field LE_FORMULAS3 = Field.create("LE_FORMULAS3", 3416, FieldType.INT);