andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

reducing variable name conflict

This commit is contained in:
rusefi 2017-03-28 18:59:42 -04:00
parent a338d6b7bc
commit 676bedefac
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
firmware/controllers/error_handling.cpp
View File

@ -102,9 +102,11 @@ void printToStream(MemoryStream *stream, const char *fmt, va_list ap) {
chvprintf((BaseSequentialStream *) stream, fmt, ap); chvprintf((BaseSequentialStream *) stream, fmt, ap);
stream->buffer[stream->eos] = 0; 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 * 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); append(&logger, DELIMETER);
scheduleLogging(&logger); scheduleLogging(&logger);
#else #else
warningCounter++; unitTestWarningCounter++;
printf("unit_test_warning: "); printf("unit_test_warning: ");
va_list ap; va_list ap;
va_start(ap, fmt); va_start(ap, fmt);

4
unit_tests/engine_test_helper.cpp
View File

@ -18,11 +18,11 @@
extern int timeNow; extern int timeNow;
extern EnginePins enginePins; extern EnginePins enginePins;
extern EventQueue schedulingQueue; extern EventQueue schedulingQueue;
extern int warningCounter; extern int unitTestWarningCounter;
EngineTestHelper::EngineTestHelper(engine_type_e engineType) : engine (&persistentConfig) { EngineTestHelper::EngineTestHelper(engine_type_e engineType) : engine (&persistentConfig) {
ec = &persistentConfig.engineConfiguration; ec = &persistentConfig.engineConfiguration;
warningCounter = 0; unitTestWarningCounter = 0;
schedulingQueue.clear(); schedulingQueue.clear();
enginePins.reset(); enginePins.reset();

6
unit_tests/test_trigger_decoder.cpp
View File

@ -35,7 +35,7 @@
extern int timeNow; extern int timeNow;
extern float unitTestValue; extern float unitTestValue;
extern float testMafValue; extern float testMafValue;
extern int warningCounter; extern int unitTestWarningCounter;
extern bool printTriggerDebug; extern bool printTriggerDebug;
extern float actualSynchGap; extern float actualSynchGap;
@ -1240,7 +1240,7 @@ void testMissedSpark299(void) {
engineConfiguration->isIgnitionEnabled = true; engineConfiguration->isIgnitionEnabled = true;
engineConfiguration->isInjectionEnabled = false; engineConfiguration->isInjectionEnabled = false;
assertEqualsM("warningCounter#0", 4, warningCounter); assertEqualsM("warningCounter#0", 4, unitTestWarningCounter);
timeNow += MS2US(20); timeNow += MS2US(20);
eth.firePrimaryTriggerRise(); eth.firePrimaryTriggerRise();
@ -1311,5 +1311,5 @@ void testMissedSpark299(void) {
eth.firePrimaryTriggerFall(); eth.firePrimaryTriggerFall();
schedulingQueue.executeAll(timeNow); schedulingQueue.executeAll(timeNow);
assertEqualsM("warningCounter#1", 5, warningCounter); assertEqualsM("warningCounter#1", 5, unitTestWarningCounter);
} }