From b46e15a61a85989d619850bde3b65ed5872e8cf6 Mon Sep 17 00:00:00 2001
From: rusEfi <russianefi@gmail.com>
Date: Thu, 23 Apr 2015 19:04:51 -0400
Subject: [PATCH] auto-sync

---
 firmware/console/binary/tunerstudio_configuration.h |  4 ++--
 firmware/console/status_loop.cpp                    |  2 ++
 firmware/controllers/algo/accel_enrichment.cpp      |  9 ++++++---
 firmware/controllers/algo/accel_enrichment.h        |  3 +--
 firmware/tunerstudio/rusefi.ini                     | 10 ++++++----
 5 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/firmware/console/binary/tunerstudio_configuration.h b/firmware/console/binary/tunerstudio_configuration.h
index 309076de0c..bf19a2ef51 100644
--- a/firmware/console/binary/tunerstudio_configuration.h
+++ b/firmware/console/binary/tunerstudio_configuration.h
@@ -90,8 +90,8 @@ typedef struct {
 	float rpmAcceleration;
 	float massAirFlowValue;
 	float veValue;
-	float maxDelta;
-	float minDelta;
+	float deltaTps;
+	float unused120;
 	float currentMapAccelDelta;
 	float tpsAccelFuel;
 	int unused3[16];
diff --git a/firmware/console/status_loop.cpp b/firmware/console/status_loop.cpp
index 7fa0e764d8..3b02c7221b 100644
--- a/firmware/console/status_loop.cpp
+++ b/firmware/console/status_loop.cpp
@@ -562,6 +562,8 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_
 	tsOutputChannels->rpmAcceleration = engine->rpmCalculator.getRpmAcceleration();
 	tsOutputChannels->currentMapAccelDelta = engine->mapAccelEnrichment.getMapEnrichment(PASS_ENGINE_PARAMETER_F) * 100 / getMap();
 	tsOutputChannels->tpsAccelFuel = engine->tpsAccelEnrichment.getTpsEnrichment(PASS_ENGINE_PARAMETER_F);
+	tsOutputChannels->deltaTps = engine->tpsAccelEnrichment.getDelta();
+
 
 	tsOutputChannels->checkEngine = hasErrorCodes();
 #if EFI_PROD_CODE || defined(__DOXYGEN__)
diff --git a/firmware/controllers/algo/accel_enrichment.cpp b/firmware/controllers/algo/accel_enrichment.cpp
index f0dae0a466..2e081f5ec1 100644
--- a/firmware/controllers/algo/accel_enrichment.cpp
+++ b/firmware/controllers/algo/accel_enrichment.cpp
@@ -37,17 +37,20 @@ void AccelEnrichmemnt::updateDiffEnrichment(engine_configuration_s *engineConfig
 //	return diffEnrichment;
 //}
 
+float AccelEnrichmemnt::getDelta() {
+	return cb.maxValue(cb.getSize());
+}
+
 floatms_t AccelEnrichmemnt::getTpsEnrichment(DECLARE_ENGINE_PARAMETER_F) {
-	float d = cb.maxValue(cb.getSize());
+	float d = getDelta();
 	if (d > engineConfiguration->tpsAccelEnrichmentThreshold) {
 		return d * engineConfiguration->tpsAccelEnrichmentMultiplier;
 	}
 	return 0;
-
 }
 
 float AccelEnrichmemnt::getMapEnrichment(DECLARE_ENGINE_PARAMETER_F) {
-	float d = cb.maxValue(cb.getSize());
+	float d = getDelta();
 	if (d > engineConfiguration->mapAccelEnrichmentThreshold) {
 		return d * engineConfiguration->mapAccelEnrichmentMultiplier;
 	}
diff --git a/firmware/controllers/algo/accel_enrichment.h b/firmware/controllers/algo/accel_enrichment.h
index 4f1e74ad31..28a88ef36d 100644
--- a/firmware/controllers/algo/accel_enrichment.h
+++ b/firmware/controllers/algo/accel_enrichment.h
@@ -22,12 +22,11 @@ public:
 			float engineLoad);
 	float getMapEnrichment(DECLARE_ENGINE_PARAMETER_F);
 	floatms_t getTpsEnrichment(DECLARE_ENGINE_PARAMETER_F);
+	float getDelta();
 
 	void onEngineCycle(DECLARE_ENGINE_PARAMETER_F);
 	void onEngineCycleTps(DECLARE_ENGINE_PARAMETER_F);
 	void reset();
-	float maxDelta;
-	float minDelta;
 	float delta;
 	cyclic_buffer<float> cb;
 
diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini
index 75a07de1db..48b74607a5 100644
--- a/firmware/tunerstudio/rusefi.ini
+++ b/firmware/tunerstudio/rusefi.ini
@@ -627,8 +627,8 @@ fileVersion = { 20150406 }
       rpmAcceleration = scalar,  F32,    104, "dRpm",         1,         0
       massAirFlowValue= scalar,  F32,    108, "Kg/h",         1,         0
       veValue         = scalar,  F32,    112, "ratio",        1,         0
-      maxDelta        = scalar,  F32,    116, "ratio",        1,         0
-      minDelta        = scalar,  F32,    120, "ratio",        1,         0
+      deltaTps        = scalar,  F32,    116, "ratio",        1,         0
+      unused120        = scalar,  F32,    120, "ratio",        1,         0
       currentMapAccelDelta = scalar,F32, 124, "%",            1,         0
       currentTpsAccel = scalar,  F32,    128, "ms",            1,         0
       egoCorrection   = { 0 }
@@ -814,8 +814,8 @@ fileVersion = { 20150406 }
    rpmAccelerationGa = rpmAcceleration,     "rpm d",        "dRpm",        0,      3,       0,      1,       3,     4,   1,   1
    massAirFlowValueGa = massAirFlowValue,"Air Flow",       "kg/hr",        0,     50,    -999,   -999,     999,   999,   1,   1
    veValueGauge      = veValue,                 "%",            "",        0,    120,      10,     10,     100,   100,   1,   1
-   maxDeltaGauge     = maxDelta,                "%",            "",        0,    120,      10,     10,     100,   100,   1,   1
-   minDeltaGauge     = minDelta,                "%",            "",        0,    120,      10,     10,     100,   100,   1,   1
+   deltaTpsGauge     = deltaTps,                "%",            "",        0,    120,      10,     10,     100,   100,   1,   1
+;   minDeltaGauge     = minDelta,                "%",            "",        0,    120,      10,     10,     100,   100,   1,   1
    currentMapAccelDeltaGauge = currentMapAccelDelta,"MAP enrich", "%",     0,    120,      10,     10,     100,   100,   1,   1
    currentTpsAccelGauge = currentTpsAccel,"TPS enrich",       "ms",      0,    120,      10,     10,     100,   100,   1,   1
    
@@ -1259,6 +1259,8 @@ fileVersion = { 20150406 }
 		field = "tunerStudioSerialSpeed", tunerStudioSerialSpeed
 		field = "Use PC10/PC11 serial?", useSerialPort		
 		field = "RPM Hard Limit",         	    		rpmHardLimit
+		field = "cut fuel on hard limit",				cutFuelOnHardLimit
+		field = "cut spark on hard limit",				cutSparkOnHardLimit
 		field = ""
 		field = "Fuel Algorithm",						algorithm
 		field = ""