From cd7cefb669a399716b23396b0a70675c9968869d Mon Sep 17 00:00:00 2001 From: rusefillc Date: Mon, 16 Nov 2020 20:05:35 -0500 Subject: [PATCH] DC not ETB refactoring --- firmware/config/engines/lada_kalina.cpp | 8 ++++---- firmware/controllers/actuators/idle_thread.cpp | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/firmware/config/engines/lada_kalina.cpp b/firmware/config/engines/lada_kalina.cpp index 268d1a4094..d618ca168a 100644 --- a/firmware/config/engines/lada_kalina.cpp +++ b/firmware/config/engines/lada_kalina.cpp @@ -20,10 +20,10 @@ void setLadaKalina(DECLARE_CONFIG_PARAMETER_SIGNATURE) { /* PRE uses TLE8888_PIN_22 for fan */ engineConfiguration->fanPin = GPIO_UNASSIGNED; // TLE8888 two bridge drivers for stepper - engineConfiguration->etbIo2[0].directionPin1 = TLE8888_PIN_21; - engineConfiguration->etbIo2[0].directionPin2 = TLE8888_PIN_22; - engineConfiguration->etbIo2[1].directionPin1 = TLE8888_PIN_23; - engineConfiguration->etbIo2[1].directionPin2 = TLE8888_PIN_24; + engineConfiguration->stepperDcIo[0].directionPin1 = TLE8888_PIN_21; + engineConfiguration->stepperDcIo[0].directionPin2 = TLE8888_PIN_22; + engineConfiguration->stepperDcIo[1].directionPin1 = TLE8888_PIN_23; + engineConfiguration->stepperDcIo[1].directionPin2 = TLE8888_PIN_24; /* IDLE configuration */ engineConfiguration->useStepperIdle = true; engineConfiguration->useHbridges = true; diff --git a/firmware/controllers/actuators/idle_thread.cpp b/firmware/controllers/actuators/idle_thread.cpp index 413ba1e2f0..2e9890475b 100644 --- a/firmware/controllers/actuators/idle_thread.cpp +++ b/firmware/controllers/actuators/idle_thread.cpp @@ -146,12 +146,12 @@ static void showIdleInfo(DECLARE_ENGINE_PARAMETER_SIGNATURE) { if (CONFIG(useStepperIdle)) { if (CONFIG(useHbridges)) { scheduleMsg(logger, "Coil A:"); - scheduleMsg(logger, " pin1=%s", hwPortname(CONFIG(etbIo2[0].directionPin1))); - scheduleMsg(logger, " pin2=%s", hwPortname(CONFIG(etbIo2[0].directionPin2))); + scheduleMsg(logger, " pin1=%s", hwPortname(CONFIG(stepperDcIo[0].directionPin1))); + scheduleMsg(logger, " pin2=%s", hwPortname(CONFIG(stepperDcIo[0].directionPin2))); showDcMotorInfo(logger, 2); scheduleMsg(logger, "Coil B:"); - scheduleMsg(logger, " pin1=%s", hwPortname(CONFIG(etbIo2[1].directionPin1))); - scheduleMsg(logger, " pin2=%s", hwPortname(CONFIG(etbIo2[1].directionPin2))); + scheduleMsg(logger, " pin1=%s", hwPortname(CONFIG(stepperDcIo[1].directionPin1))); + scheduleMsg(logger, " pin2=%s", hwPortname(CONFIG(stepperDcIo[1].directionPin2))); showDcMotorInfo(logger, 3); } else { scheduleMsg(logger, "directionPin=%s reactionTime=%.2f", hwPortname(CONFIG(idle).stepperDirectionPin),