From 68e2b93dff83f14b16fc767d254de00dcc6ffc1f Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Sat, 14 Aug 2021 23:10:28 -0700 Subject: [PATCH] don't print the wrong number (#3158) Co-authored-by: Matthew Kennedy --- .../actuators/electronic_throttle.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/firmware/controllers/actuators/electronic_throttle.cpp b/firmware/controllers/actuators/electronic_throttle.cpp index 54b4d9840d..d4518e9efe 100644 --- a/firmware/controllers/actuators/electronic_throttle.cpp +++ b/firmware/controllers/actuators/electronic_throttle.cpp @@ -643,8 +643,8 @@ struct EtbImpl final : public EtbController { motor->set(0.5f); motor->enable(); chThdSleepMilliseconds(1000); - float primaryMax = Sensor::getRaw(functionToTpsSensorPrimary(myFunction)) * TPS_TS_CONVERSION; - float secondaryMax = Sensor::getRaw(functionToTpsSensorSecondary(myFunction)) * TPS_TS_CONVERSION; + float primaryMax = Sensor::getRaw(functionToTpsSensorPrimary(myFunction)); + float secondaryMax = Sensor::getRaw(functionToTpsSensorSecondary(myFunction)); // Let it return motor->set(0); @@ -653,8 +653,8 @@ struct EtbImpl final : public EtbController { // Now grab closed motor->set(-0.5f); chThdSleepMilliseconds(1000); - float primaryMin = Sensor::getRaw(functionToTpsSensorPrimary(myFunction)) * TPS_TS_CONVERSION; - float secondaryMin = Sensor::getRaw(functionToTpsSensorSecondary(myFunction)) * TPS_TS_CONVERSION; + float primaryMin = Sensor::getRaw(functionToTpsSensorPrimary(myFunction)); + float secondaryMin = Sensor::getRaw(functionToTpsSensorSecondary(myFunction)); // Finally disable and reset state motor->disable(); @@ -668,17 +668,17 @@ struct EtbImpl final : public EtbController { // Write out the learned values to TS, waiting briefly after setting each to let TS grab it tsOutputChannels.calibrationMode = functionToCalModePriMax(myFunction); - tsOutputChannels.calibrationValue = primaryMax; + tsOutputChannels.calibrationValue = primaryMax * TPS_TS_CONVERSION; chThdSleepMilliseconds(500); tsOutputChannels.calibrationMode = functionToCalModePriMin(myFunction); - tsOutputChannels.calibrationValue = primaryMin; + tsOutputChannels.calibrationValue = primaryMin * TPS_TS_CONVERSION; chThdSleepMilliseconds(500); tsOutputChannels.calibrationMode = functionToCalModeSecMax(myFunction); - tsOutputChannels.calibrationValue = secondaryMax; + tsOutputChannels.calibrationValue = secondaryMax * TPS_TS_CONVERSION; chThdSleepMilliseconds(500); tsOutputChannels.calibrationMode = functionToCalModeSecMin(myFunction); - tsOutputChannels.calibrationValue = secondaryMin; + tsOutputChannels.calibrationValue = secondaryMin * TPS_TS_CONVERSION; chThdSleepMilliseconds(500); tsOutputChannels.calibrationMode = TsCalMode::None;