From ab7fe5cefa3db6a0452c81f1476096036aa4f6fc Mon Sep 17 00:00:00 2001
From: rusEfi <russianefi@gmail.com>
Date: Thu, 9 Jun 2016 11:02:31 -0400
Subject: [PATCH] auto-sync

---
 firmware/console/status_loop.cpp            | 5 +++++
 firmware/controllers/algo/engine.cpp        | 2 +-
 firmware/controllers/algo/engine.h          | 2 +-
 firmware/controllers/math/speed_density.cpp | 4 ++--
 firmware/controllers/math/speed_density.h   | 2 +-
 firmware/rusefi.cpp                         | 2 +-
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/firmware/console/status_loop.cpp b/firmware/console/status_loop.cpp
index 041787fab9..7b7b36ad8e 100644
--- a/firmware/console/status_loop.cpp
+++ b/firmware/console/status_loop.cpp
@@ -181,6 +181,8 @@ static void printSensors(Logging *log, bool fileFormat) {
 	if (engineConfiguration->hasAfrSensor) {
 		reportSensorF(log, fileFormat, "afr", "AFR", getAfr(PASS_ENGINE_PARAMETER_F), 2);
 	}
+	reportSensorF(log, fileFormat, "target", "AFR", engine->engineState.targetAFR, 2);
+
 #endif
 
 #if EFI_VEHICLE_SPEED || defined(__DOXYGEN__)
@@ -204,6 +206,9 @@ static void printSensors(Logging *log, bool fileFormat) {
 		reportSensorF(log, fileFormat, "tpsacc", "ms", engine->tpsAccelEnrichment.getTpsEnrichment(PASS_ENGINE_PARAMETER_F), 2);
 		reportSensorF(log, fileFormat, "advance", "deg", engine->engineState.timingAdvance, 2);
 		reportSensorF(log, fileFormat, "duty", "%", getInjectorDutyCycle(rpm PASS_ENGINE_PARAMETER), 2);
+
+
+		reportSensorF(log, fileFormat, "tCharge", "K", engine->engineState.tChargeK, 2);
 	}
 
 	if (engineConfiguration->hasCltSensor) {
diff --git a/firmware/controllers/algo/engine.cpp b/firmware/controllers/algo/engine.cpp
index 1a2d6ec3ce..d68451eb7f 100644
--- a/firmware/controllers/algo/engine.cpp
+++ b/firmware/controllers/algo/engine.cpp
@@ -188,7 +188,7 @@ void EngineState::periodicFastCallback(DECLARE_ENGINE_PARAMETER_F) {
 		 * *0.01 because of https://sourceforge.net/p/rusefi/tickets/153/
 		 */
 		currentVE = baroCorrection * veMap.getValue(rpm, map) * 0.01;
-		targerAFR = afrMap.getValue(rpm, map);
+		targetAFR = afrMap.getValue(rpm, map);
 	} else {
 		baseTableFuel = getBaseTableFuel(engineConfiguration, rpm, engineLoad);
 	}
diff --git a/firmware/controllers/algo/engine.h b/firmware/controllers/algo/engine.h
index 768dc0f3e7..45208c2ae7 100644
--- a/firmware/controllers/algo/engine.h
+++ b/firmware/controllers/algo/engine.h
@@ -162,7 +162,7 @@ public:
 	// speed density
 	float tChargeK;
 	float currentVE;
-	float targerAFR;
+	float targetAFR;
 
 	/**
 	 * pre-calculated value from simple fuel lookup
diff --git a/firmware/controllers/math/speed_density.cpp b/firmware/controllers/math/speed_density.cpp
index f8eb1f7878..6d377e941a 100644
--- a/firmware/controllers/math/speed_density.cpp
+++ b/firmware/controllers/math/speed_density.cpp
@@ -78,7 +78,7 @@ EXTERN_ENGINE;
 /**
  * @return per cylinder injection time, in Milliseconds
  */
-float getSpeedDensityFuel(int rpm DECLARE_ENGINE_PARAMETER_S) {
+floatms_t getSpeedDensityFuel(int rpm DECLARE_ENGINE_PARAMETER_S) {
 	//int rpm = engine->rpmCalculator->rpm();
 
 	/**
@@ -91,7 +91,7 @@ float getSpeedDensityFuel(int rpm DECLARE_ENGINE_PARAMETER_S) {
 
 	engine->engineState.airMass = getAirMass(engineConfiguration, ENGINE(engineState.currentVE), adjustedMap, tChargeK);
 
-	return sdMath(engineConfiguration, engine->engineState.airMass, ENGINE(engineState.targerAFR)) * 1000;
+	return sdMath(engineConfiguration, engine->engineState.airMass, ENGINE(engineState.targetAFR)) * 1000;
 }
 
 static const baro_corr_table_t default_baro_corr = {
diff --git a/firmware/controllers/math/speed_density.h b/firmware/controllers/math/speed_density.h
index ecfa12f99a..82dc033c9e 100644
--- a/firmware/controllers/math/speed_density.h
+++ b/firmware/controllers/math/speed_density.h
@@ -20,6 +20,6 @@ float sdMath(engine_configuration_s *engineConfiguration, float airMass, float A
 
 void setDefaultVETable(DECLARE_ENGINE_PARAMETER_F);
 void initSpeedDensity(DECLARE_ENGINE_PARAMETER_F);
-float getSpeedDensityFuel(int rpm DECLARE_ENGINE_PARAMETER_S);
+floatms_t getSpeedDensityFuel(int rpm DECLARE_ENGINE_PARAMETER_S);
 
 #endif /* SPEED_DENSITY_H_ */
diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp
index b2634e0b04..218f55b0b3 100644
--- a/firmware/rusefi.cpp
+++ b/firmware/rusefi.cpp
@@ -298,5 +298,5 @@ int getRusEfiVersion(void) {
 		return 123; // this is here to make the compiler happy about the unused array
 	if (UNUSED_CCM_SIZE[0] * 0 != 0)
 		return 3211; // this is here to make the compiler happy about the unused array
-	return 20160601;
+	return 20160609;
 }