From a4cdac52b8292f02e039c68bab02b2271c68ac83 Mon Sep 17 00:00:00 2001 From: Paul Guenette Date: Sun, 26 May 2019 22:39:54 +0200 Subject: [PATCH] Change move_incremental to use input_pos --- Firmware/MotorControl/controller.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Firmware/MotorControl/controller.cpp b/Firmware/MotorControl/controller.cpp index 5062b695..9c5d5608 100644 --- a/Firmware/MotorControl/controller.cpp +++ b/Firmware/MotorControl/controller.cpp @@ -41,12 +41,14 @@ void Controller::move_to_pos(float goal_point) { goal_point_ = goal_point; } -void Controller::move_incremental(float displacement, bool from_goal_point = true){ - if(from_goal_point){ - move_to_pos(goal_point_ + displacement); +void Controller::move_incremental(float displacement, bool from_input_pos = true){ + if(from_input_pos){ + input_pos_ += displacement; } else{ - move_to_pos(pos_setpoint_ + displacement); + input_pos_ = pos_setpoint_ + displacement; } + + input_pos_updated(); } void Controller::start_anticogging_calibration() {