From fd9e3a1f5c792893201cb50e2ce9e8e949e4e477 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sat, 9 May 2020 00:43:28 -0400 Subject: [PATCH] placing parts of confusion closer together --- .../boards/kinetis/config/controllers/algo/rusefi_generated.h | 2 ++ firmware/controllers/flash_main.cpp | 3 --- firmware/controllers/generated/rusefi_generated.h | 1 + .../models/src/com/rusefi/config/generated/Fields.java | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index 93f57d6935..e831e4c5d2 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -675,6 +675,8 @@ #define fixedModeTiming_offset_hex 1c4 #define fixedTiming_offset 2204 #define fixedTiming_offset_hex 89c +#define FLASH_DATA_VERSION 10001 +#define FLASH_SUCCESS_MSG "FLASH_SUCESS" #define frequencyReportingMapInputPin_offset 970 #define frequencyReportingMapInputPin_offset_hex 3ca #define FSIO_ANALOG_INPUT_COUNT 4 diff --git a/firmware/controllers/flash_main.cpp b/firmware/controllers/flash_main.cpp index 9de0cface6..ce6510416f 100644 --- a/firmware/controllers/flash_main.cpp +++ b/firmware/controllers/flash_main.cpp @@ -16,9 +16,6 @@ #include "flash_int.h" #include "engine_math.h" -// this message is part of console API, see FLASH_SUCCESS_MSG in java code -#define FLASH_SUCCESS_MSG "FLASH_SUCESS" - #if EFI_TUNER_STUDIO #include "tunerstudio.h" #endif diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 96ceae8d50..1a681eae0d 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -675,6 +675,7 @@ #define fixedModeTiming_offset_hex 1c4 #define fixedTiming_offset 2204 #define fixedTiming_offset_hex 89c +#define FLASH_DATA_VERSION 10001 #define frequencyReportingMapInputPin_offset 970 #define frequencyReportingMapInputPin_offset_hex 3ca #define FSIO_ANALOG_INPUT_COUNT 4 diff --git a/java_console/models/src/com/rusefi/config/generated/Fields.java b/java_console/models/src/com/rusefi/config/generated/Fields.java index 66a1cb53bd..b1c2d359d3 100644 --- a/java_console/models/src/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Fri May 08 22:09:51 EDT 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sat May 09 00:42:22 EDT 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -445,6 +445,7 @@ public class Fields { public static final int firingOrder_offset_hex = 194; public static final int fixedModeTiming_offset = 452; public static final int fixedTiming_offset = 2204; + public static final int FLASH_DATA_VERSION = 10001; public static final int frequencyReportingMapInputPin_offset = 970; public static final int FSIO_ANALOG_INPUT_COUNT = 4; public static final int FSIO_COMMAND_COUNT = 16;