merging

2011-12-12 20:35:46 +01:00
parent e017228569 3320a5b37d
commit 84d9cf7339
12 changed files with 358 additions and 203 deletions
--- a/Marlin/planner.h
+++ b/Marlin/planner.h
@ -128,4 +128,16 @@ FORCE_INLINE block_t *plan_get_current_block()
  block->busy = true;
  return(block);
 }
+
+// Gets the current block. Returns NULL if buffer empty
+FORCE_INLINE bool blocks_queued() 
+{
+  if (block_buffer_head == block_buffer_tail) { 
+    return false; 
+  }
+  else
+    return true;
+}
+
+void allow_cold_extrudes(bool allow);
 #endif