From 1c38b6624f6a5fa6846eb72e89033adfbc4a8fb4 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Tue, 27 Dec 2016 12:00:48 -0500 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 4c10b0fbbf..beb54ae7e3 100644 --- a/firmware/hw_layer/trigger_input.cpp +++ b/firmware/hw_layer/trigger_input.cpp @@ -90,12 +90,12 @@ static ICUConfig cam_icucfg = { ICU_INPUT_ACTIVE_LOW, 100000, /* 100kHz ICU cloc cam_icu_width_callback, cam_icu_period_callback }; -static ICUDriver *turnOnTriggerInputPin(brain_pin_e hwPin, ICUConfig *icucfg) { +static ICUDriver *turnOnTriggerInputPin(const char *msg, brain_pin_e hwPin, ICUConfig *icucfg) { if (hwPin == GPIO_UNASSIGNED) return NULL; // configure pin - turnOnCapturePin("trigger", hwPin); + turnOnCapturePin(msg, hwPin); icucfg->channel = getInputCaptureChannel(hwPin); ICUDriver *driver = getInputCaptureDriver(hwPin); @@ -161,12 +161,13 @@ void applyNewTriggerInputPins(void) { for (int i = 0; i < TRIGGER_SUPPORTED_CHANNELS; i++) { if (boardConfiguration->triggerInputPins[i] != activeConfiguration.bc.triggerInputPins[i]) { - turnOnTriggerInputPin(boardConfiguration->triggerInputPins[i], &shaft_icucfg); + const char * msg = (i == 0 ? "trigger#1" : (i == 1 ? "trigger#2" : "trigger#3")); + turnOnTriggerInputPin(msg, boardConfiguration->triggerInputPins[i], &shaft_icucfg); } } if (engineConfiguration->camInput != activeConfiguration.camInput) { - turnOnTriggerInputPin(engineConfiguration->camInput, &cam_icucfg); + turnOnTriggerInputPin("cam", engineConfiguration->camInput, &cam_icucfg); } rememberPrimaryChannel(); diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index c3a78ce39c..8fafefbdc0 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -283,5 +283,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 20161216; + return 20161227; }