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:
e355738
)
implement current_speed for panel display
author
Jim Morris
<morris@wolfman.com>
Wed, 29 Jun 2016 05:49:14 +0000
(22:49 -0700)
committer
Jim Morris
<morris@wolfman.com>
Wed, 29 Jun 2016 05:49:14 +0000
(22:49 -0700)
src/modules/robot/Conveyor.cpp
patch
|
blob
|
blame
|
history
diff --git
a/src/modules/robot/Conveyor.cpp
b/src/modules/robot/Conveyor.cpp
index
db9015c
..
8d74355
100644
(file)
--- a/
src/modules/robot/Conveyor.cpp
+++ b/
src/modules/robot/Conveyor.cpp
@@
-216,11
+216,12
@@
bool Conveyor::get_next_block(Block **block)
b->is_ticking= true;
b->recalculate_flag= false;
-
+ this->current_feedrate= b->exit_speed;
*block= b;
return true;
}
+ this->current_feedrate= 0;
return false;
}