From e1500ea729f37cc99fcba8efd8e7b060efd21642 Mon Sep 17 00:00:00 2001 From: rusefi Date: Wed, 26 Jul 2017 20:27:08 -0400 Subject: [PATCH] #413 --- firmware/controllers/algo/engine.cpp | 1 + firmware/controllers/algo/engine.h | 5 ++++- firmware/tunerstudio/rusefi.ini | 3 ++- firmware/tunerstudio/rusefi.input | 1 + 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/firmware/controllers/algo/engine.cpp b/firmware/controllers/algo/engine.cpp index 4890798fc3..fa29338543 100644 --- a/firmware/controllers/algo/engine.cpp +++ b/firmware/controllers/algo/engine.cpp @@ -109,6 +109,7 @@ void Engine::reset() { fsioTimingAdjustment = 0; isAlternatorControlEnabled = false; callFromPitStopEndTime = 0; + rpmHardLimitTimestamp = 0; wallFuelCorrection = 0; /** * it's important for fixAngle() that engineCycle field never has zero diff --git a/firmware/controllers/algo/engine.h b/firmware/controllers/algo/engine.h index 1bbe248b31..3eb39333ce 100644 --- a/firmware/controllers/algo/engine.h +++ b/firmware/controllers/algo/engine.h @@ -296,7 +296,10 @@ public: /** * remote telemetry: if not zero, time to stop flashing 'CALL FROM PIT STOP' light */ - floatms_t callFromPitStopEndTime; + efitime_t callFromPitStopEndTime; + + // timestamp of most recent time RPM hard limit was triggered + efitime_t rpmHardLimitTimestamp; /** * This flag indicated a big enough problem that engine control would be diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index e03e95de47..2b3b309236 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -59,7 +59,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Jul 25 20:21:45 EDT 2017 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Jul 26 20:23:40 EDT 2017 pageSize = 16376 page = 1 @@ -2398,6 +2398,7 @@ cmd_call_from_pit = "w\x00\x20\x34\x56" panel = TpsAccelPanel field = "sucked off wall coefficient", suckedOffCoef field = "added to wall coef", addedToWallCoef + field = "No accel after RPM hard limit", noAccelAfterHardLimitPeriodSecs ; Flex Logic diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 409aa1b52a..6c9abb0eec 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1631,6 +1631,7 @@ cmd_call_from_pit = "w\x00\x20\x34\x56" panel = TpsAccelPanel field = "sucked off wall coefficient", suckedOffCoef field = "added to wall coef", addedToWallCoef + field = "No accel after RPM hard limit", noAccelAfterHardLimitPeriodSecs ; Flex Logic