From 45901c919e65370e208b3abf8f089bbeca53c541 Mon Sep 17 00:00:00 2001
From: rusEfi <russianefi@gmail.com>
Date: Mon, 12 Jan 2015 07:04:11 -0600
Subject: [PATCH] auto-sync

---
 firmware/console/console_io.c                            | 4 ++--
 firmware/console/tunerstudio/tunerstudio_configuration.h | 4 ++--
 firmware/controllers/algo/engine_configuration.cpp       | 1 +
 firmware/controllers/algo/engine_configuration.h         | 8 +++++++-
 firmware/rusefi.cpp                                      | 6 +++---
 firmware/tunerstudio/rusefi.ini                          | 4 ++--
 6 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/firmware/console/console_io.c b/firmware/console/console_io.c
index 03c5b63ffa..192c3e49f9 100644
--- a/firmware/console/console_io.c
+++ b/firmware/console/console_io.c
@@ -120,7 +120,7 @@ bool isSerialOverUart(void) {
 	return is_serial_over_uart;
 }
 
-#if defined(EFI_CONSOLE_UART_DEVICE) || defined(__DOXYGEN__)
+#if (defined(EFI_CONSOLE_UART_DEVICE) && ! EFI_SIMULATOR ) || defined(__DOXYGEN__)
 static SerialConfig serialConfig = { SERIAL_SPEED, 0, USART_CR2_STOP1_BITS | USART_CR2_LINEN, 0 };
 #endif
 
@@ -197,7 +197,7 @@ void consoleOutputBuffer(const uint8_t *buf, int size) {
 void startConsole(void (*console_line_callback_p)(char *)) {
 	console_line_callback = console_line_callback_p;
 
-#if defined(EFI_CONSOLE_UART_DEVICE) || defined(__DOXYGEN__)
+#if (defined(EFI_CONSOLE_UART_DEVICE) && ! EFI_SIMULATOR) || defined(__DOXYGEN__)
 
 	palSetPadMode(CONSOLE_MODE_SWITCH_PORT, CONSOLE_MODE_SWITCH_PIN, PAL_MODE_INPUT_PULLUP);
 
diff --git a/firmware/console/tunerstudio/tunerstudio_configuration.h b/firmware/console/tunerstudio/tunerstudio_configuration.h
index 22692a601e..de488e1f1f 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 20141225
+#define TS_FILE_VERSION 20150112
 
-#define PAGE_0_SIZE 10008
+#define PAGE_0_SIZE 11832
 #define TS_OUTPUT_SIZE 116
 
 #define EGT_CHANNEL_COUNT 8
diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp
index b7b64ec127..df851bd118 100644
--- a/firmware/controllers/algo/engine_configuration.cpp
+++ b/firmware/controllers/algo/engine_configuration.cpp
@@ -184,6 +184,7 @@ void setDefaultConfiguration(engine_configuration_s *engineConfiguration, board_
 	setWholeFuelMap(engineConfiguration, 3);
 	setWholeVEMap(engineConfiguration, 0.8);
 	setMap(engineConfiguration->afrTable, 14.7);
+	setMap(engineConfiguration->injectionPhase, 0);
 
 	setThermistorConfiguration(&engineConfiguration->cltThermistorConf, 0, 9500, 23.8889, 2100, 48.8889, 1000);
 	engineConfiguration->cltThermistorConf.bias_resistor = 1500;
diff --git a/firmware/controllers/algo/engine_configuration.h b/firmware/controllers/algo/engine_configuration.h
index 278c12e9c6..6d468e0bac 100644
--- a/firmware/controllers/algo/engine_configuration.h
+++ b/firmware/controllers/algo/engine_configuration.h
@@ -608,7 +608,13 @@ typedef struct {
 	 */
 	brain_pin_e clutchUpPin;
 	pin_input_mode_e clutchUpPinMode;
-	int unused3[82];
+	int unused3[182];
+
+	le_formula_t timingMultiplier;
+	le_formula_t timingAdditive;
+
+	fuel_table_t injectionPhase;
+
 
 } engine_configuration_s;
 
diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp
index c3be6b35fd..76219813dc 100644
--- a/firmware/rusefi.cpp
+++ b/firmware/rusefi.cpp
@@ -259,14 +259,14 @@ void firmwareError(const char *fmt, ...) {
 	}
 }
 
-static char UNUSED_RAM_SIZE[5000];
+static char UNUSED_RAM_SIZE[4000];
 
-static char UNUSED_CCM_SIZE[9000] CCM_OPTIONAL;
+static char UNUSED_CCM_SIZE[8000] CCM_OPTIONAL;
 
 int getRusEfiVersion(void) {
 	if (UNUSED_RAM_SIZE == 0)
 		return 1; // this is here to make the compiler happy about the unused array
 	if (UNUSED_CCM_SIZE == 0)
 		return 1; // this is here to make the compiler happy about the unused array
-	return 20150111;
+	return 20150112;
 }
diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini
index 7240203c2a..2014b0cb06 100644
--- a/firmware/tunerstudio/rusefi.ini
+++ b/firmware/tunerstudio/rusefi.ini
@@ -13,7 +13,7 @@ enable2ndByteCanID = false
 
    endianness          = little
    nPages              = 1
-   pageSize            = 10008
+   pageSize            = 11832
 
    pageIdentifier      = "\x00\x00"
    pageReadCommand     = "R\x00\x00%2o%2c"
@@ -404,7 +404,7 @@ enable2ndByteCanID = false
 [OutputChannels]
 
 ; see TS_FILE_VERSION in firmware code
-fileVersion = { 20141225 }
+fileVersion = { 20150112 }
 
    ochGetCommand    = "O"