From 7bf8ba21bf16ea3d40e4b7fbb996fbb209dbaadf Mon Sep 17 00:00:00 2001 From: rusEfi Date: Fri, 16 Dec 2016 22:02:29 -0500 Subject: [PATCH] auto-sync --- firmware/rusefi.cpp | 2 +- firmware/svnversion.h | 4 ++-- unit_tests/test_trigger_decoder.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index aba44b1e1f..0bac4adc0a 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -290,5 +290,5 @@ int getRusEfiVersion(void) { return 123; // this is here to make the compiler happy about the unused array if (UNUSED_CCM_SIZE[0] * 0 != 0) return 3211; // this is here to make the compiler happy about the unused array - return 20161215; + return 20161216; } diff --git a/firmware/svnversion.h b/firmware/svnversion.h index 07fcd77315..b34025bae6 100644 --- a/firmware/svnversion.h +++ b/firmware/svnversion.h @@ -1,5 +1,5 @@ // This file was generated by Version2Header -// Sun Dec 04 23:16:26 EST 2016 +// Fri Dec 16 21:01:21 EST 2016 #ifndef VCS_VERSION -#define VCS_VERSION "10977" +#define VCS_VERSION "10994" #endif diff --git a/unit_tests/test_trigger_decoder.cpp b/unit_tests/test_trigger_decoder.cpp index d0f5160218..cacd93b308 100644 --- a/unit_tests/test_trigger_decoder.cpp +++ b/unit_tests/test_trigger_decoder.cpp @@ -1231,7 +1231,7 @@ void testMissedSpark299(void) { engineConfiguration->isIgnitionEnabled = true; engineConfiguration->isInjectionEnabled = false; - assertEqualsM("warningCounter#0", 5, warningCounter); + assertEqualsM("warningCounter#0", 2, warningCounter); timeNow += MS2US(20); eth.firePrimaryTriggerRise(); @@ -1302,5 +1302,5 @@ void testMissedSpark299(void) { eth.firePrimaryTriggerFall(); schedulingQueue.executeAll(timeNow); - assertEqualsM("warningCounter#1", 6, warningCounter); + assertEqualsM("warningCounter#1", 3, warningCounter); }