HCoop
/
clinton
/
Smoothieware.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
2d14aa6
)
Robot: feed correct positions to actuators when reset_axis_position is called
author
Michael Moon
<triffid.hunter@gmail.com>
Fri, 24 Jan 2014 05:50:20 +0000
(16:50 +1100)
committer
Michael Moon
<triffid.hunter@gmail.com>
Fri, 24 Jan 2014 05:50:20 +0000
(16:50 +1100)
src/modules/robot/Robot.cpp
patch
|
blob
|
blame
|
history
diff --git
a/src/modules/robot/Robot.cpp
b/src/modules/robot/Robot.cpp
index
e5f82ae
..
d207039
100644
(file)
--- a/
src/modules/robot/Robot.cpp
+++ b/
src/modules/robot/Robot.cpp
@@
-441,7
+441,12
@@
void Robot::distance_in_gcode_is_known(Gcode* gcode){
// Reset the position for all axes ( used in homing and G92 stuff )
void Robot::reset_axis_position(float position, int axis) {
this->last_milestone[axis] = this->current_position[axis] = position;
- actuators[axis]->change_last_milestone(position);
+
+ float actuator_pos[3];
+ arm_solution->cartesian_to_actuator(last_milestone, actuator_pos);
+
+ for (int i = 0; i < 3; i++)
+ actuators[i]->change_last_milestone(actuator_pos[i]);
}