From dd52c4365ea7571e2373ef055edc8cbe368f296c Mon Sep 17 00:00:00 2001 From: rusEfi Date: Sun, 25 Dec 2016 11:02:42 -0500 Subject: [PATCH] auto-sync --- .../algo/engine_configuration_generated_structures.h | 6 +++--- firmware/controllers/algo/rusefi_generated.h | 4 ++-- firmware/controllers/flash_main.cpp | 2 +- firmware/integration/rusefi_config.txt | 2 +- java_console/models/src/com/rusefi/config/Fields.java | 8 ++++---- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index 74b2b4338a..5372aa0850 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 Dec 22 13:03:39 EST 2016 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Dec 25 10:23:53 EST 2016 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -1108,7 +1108,7 @@ typedef struct { /** * offset 512 */ - int firmwareVersion; + int byFirmwareVersion; /** * offset 516 */ @@ -2006,4 +2006,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Dec 22 13:03:39 EST 2016 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Dec 25 10:23:53 EST 2016 diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index 2606acfd39..7634a9cde2 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -213,8 +213,8 @@ #define operationMode_offset 500 #define displayMode_offset 504 #define logFormat_offset 508 -#define firmwareVersion_offset 512 -#define firmwareVersion_offset_hex 200 +#define byFirmwareVersion_offset 512 +#define byFirmwareVersion_offset_hex 200 #define HD44780width_offset 516 #define HD44780width_offset_hex 204 #define HD44780height_offset 520 diff --git a/firmware/controllers/flash_main.cpp b/firmware/controllers/flash_main.cpp index 71f9dc4590..dc6998d94b 100644 --- a/firmware/controllers/flash_main.cpp +++ b/firmware/controllers/flash_main.cpp @@ -123,7 +123,7 @@ persisted_configuration_state_e readConfiguration(Logging * logger) { applyNonPersistentConfiguration(logger PASS_ENGINE_PARAMETER); } // we can only change the state after the CRC check - engineConfiguration->firmwareVersion = getRusEfiVersion(); + engineConfiguration->byFirmwareVersion = getRusEfiVersion(); return result; } diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 3e114c6871..174dd5f203 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -321,7 +321,7 @@ display_mode_e displayMode; custom log_format_e 4 bits, U32, @OFFSET@, [0:0], "native", "Mega Log Viewer" log_format_e logFormat; - int firmwareVersion;;"index", 1, 0, 0, 300, 0 + int byFirmwareVersion;;"index", 1, 0, 0, 300, 0 int HD44780width;;"index", 1, 0, 0, 300, 0 int HD44780height;;"index", 1, 0, 0, 300, 0 diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java index 77528a64e4..1041c5197d 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 Wed Dec 21 11:35:20 EST 2016 +// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Dec 25 10:37:45 EST 2016 public class Fields { public static final int LE_COMMAND_LENGTH = 200; public static final int FSIO_ADC_COUNT = 4; @@ -217,8 +217,8 @@ public class Fields { public static final int operationMode_offset = 500; public static final int displayMode_offset = 504; public static final int logFormat_offset = 508; - public static final int firmwareVersion_offset = 512; - public static final int firmwareVersion_offset_hex = 200; + public static final int byFirmwareVersion_offset = 512; + public static final int byFirmwareVersion_offset_hex = 200; public static final int HD44780width_offset = 516; public static final int HD44780width_offset_hex = 204; public static final int HD44780height_offset = 520; @@ -1095,7 +1095,7 @@ public class Fields { public static final Field OPERATIONMODE = Field.create("OPERATIONMODE", 500, FieldType.INT); public static final Field DISPLAYMODE = Field.create("DISPLAYMODE", 504, FieldType.INT); public static final Field LOGFORMAT = Field.create("LOGFORMAT", 508, FieldType.INT); - public static final Field FIRMWAREVERSION = Field.create("FIRMWAREVERSION", 512, FieldType.INT); + public static final Field BYFIRMWAREVERSION = Field.create("BYFIRMWAREVERSION", 512, FieldType.INT); public static final Field HD44780WIDTH = Field.create("HD44780WIDTH", 516, FieldType.INT); public static final Field HD44780HEIGHT = Field.create("HD44780HEIGHT", 520, FieldType.INT); public static final Field TPSADCCHANNEL = Field.create("TPSADCCHANNEL", 524, FieldType.INT, adc_channel_e);