From 676bedefac0d18d9f64cdf55a7c90aede8f7d1da Mon Sep 17 00:00:00 2001
From: rusefi <rusefi@users.noreply.github.com>
Date: Tue, 28 Mar 2017 18:59:42 -0400
Subject: [PATCH] reducing variable name conflict

---
 firmware/controllers/error_handling.cpp | 8 +++++---
 unit_tests/engine_test_helper.cpp       | 4 ++--
 unit_tests/test_trigger_decoder.cpp     | 6 +++---
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/firmware/controllers/error_handling.cpp b/firmware/controllers/error_handling.cpp
index 0917a31a50..2c20ef1190 100644
--- a/firmware/controllers/error_handling.cpp
+++ b/firmware/controllers/error_handling.cpp
@@ -102,9 +102,11 @@ void printToStream(MemoryStream *stream, const char *fmt, va_list ap) {
 	chvprintf((BaseSequentialStream *) stream, fmt, ap);
 	stream->buffer[stream->eos] = 0;
 }
-#endif
+#else
+int unitTestWarningCounter = 0;
+
+#endif /* EFI_SIMULATOR || EFI_PROD_CODE */
 
-int warningCounter = 0;
 
 /**
  * OBD_PCM_Processor_Fault is the general error code for now
@@ -142,7 +144,7 @@ bool warning(obd_code_e code, const char *fmt, ...) {
 	append(&logger, DELIMETER);
 	scheduleLogging(&logger);
 #else
-	warningCounter++;
+	unitTestWarningCounter++;
 	printf("unit_test_warning: ");
 	va_list ap;
 	va_start(ap, fmt);
diff --git a/unit_tests/engine_test_helper.cpp b/unit_tests/engine_test_helper.cpp
index 8388d37f15..9c437361e4 100644
--- a/unit_tests/engine_test_helper.cpp
+++ b/unit_tests/engine_test_helper.cpp
@@ -18,11 +18,11 @@
 extern int timeNow;
 extern EnginePins enginePins;
 extern EventQueue schedulingQueue;
-extern int warningCounter;
+extern int unitTestWarningCounter;
 
 EngineTestHelper::EngineTestHelper(engine_type_e engineType) : engine (&persistentConfig) {
 	ec = &persistentConfig.engineConfiguration;
-	warningCounter = 0;
+	unitTestWarningCounter = 0;
 
 	schedulingQueue.clear();
 	enginePins.reset();
diff --git a/unit_tests/test_trigger_decoder.cpp b/unit_tests/test_trigger_decoder.cpp
index 1598aa35d2..215a229465 100644
--- a/unit_tests/test_trigger_decoder.cpp
+++ b/unit_tests/test_trigger_decoder.cpp
@@ -35,7 +35,7 @@
 extern int timeNow;
 extern float unitTestValue;
 extern float testMafValue;
-extern int warningCounter;
+extern int unitTestWarningCounter;
 extern bool printTriggerDebug;
 extern float actualSynchGap;
 
@@ -1240,7 +1240,7 @@ void testMissedSpark299(void) {
 	engineConfiguration->isIgnitionEnabled = true;
 	engineConfiguration->isInjectionEnabled = false;
 
-	assertEqualsM("warningCounter#0", 4, warningCounter);
+	assertEqualsM("warningCounter#0", 4, unitTestWarningCounter);
 
 	timeNow += MS2US(20);
 	eth.firePrimaryTriggerRise();
@@ -1311,5 +1311,5 @@ void testMissedSpark299(void) {
 	eth.firePrimaryTriggerFall();
 	schedulingQueue.executeAll(timeNow);
 
-	assertEqualsM("warningCounter#1", 5, warningCounter);
+	assertEqualsM("warningCounter#1", 5, unitTestWarningCounter);
 }