diff --git a/firmware/console/status_loop.cpp b/firmware/console/status_loop.cpp index 7e274a4a6c..f1fdc13463 100644 --- a/firmware/console/status_loop.cpp +++ b/firmware/console/status_loop.cpp @@ -554,6 +554,7 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_ tsOutputChannels->rpmAcceleration = engine->rpmCalculator.getRpmAcceleration(); tsOutputChannels->maxDelta = engine->accelEnrichment.maxDelta; tsOutputChannels->minDelta = engine->accelEnrichment.minDelta; + tsOutputChannels->currentAccelDelta = engine->accelEnrichment.getEnrichment(PASS_ENGINE_PARAMETER_F) * 100 / getMap(); tsOutputChannels->checkEngine = hasErrorCodes(); #if EFI_PROD_CODE || defined(__DOXYGEN__) diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 228643e5e3..4dc6fb308b 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -480,8 +480,8 @@ custom pin_input_mode_e 4 scalar, F32, @OFFSET@, "ms", 1, 0, 0, 200, 1 int accelLength;;"len", 1, 0, 0, 200, 3 - float deaccelEnrichmentThreshold;;"roc", 1, 0, 0, 200, 3 - float deaccelEnrichmentMultiplier;;"coeff", 1, 0, 0, 200, 3 + float decelEnrichmentThreshold;;"roc", 1, 0, 0, 200, 3 + float decelEnrichmentMultiplier;;"coeff", 1, 0, 0, 200, 3 float accelEnrichmentThreshold;;"roc", 1, 0, 0, 200, 3 float accelEnrichmentMultiplier;;"coeff", 1, 0, 0, 200, 3 diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index b1cf8c75fe..c473fcc79d 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -276,5 +276,5 @@ int getRusEfiVersion(void) { return 1; // this is here to make the compiler happy about the unused array if (UNUSED_CCM_SIZE[0] == 0) return 1; // this is here to make the compiler happy about the unused array - return 20150326; + return 20150328; } diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 693f371ce8..637e83b9d6 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -41,7 +41,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated by ConfigDefinition.jar on Fri Mar 27 21:40:54 EDT 2015 +; this section was generated by ConfigDefinition.jar on Sat Mar 28 17:28:29 EDT 2015 page = 1 engineType = bits, S32, 0, [0:2], "AUDI_AAN", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "FORD_FIESTA", "NISSAN_PRIMERA", "HONDA_ACCORD", "FORD_INLINE_6_1995", "GY6_139QMB" @@ -470,8 +470,8 @@ page = 1 ;skipping alternatorControlDFactor offset 5216 ;skipping unused3 offset 5220 accelLength = scalar, S32, 5780, "len", 1, 0, 0, 200, 3 - deaccelEnrichmentThreshold = scalar, F32, 5784, "roc", 1, 0, 0, 200, 3 - deaccelEnrichmentMultiplier = scalar, F32, 5788, "coeff", 1, 0, 0, 200, 3 + decelEnrichmentThreshold = scalar, F32, 5784, "roc", 1, 0, 0, 200, 3 + decelEnrichmentMultiplier = scalar, F32, 5788, "coeff", 1, 0, 0, 200, 3 accelEnrichmentThreshold = scalar, F32, 5792, "roc", 1, 0, 0, 200, 3 accelEnrichmentMultiplier = scalar, F32, 5796, "coeff", 1, 0, 0, 200, 3 timingMultiplier = array, U08, 5800, [200],"char", 1, 0, 0.0, 3.0, 2 @@ -609,6 +609,7 @@ fileVersion = { 20150314 } veValue = scalar, F32, 112, "ratio", 1, 0 maxDelta = scalar, F32, 116, "ratio", 1, 0 minDelta = scalar, F32, 120, "ratio", 1, 0 + currentAccelDelta = scalar,F32, 124, "%", 1, 0 egoCorrection = { 0 } time = { timeNow } ; engineLoad = { algorithm == 0 ? MAF : TPS } @@ -775,6 +776,7 @@ fileVersion = { 20150314 } 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 + currentAccelDeltaGauge = currentAccelDelta, "%", "", 0, 120, 10, 10, 100, 100, 1, 1 [FrontPage] ; Gauges are numbered left to right, top to bottom. diff --git a/firmware/util/cyclic_buffer.h b/firmware/util/cyclic_buffer.h index edc673d1cf..2d13f09a8c 100644 --- a/firmware/util/cyclic_buffer.h +++ b/firmware/util/cyclic_buffer.h @@ -107,7 +107,7 @@ void cyclic_buffer::add(T value) { template void cyclic_buffer::setSize(int size) { clear(); - this->size = size; + this->size = size < CB_MAX_SIZE ? size : CB_MAX_SIZE; } template