From 7697a8f03c0fab80f6f58d21dbe5e9f7e451aa1f Mon Sep 17 00:00:00 2001
From: rusEfi <russianefi@gmail.com>
Date: Sun, 2 Nov 2014 12:03:07 -0600
Subject: [PATCH] auto-sync

---
 firmware/config/engines/dodge_neon.cpp |  3 +++
 firmware/controllers/flash_main.cpp    |  8 +++++++-
 firmware/controllers/flash_main.h      | 13 +++----------
 firmware/hw_layer/hardware.cpp         |  2 +-
 firmware/hw_layer/io_pins.c            |  1 -
 firmware/rusefi.cpp                    |  2 +-
 6 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/firmware/config/engines/dodge_neon.cpp b/firmware/config/engines/dodge_neon.cpp
index fbc3ad5341..0505371ce0 100644
--- a/firmware/config/engines/dodge_neon.cpp
+++ b/firmware/config/engines/dodge_neon.cpp
@@ -201,6 +201,9 @@ void setDodgeNeonNGCEngineConfiguration(engine_configuration_s *engineConfigurat
 	setThermistorConfiguration(&engineConfiguration->cltThermistorConf, 0, 32500, 30, 7550, 100, 700);
 	engineConfiguration->cltThermistorConf.bias_resistor = 10000;
 
+	setThermistorConfiguration(&engineConfiguration->iatThermistorConf, 0, 32500, 30, 7550, 100, 700);
+	engineConfiguration->iatThermistorConf.bias_resistor = 10000;
+
 	/**
 	 * MAP D17/W5
 	 */
diff --git a/firmware/controllers/flash_main.cpp b/firmware/controllers/flash_main.cpp
index 8b7371e330..3c4cd35173 100644
--- a/firmware/controllers/flash_main.cpp
+++ b/firmware/controllers/flash_main.cpp
@@ -117,10 +117,16 @@ void readFromFlash(void) {
 	engineConfiguration->firmwareVersion = getRusEfiVersion();
 }
 
-void initFlash(void) {
+static void rewriteConfig(Engine *engine) {
+	doResetConfiguration();
+	writeToFlash();
+}
+
+void initFlash(Engine *engine) {
 	initLogging(&logger, "Flash memory");
 
 	addConsoleAction("readconfig", readFromFlash);
 	addConsoleAction("writeconfig", writeToFlash);
 	addConsoleAction("resetconfig", doResetConfiguration);
+	addConsoleActionP("rewriteconfig", (VoidPtr)rewriteConfig, engine);
 }
diff --git a/firmware/controllers/flash_main.h b/firmware/controllers/flash_main.h
index bff5085100..f0b5ed6ec0 100644
--- a/firmware/controllers/flash_main.h
+++ b/firmware/controllers/flash_main.h
@@ -10,16 +10,13 @@
 #define FLASH_MAIN_H_
 
 #include "engine_configuration.h"
+#include "engine.h"
 
 #define FLASH_DATA_VERSION 5014
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
 void readFromFlash(void);
-void initFlash(void);
+void initFlash(Engine *engine);
+
 /**
  * Because of hardware-related issues, stm32f4 chip is totally
  * frozen while we are writing to internal flash. Writing the configuration takes
@@ -34,8 +31,4 @@ void setNeedToWriteConfiguration(void);
 bool getNeedToWriteConfiguration(void);
 void writeToFlashIfPending(void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #endif /* FLASH_MAIN_H_ */
diff --git a/firmware/hw_layer/hardware.cpp b/firmware/hw_layer/hardware.cpp
index 7ce49c69b6..8dbd1ffa0e 100644
--- a/firmware/hw_layer/hardware.cpp
+++ b/firmware/hw_layer/hardware.cpp
@@ -173,7 +173,7 @@ void initHardware(Logging *logger, Engine *engine) {
 
 	palSetPadMode(CONFIG_RESET_SWITCH_PORT, CONFIG_RESET_SWITCH_PIN, PAL_MODE_INPUT_PULLUP);
 
-	initFlash();
+	initFlash(engine);
 	/**
 	 * this call reads configuration from flash memory or sets default configuration
 	 * if flash state does not look right.
diff --git a/firmware/hw_layer/io_pins.c b/firmware/hw_layer/io_pins.c
index 3bf3f279f3..06b6edb344 100644
--- a/firmware/hw_layer/io_pins.c
+++ b/firmware/hw_layer/io_pins.c
@@ -15,7 +15,6 @@
 #include "status_loop.h"
 #include "engine_configuration.h"
 #include "console_io.h"
-#include "flash_main.h"
 
 #if EFI_ENGINE_CONTROL
 #include "main_trigger_callback.h"
diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp
index 680e66ca96..2b880ca7f6 100644
--- a/firmware/rusefi.cpp
+++ b/firmware/rusefi.cpp
@@ -249,5 +249,5 @@ void firmwareError(const char *fmt, ...) {
 }
 
 int getRusEfiVersion(void) {
-	return 20141101;
+	return 20141102;
 }