From 504a3b784d9862defe944f17a30d121e174839c0 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Sun, 29 Jan 2017 01:04:16 -0500 Subject: [PATCH] auto-sync --- firmware/config/engines/subaru.cpp | 12 ++++++++++++ firmware/controllers/idle_thread.cpp | 22 +++++++++++++--------- firmware/rusefi.cpp | 2 +- 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/firmware/config/engines/subaru.cpp b/firmware/config/engines/subaru.cpp index 709b0e3edf..a5c53e331e 100644 --- a/firmware/config/engines/subaru.cpp +++ b/firmware/config/engines/subaru.cpp @@ -22,4 +22,16 @@ void setSubaru2003Wrx(DECLARE_ENGINE_PARAMETER_F) { engineConfiguration->trigger.customSkippedToothCount = 1; engineConfiguration->sensorChartFrequency = 2; + + boardConfiguration->useStepperIdle = true; + + // todo: url + boardConfiguration->idle.stepperDirectionPin = GPIOD_1; // top stepper drive pin, white wire recommended + boardConfiguration->idle.stepperStepPin = GPIOD_6; // yellow wire recommended + engineConfiguration->stepperEnablePin = GPIOB_1; // bottom stepper driver board pin, blue wire recommended + + boardConfiguration->triggerSimulatorPins[0] = GPIO_UNASSIGNED; + boardConfiguration->triggerSimulatorPins[1] = GPIO_UNASSIGNED; + boardConfiguration->triggerSimulatorPins[2] = GPIO_UNASSIGNED; + } diff --git a/firmware/controllers/idle_thread.cpp b/firmware/controllers/idle_thread.cpp index 2cb14209f0..05ba54c1d1 100644 --- a/firmware/controllers/idle_thread.cpp +++ b/firmware/controllers/idle_thread.cpp @@ -64,23 +64,27 @@ void idleDebug(const char *msg, percent_t value) { } static void showIdleInfo(void) { - scheduleMsg(logger, "idleMode=%s position=%f isStepper=%s", getIdle_mode_e(engineConfiguration->idleMode), + const char * idleModeStr = getIdle_mode_e(engineConfiguration->idleMode); + scheduleMsg(logger, "idleMode=%s position=%f isStepper=%s", idleModeStr, getIdlePosition(), boolToString(boardConfiguration->useStepperIdle)); if (boardConfiguration->useStepperIdle) { - scheduleMsg(logger, "direction=%s reactionTime=%f", hwPortname(boardConfiguration->idle.stepperDirectionPin), + scheduleMsg(logger, "directionPin=%s reactionTime=%f", hwPortname(boardConfiguration->idle.stepperDirectionPin), engineConfiguration->idleStepperReactionTime); - scheduleMsg(logger, "step=%s steps=%d", hwPortname(boardConfiguration->idle.stepperStepPin), + scheduleMsg(logger, "stepPin=%s steps=%d", hwPortname(boardConfiguration->idle.stepperStepPin), engineConfiguration->idleStepperTotalSteps); - scheduleMsg(logger, "enable=%s", hwPortname(engineConfiguration->stepperEnablePin)); + scheduleMsg(logger, "enablePin=%s/%d", hwPortname(engineConfiguration->stepperEnablePin), + engineConfiguration->stepperEnablePinMode); } else { scheduleMsg(logger, "idle valve freq=%d on %s", boardConfiguration->idle.solenoidFrequency, hwPortname(boardConfiguration->idle.solenoidPin)); } - scheduleMsg(logger, "idleControl=%s", getIdle_control_e(engineConfiguration->idleControl)); - scheduleMsg(logger, "idle P=%f I=%f D=%f dT=%d", engineConfiguration->idleRpmPid.pFactor, - engineConfiguration->idleRpmPid.iFactor, - engineConfiguration->idleRpmPid.dFactor, - engineConfiguration->idleDT); + scheduleMsg(logger, "mode=%s", getIdle_control_e(engineConfiguration->idleControl)); + if (engineConfiguration->idleControl == IC_PID) { + scheduleMsg(logger, "idle P=%f I=%f D=%f dT=%d", engineConfiguration->idleRpmPid.pFactor, + engineConfiguration->idleRpmPid.iFactor, + engineConfiguration->idleRpmPid.dFactor, + engineConfiguration->idleDT); + } } void setIdleControlEnabled(int value) { diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index 3b6ae1d356..2a6646d7e0 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -249,5 +249,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 20170128; + return 20170129; }