From 7ea8aa98e09dc79137327ff83528d9c61cfb4ed4 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Sat, 23 Jul 2016 15:05:04 -0400 Subject: [PATCH] auto-sync --- firmware/controllers/settings.cpp | 2 ++ firmware/controllers/trigger/trigger_structure.cpp | 4 ++-- .../simulator/rusEfiFunctionalTest.cpp | 9 ++++++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp index de25eaa4c5..0fc3a3b2c2 100644 --- a/firmware/controllers/settings.cpp +++ b/firmware/controllers/settings.cpp @@ -977,6 +977,8 @@ static void setValue(const char *paramStr, const char *valueStr) { #endif } else if (strEqualCaseInsensitive(paramStr, "warningPeriod")) { engineConfiguration->warningPeriod = valueI; + } else if (strEqualCaseInsensitive(paramStr, "engineSnifferRpmThreshold")) { + engineConfiguration->engineSnifferRpmThreshold = valueI; } else if (strEqualCaseInsensitive(paramStr, "step1rpm")) { engineConfiguration->step1rpm = valueI; } else if (strEqualCaseInsensitive(paramStr, "step1timing")) { diff --git a/firmware/controllers/trigger/trigger_structure.cpp b/firmware/controllers/trigger/trigger_structure.cpp index 9b120271c1..d32f6ff0ca 100644 --- a/firmware/controllers/trigger/trigger_structure.cpp +++ b/firmware/controllers/trigger/trigger_structure.cpp @@ -255,6 +255,7 @@ void TriggerShape::addEvent2(angle_t angle, trigger_wheel_e const waveIndex, tri addEvent(angle, waveIndex, stateParam); } +// todo: probably replace all usages with 'addEvent2'? void TriggerShape::addEvent(angle_t angle, trigger_wheel_e const waveIndex, trigger_value_e const stateParam) { efiAssertVoid(operationMode != OM_NONE, "operationMode not set"); @@ -286,8 +287,7 @@ void TriggerShape::addEvent(angle_t angle, trigger_wheel_e const waveIndex, trig */ angle /= engineCycle; -#if EFI_PROD_CODE || defined(__DOXYGEN__) -// todo: PASS_ENGINE? +#if !EFI_UNIT_TEST || defined(__DOXYGEN__) if (!engineConfiguration->useOnlyRisingEdgeForTrigger || stateParam == TV_RISE) { expectedEventCount[waveIndex]++; } diff --git a/win32_functional_tests/simulator/rusEfiFunctionalTest.cpp b/win32_functional_tests/simulator/rusEfiFunctionalTest.cpp index df914c6e1c..6d19de364e 100644 --- a/win32_functional_tests/simulator/rusEfiFunctionalTest.cpp +++ b/win32_functional_tests/simulator/rusEfiFunctionalTest.cpp @@ -30,6 +30,10 @@ #include "engine_controller.h" #include "map_averaging.h" +#define DEFAULT_SIM_RPM 1200 +#define DEFAULT_ENGINE_TYPE FORD_ESCORT_GT +#define DEFAULT_SNIFFER_THR 2500 + EXTERN_ENGINE; extern engine_configuration2_s * engineConfiguration2; @@ -78,7 +82,7 @@ void rusEfiFunctionalTest(void) { // todo: reduce code duplication with initEngineContoller - resetConfigurationExt(NULL, FORD_ESCORT_GT PASS_ENGINE_PARAMETER); + resetConfigurationExt(NULL, DEFAULT_ENGINE_TYPE PASS_ENGINE_PARAMETER); prepareShapes(PASS_ENGINE_PARAMETER_F); initAlgo(&sharedLogger, engineConfiguration); @@ -103,6 +107,9 @@ void rusEfiFunctionalTest(void) { startStatusThreads(engine); initPeriodicEvents(PASS_ENGINE_PARAMETER_F); + + setTriggerEmulatorRPM(DEFAULT_SIM_RPM, engine); + engineConfiguration->engineSnifferRpmThreshold = DEFAULT_SNIFFER_THR; } void printPendingMessages(void) {