From 704a5113bccb531a5466a4c6b2449c7e0dd98d6b Mon Sep 17 00:00:00 2001
From: rusEfi <russianefi@gmail.com>
Date: Wed, 23 Nov 2016 17:01:59 -0500
Subject: [PATCH] auto-sync

---
 firmware/controllers/algo/error_handling.h | 3 ++-
 firmware/controllers/error_handling.cpp    | 8 ++++----
 firmware/rusefi.cpp                        | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/firmware/controllers/algo/error_handling.h b/firmware/controllers/algo/error_handling.h
index f82c01d318..147c9d51e4 100644
--- a/firmware/controllers/algo/error_handling.h
+++ b/firmware/controllers/algo/error_handling.h
@@ -22,7 +22,8 @@ int getVtSizeEstimate(void);
 
 void assertVtList(void);
 
-void setWarningCode(obd_code_e code, efitimesec_t now);
+void addWarningCode(obd_code_e code);
+
 /**
  * Something is wrong, but we can live with it: some minor sensor is disconnected
  * or something like that
diff --git a/firmware/controllers/error_handling.cpp b/firmware/controllers/error_handling.cpp
index d4af4dcf5e..c66d2da6b7 100644
--- a/firmware/controllers/error_handling.cpp
+++ b/firmware/controllers/error_handling.cpp
@@ -71,9 +71,7 @@ bool isWarningNow(efitimesec_t now, bool forIndicator) {
 	return absI(now - engine->engineState.timeOfPreviousWarning) < period;
 }
 
-void setWarningCode(obd_code_e code, efitimesec_t now) {
-	engine->engineState.timeOfPreviousWarning = now;
-
+void addWarningCode(obd_code_e code) {
 	engine->engineState.warningCounter++;
 	engine->engineState.lastErrorCode = code;
 }
@@ -92,10 +90,12 @@ bool warning(obd_code_e code, const char *fmt, ...) {
 	printf("warning %s\r\n", fmt);
 #endif
 
+	addWarningCode(code);
+
 	efitimesec_t now = getTimeNowSeconds();
 	if (isWarningNow(now, false) || !warningEnabled)
 		return true; // we just had another warning, let's not spam
-	setWarningCode(code, now);
+	engine->engineState.timeOfPreviousWarning = now;
 
 	resetLogging(&logger); // todo: is 'reset' really needed here?
 	appendMsgPrefix(&logger);
diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp
index 8d4eb1b332..39ecd6c62f 100644
--- a/firmware/rusefi.cpp
+++ b/firmware/rusefi.cpp
@@ -259,7 +259,7 @@ void chDbgStackOverflowPanic(Thread *otp) {
 void firmwareError(obd_code_e code, const char *errorMsg, ...) {
 	if (hasFirmwareErrorFlag)
 		return;
-	setWarningCode(code, getTimeNowSeconds());
+	addWarningCode(code);
 	ON_FATAL_ERROR()
 	;
 	hasFirmwareErrorFlag = true;