HCoop
/
clinton
/
Smoothieware.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3fa1607
)
Fix M92, M203, M204 for extruders in a n-axis world
author
Jim Morris
<morris@wolfman.com>
Mon, 9 Jan 2017 03:07:17 +0000
(19:07 -0800)
committer
Jim Morris
<morris@wolfman.com>
Mon, 9 Jan 2017 03:07:17 +0000
(19:07 -0800)
src/modules/robot/Robot.cpp
patch
|
blob
|
blame
|
history
diff --git
a/src/modules/robot/Robot.cpp
b/src/modules/robot/Robot.cpp
index
141379f
..
2e67e66
100644
(file)
--- a/
src/modules/robot/Robot.cpp
+++ b/
src/modules/robot/Robot.cpp
@@
-608,6
+608,7
@@
void Robot::on_gcode_received(void *argument)
case 92: // M92 - set steps per mm
for (int i = 0; i < n_motors; ++i) {
case 92: // M92 - set steps per mm
for (int i = 0; i < n_motors; ++i) {
+ if(actuators[i]->is_extruder()) continue; //extruders handle this themselves
char axis= (i <= Z_AXIS ? 'X'+i : 'A'+(i-A_AXIS));
if(gcode->has_letter(axis)) {
actuators[i]->change_steps_per_mm(this->to_millimeters(gcode->get_value(axis)));
char axis= (i <= Z_AXIS ? 'X'+i : 'A'+(i-A_AXIS));
if(gcode->has_letter(axis)) {
actuators[i]->change_steps_per_mm(this->to_millimeters(gcode->get_value(axis)));
@@
-640,6
+641,7
@@
void Robot::on_gcode_received(void *argument)
}
if(gcode->subcode == 1) {
for (size_t i = A_AXIS; i < n_motors; i++) {
}
if(gcode->subcode == 1) {
for (size_t i = A_AXIS; i < n_motors; i++) {
+ if(actuators[i]->is_extruder()) continue; //extruders handle this themselves
gcode->stream->printf(" %c: %g ", 'A' + i - A_AXIS, actuators[i]->get_max_rate());
}
}
gcode->stream->printf(" %c: %g ", 'A' + i - A_AXIS, actuators[i]->get_max_rate());
}
}