From 1140ee7cb25a8330c7c88e288b000e5b53ab11b6 Mon Sep 17 00:00:00 2001
From: rusEfi <russianefi@gmail.com>
Date: Mon, 3 Nov 2014 07:03:17 -0600
Subject: [PATCH] auto-sync

---
 firmware/config/efifeatures.h                          |  4 ++--
 .../console/tunerstudio/tunerstudio_configuration.h    |  4 ++--
 firmware/controllers/algo/engine_configuration.h       | 10 +++++++++-
 firmware/controllers/flash_main.h                      |  2 +-
 firmware/controllers/ignition_central.c                |  3 ---
 firmware/rusefi.cpp                                    |  2 +-
 firmware/tunerstudio/rusefi.ini                        |  4 ++--
 7 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/firmware/config/efifeatures.h b/firmware/config/efifeatures.h
index 225e048d3b..0aedf24a15 100644
--- a/firmware/config/efifeatures.h
+++ b/firmware/config/efifeatures.h
@@ -120,10 +120,10 @@
 
 #if defined __GNUC__
 #define EFI_PERF_METRICS TRUE
-#define DL_OUTPUT_BUFFER 7000
+#define DL_OUTPUT_BUFFER 6500
 #else
 #define EFI_PERF_METRICS FALSE
-#define DL_OUTPUT_BUFFER 9000
+#define DL_OUTPUT_BUFFER 8000
 #endif
 
 /**
diff --git a/firmware/console/tunerstudio/tunerstudio_configuration.h b/firmware/console/tunerstudio/tunerstudio_configuration.h
index 1981b34c57..922753ac17 100644
--- a/firmware/console/tunerstudio/tunerstudio_configuration.h
+++ b/firmware/console/tunerstudio/tunerstudio_configuration.h
@@ -14,9 +14,9 @@
 /**
  * this is used to confirm that firmware and TunerStudio are using the same rusefi.ini version
  */
-#define TS_FILE_VERSION 20141008
+#define TS_FILE_VERSION 20141103
 
-#define PAGE_0_SIZE 9608
+#define PAGE_0_SIZE 10008
 #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 8543a7e220..26d7e24d3c 100644
--- a/firmware/controllers/algo/engine_configuration.h
+++ b/firmware/controllers/algo/engine_configuration.h
@@ -101,6 +101,8 @@ typedef struct {
 
 #define DWELL_COUNT 8
 
+#define CRANKING_CURVE_SIZE 8
+
 /**
  * @brief Trigger wheel(s) configuration
  */
@@ -472,7 +474,13 @@ typedef struct {
 
 	float primingSquirtDurationMs;
 
-	int unused3[23];
+	float crankingFuelCoef[CRANKING_CURVE_SIZE];
+	float crankingFuelBins[CRANKING_CURVE_SIZE];
+
+	float crankingCycleCoef[CRANKING_CURVE_SIZE];
+	float crankingCycleBins[CRANKING_CURVE_SIZE];
+
+	int unused3[91];
 
 } engine_configuration_s;
 
diff --git a/firmware/controllers/flash_main.h b/firmware/controllers/flash_main.h
index f0b5ed6ec0..e8a4279ce8 100644
--- a/firmware/controllers/flash_main.h
+++ b/firmware/controllers/flash_main.h
@@ -12,7 +12,7 @@
 #include "engine_configuration.h"
 #include "engine.h"
 
-#define FLASH_DATA_VERSION 5014
+#define FLASH_DATA_VERSION 5056
 
 void readFromFlash(void);
 void initFlash(Engine *engine);
diff --git a/firmware/controllers/ignition_central.c b/firmware/controllers/ignition_central.c
index 3b5f26ff9c..995ee07d58 100644
--- a/firmware/controllers/ignition_central.c
+++ b/firmware/controllers/ignition_central.c
@@ -26,13 +26,10 @@
 #include "main_trigger_callback.h"
 #include "engine_configuration.h"
 
-static Logging logger;
-
 extern engine_configuration_s *engineConfiguration;
 extern board_configuration_s *boardConfiguration;
 
 void initIgnitionCentral(void) {
-	initLogging(&logger, "IgnitionCentral");
 
 	for (int i = 0; i < engineConfiguration->cylindersCount; i++) {
 		io_pin_e pin = (io_pin_e)((int)SPARKOUT_1_OUTPUT + i);
diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp
index 2b880ca7f6..7dc3ed5e35 100644
--- a/firmware/rusefi.cpp
+++ b/firmware/rusefi.cpp
@@ -249,5 +249,5 @@ void firmwareError(const char *fmt, ...) {
 }
 
 int getRusEfiVersion(void) {
-	return 20141102;
+	return 20141103;
 }
diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini
index 94da6284a4..1753f5b201 100644
--- a/firmware/tunerstudio/rusefi.ini
+++ b/firmware/tunerstudio/rusefi.ini
@@ -13,7 +13,7 @@ enable2ndByteCanID = false
 
    endianness          = little
    nPages              = 1
-   pageSize            = 9608
+   pageSize            = 10008
 
    pageIdentifier      = "\x00\x00"
    pageReadCommand     = "R\x00\x00%2o%2c"
@@ -318,7 +318,7 @@ enable2ndByteCanID = false
 [OutputChannels]
 
 ; see TS_FILE_VERSION in firmware code
-fileVersion = { 20141008 }
+fileVersion = { 20141103 }
 
    ochGetCommand    = "O"