From ef9f886e069a91df4cca29661aca12e107daabc0 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Tue, 14 Apr 2015 08:09:47 -0400 Subject: [PATCH] auto-sync --- firmware/hw_layer/trigger_input.cpp | 9 +++++---- firmware/rusefi.cpp | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/firmware/hw_layer/trigger_input.cpp b/firmware/hw_layer/trigger_input.cpp index aa9e70913c..953d87fba4 100644 --- a/firmware/hw_layer/trigger_input.cpp +++ b/firmware/hw_layer/trigger_input.cpp @@ -75,11 +75,12 @@ static ICUDriver *turnOnTriggerInputPin(brain_pin_e hwPin) { scheduleMsg(logger, "turnOnTriggerInputPin %s", hwPortname(hwPin)); // todo: reuse 'setWaveReaderMode' method here? if (driver != NULL) { - bool_t needWidthCallback = !CONFIG(useOnlyFrontForTrigger) || TRIGGER_SHAPE(useRiseEdge); - shaft_icucfg.width_cb = needWidthCallback ? shaft_icu_width_callback : NULL; + // todo: once http://forum.chibios.org/phpbb/viewtopic.php?f=16&t=1757 is fixed +// bool_t needWidthCallback = !CONFIG(useOnlyFrontForTrigger) || TRIGGER_SHAPE(useRiseEdge); +// shaft_icucfg.width_cb = needWidthCallback ? shaft_icu_width_callback : NULL; - bool_t needPeriodCallback = !CONFIG(useOnlyFrontForTrigger) || !TRIGGER_SHAPE(useRiseEdge); - shaft_icucfg.period_cb = needPeriodCallback ? shaft_icu_period_callback : NULL; +// bool_t needPeriodCallback = !CONFIG(useOnlyFrontForTrigger) || !TRIGGER_SHAPE(useRiseEdge); +// shaft_icucfg.period_cb = needPeriodCallback ? shaft_icu_period_callback : NULL; efiIcuStart(driver, &shaft_icucfg); icuEnable(driver); diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index 91830de3e3..3507c49ac2 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 20150413; + return 20150414; }