auto-sync

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

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

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

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
 

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;
 

firmware/rusefi.cpp

@@ -241,5 +241,5 @@ void firmwareError(const char *fmt, ...) {
 }
 
 int getRusEfiVersion(void) {
-	return 20141007;
+	return 20141008;
 }

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

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"
 

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
  */