add $J for instant jog of one axis.

[clinton/Smoothieware.git] / src / modules / robot / Conveyor.h

diff --git a/src/modules/robot/Conveyor.h b/src/modules/robot/Conveyor.h
index ba2b09a..1418188 100644 (file)
--- a/src/modules/robot/Conveyor.h
+++ b/src/modules/robot/Conveyor.h
@@ -8,13 +8,8 @@
 #pragma once
 
 #include "libs/Module.h"
-#include "HeapRing.h"
+#include "BlockQueue.h"
 
-using namespace std;
-#include <string>
-#include <vector>
-
-class Gcode;
 class Block;
 
 class Conveyor : public Module
@@ -39,17 +34,16 @@ public:
     void dump_queue(void);
     void flush_queue(void);
     float get_current_feedrate() const { return current_feedrate; }
+    void force_queue() { check_queue(true); }
 
     friend class Planner; // for queue
 
 private:
-    // void all_moves_finished();
     void check_queue(bool force= false);
     void queue_head_block(void);
 
-    using  Queue_t= HeapRing<Block>;
+    using  Queue_t= BlockQueue;
     Queue_t queue;  // Queue of Blocks
-    //volatile unsigned int gc_pending;
 
     uint32_t queue_delay_time_ms;
     size_t queue_size;
@@ -57,7 +51,6 @@ private:
 
     struct {
         volatile bool running:1;
-        volatile bool halted:1;
         volatile bool allow_fetch:1;
         bool flush:1;
     };