HCoop
/
clinton
/
Smoothieware.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Conveyor: check for queue start conditions in main loop instead of on_idle
[clinton/Smoothieware.git]
/
src
/
modules
/
robot
/
Conveyor.cpp
diff --git
a/src/modules/robot/Conveyor.cpp
b/src/modules/robot/Conveyor.cpp
index
26b8b85
..
fa0eee7
100644
(file)
--- a/
src/modules/robot/Conveyor.cpp
+++ b/
src/modules/robot/Conveyor.cpp
@@
-30,6
+30,7
@@
Conveyor::Conveyor(){
void Conveyor::on_module_loaded(){
register_for_event(ON_IDLE);
void Conveyor::on_module_loaded(){
register_for_event(ON_IDLE);
+ register_for_event(ON_MAIN_LOOP);
register_for_event(ON_CONFIG_RELOAD);
on_config_reload(this);
register_for_event(ON_CONFIG_RELOAD);
on_config_reload(this);
@@
-50,10
+51,15
@@
void Conveyor::on_idle(void* argument){
queue.consume_tail();
}
}
queue.consume_tail();
}
}
- else if (queue.is_empty())
+}
+
+void Conveyor::on_main_loop(void*)
+{
+ if (running)
+ return;
+
+ if (queue.is_empty())
{
{
- // if someone has appended gcodes but the queue is stopped
- // make sure they get executed in a timely fashion
if (queue.head_ref()->gcodes.size())
{
queue_head_block();
if (queue.head_ref()->gcodes.size())
{
queue_head_block();