From 4a1f5d74030fd14130917b40d0897fd711a36f59 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Wed, 8 Oct 2014 09:02:53 -0500 Subject: [PATCH] auto-sync --- firmware/compile.bat | 2 +- firmware/config/efifeatures.h | 2 +- firmware/console/tunerstudio/tunerstudio.cpp | 2 -- firmware/console/tunerstudio/tunerstudio_configuration.h | 5 ++++- firmware/controllers/algo/engine_configuration.h | 8 +++++++- firmware/rusefi.cpp | 2 +- firmware/svnversion.h | 4 ++-- firmware/tunerstudio/rusefi.ini | 4 ++-- firmware/util/histogram.c | 2 +- 9 files changed, 19 insertions(+), 12 deletions(-) diff --git a/firmware/compile.bat b/firmware/compile.bat index e9a5b87f7c..fff5a2835a 100644 --- a/firmware/compile.bat +++ b/firmware/compile.bat @@ -33,7 +33,7 @@ rem cd ../firmware cd build rem Generate human-readable version of the .map memory usage report -java -jar ../../java_tools/gcc_map_reader.jar > ../../firmware_binary/rusefi_ram_report.txt +java -jar ../../java_tools/gcc_map_reader.jar > ../rusefi_ram_report.txt cd .. rem file, let's program the board right away diff --git a/firmware/config/efifeatures.h b/firmware/config/efifeatures.h index feabaa84cf..225e048d3b 100644 --- a/firmware/config/efifeatures.h +++ b/firmware/config/efifeatures.h @@ -120,7 +120,7 @@ #if defined __GNUC__ #define EFI_PERF_METRICS TRUE -#define DL_OUTPUT_BUFFER 9000 +#define DL_OUTPUT_BUFFER 7000 #else #define EFI_PERF_METRICS FALSE #define DL_OUTPUT_BUFFER 9000 diff --git a/firmware/console/tunerstudio/tunerstudio.cpp b/firmware/console/tunerstudio/tunerstudio.cpp index dd2e7f4d6e..1f6bfe3522 100644 --- a/firmware/console/tunerstudio/tunerstudio.cpp +++ b/firmware/console/tunerstudio/tunerstudio.cpp @@ -53,8 +53,6 @@ static SerialConfig tsSerialConfig = { TS_SERIAL_SPEED, 0, USART_CR2_STOP1_BITS #endif /* EFI_PROD_CODE */ #define MAX_PAGE_ID 0 -#define PAGE_0_SIZE 6328 -#define TS_OUTPUT_SIZE 116 // in MS, that's 10 seconds #define TS_READ_TIMEOUT 10000 diff --git a/firmware/console/tunerstudio/tunerstudio_configuration.h b/firmware/console/tunerstudio/tunerstudio_configuration.h index 703d1a82f0..ca5e1a8000 100644 --- a/firmware/console/tunerstudio/tunerstudio_configuration.h +++ b/firmware/console/tunerstudio/tunerstudio_configuration.h @@ -14,7 +14,10 @@ /** * this is used to confirm that firmware and TunerStudio are using the same rusefi.ini version */ -#define TS_FILE_VERSION 20140920 +#define TS_FILE_VERSION 20141008 + +#define PAGE_0_SIZE 9608 +#define TS_OUTPUT_SIZE 116 #define EGT_CHANNEL_COUNT 8 diff --git a/firmware/controllers/algo/engine_configuration.h b/firmware/controllers/algo/engine_configuration.h index 9fbfeed687..a269eaddc4 100644 --- a/firmware/controllers/algo/engine_configuration.h +++ b/firmware/controllers/algo/engine_configuration.h @@ -44,6 +44,11 @@ typedef struct { #define AFR_RPM_COUNT 16 #define AFR_LOAD_COUNT 16 +#define LE_COMMAND_LENGTH 200 +#define LE_COMMAND_COUNT 16 + +typedef char le_formula_t[LE_COMMAND_LENGTH]; + #define CLT_CURVE_SIZE 16 #define IAT_CURVE_SIZE 16 #define VBAT_INJECTOR_CURVE_SIZE 8 @@ -219,6 +224,7 @@ typedef struct { int unusedbs[70]; + le_formula_t le_formulas[LE_COMMAND_COUNT]; } board_configuration_s; @@ -453,7 +459,7 @@ typedef struct { short int tpsErrorLowValue; short int tpsErrorHighValue; - int unused3[4]; + int unused3[24]; } engine_configuration_s; diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index 057f046251..46299d4a95 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -241,5 +241,5 @@ void firmwareError(const char *fmt, ...) { } int getRusEfiVersion(void) { - return 20141007; + return 20141008; } diff --git a/firmware/svnversion.h b/firmware/svnversion.h index dc2f520486..aabbc456c8 100644 --- a/firmware/svnversion.h +++ b/firmware/svnversion.h @@ -1,5 +1,5 @@ // This file was generated by Version2Header -// Tue Oct 07 11:49:40 MSK 2014 +// Wed Oct 08 16:53:59 MSK 2014 #ifndef VCS_VERSION -#define VCS_VERSION "4881" +#define VCS_VERSION "4886" #endif diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index fc7f27aa15..99dd26c918 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -13,7 +13,7 @@ enable2ndByteCanID = false endianness = little nPages = 1 - pageSize = 6328 + pageSize = 9608 pageIdentifier = "\x00\x00" pageReadCommand = "R\x00\x00%2o%2c" @@ -318,7 +318,7 @@ enable2ndByteCanID = false [OutputChannels] ; see TS_FILE_VERSION in firmware code -fileVersion = { 20140920 } +fileVersion = { 20141008 } ochGetCommand = "O" diff --git a/firmware/util/histogram.c b/firmware/util/histogram.c index d520c161d5..109e8de5ad 100644 --- a/firmware/util/histogram.c +++ b/firmware/util/histogram.c @@ -25,7 +25,7 @@ static float confidence_bounds[] = { 0.5 - H_CONFIDENCE * 0.5, 0.5, 0.5 + H_CONF /** * magic curve lookup table */ -static int64_t bounds[BOUND_LENGTH]; +static int64_t bounds[BOUND_LENGTH] CCM_OPTIONAL; /** * just an optimization - faster lookup for small values */