PR #3820: I (andypugh) shouldn't have moved the lines in the original PR

Author: andypugh

src/emc/motion/axis.c

@@ -659,8 +659,7 @@ int axis_calc_motion(double servo_period)
 
     for (axis_num = 0; axis_num < EMCMOT_MAX_AXIS; axis_num++) {
         axis = &axis_array[axis_num];
-        axis->teleop_vel_cmd = axis->teleop_tp.curr_vel;
-        axis->pos_cmd = axis->teleop_tp.curr_pos;
+
         // teleop_tp.max_vel is always positive
         if (axis->teleop_tp.max_vel > axis->vel_limit) {
             axis->teleop_tp.max_vel = axis->vel_limit;
@@ -669,6 +668,9 @@ int axis_calc_motion(double servo_period)
             violated_teleop_limit = 1;
         }
 
+        axis->teleop_vel_cmd = axis->teleop_tp.curr_vel;
+        axis->pos_cmd = axis->teleop_tp.curr_pos;
+
         if (!axis->teleop_tp.active) {
             axis->kb_ajog_active = 0;
             axis->wheel_ajog_active = 0;