From: Bernhard <bkubicek@x201.(none)>
Date: Fri, 25 Nov 2011 22:59:30 +0000 (+0100)
Subject: slowdown
X-Git-Tag: iwj-success-2012-07-29~191
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=191f36b4933be2686a51dd62dbe532ee90f38ab5;p=marlin.git

slowdown
---

diff --git a/Marlin/planner.cpp b/Marlin/planner.cpp
index 8a27a2c..bb2e2a6 100644
--- a/Marlin/planner.cpp
+++ b/Marlin/planner.cpp
@@ -530,7 +530,7 @@ void plan_buffer_line(const float &x, const float &y, const float &z, const floa
   // slow down when de buffer starts to empty, rather than wait at the corner for a buffer refill
   int moves_queued=(block_buffer_head-block_buffer_tail + BLOCK_BUFFER_SIZE) & (BLOCK_BUFFER_SIZE - 1);
   
-  if(moves_queued < (BLOCK_BUFFER_SIZE * 0.5)) feed_rate = feed_rate / ((BLOCK_BUFFER_SIZE * 0.5)/moves_queued); 
+  if(moves_queued < (BLOCK_BUFFER_SIZE * 0.5)) feed_rate = feed_rate*moves_queued / (BLOCK_BUFFER_SIZE * 0.5); 
 #endif
 
 /*
diff --git a/Marlin/ultralcd.pde b/Marlin/ultralcd.pde
index 47396e4..91bb43d 100644
--- a/Marlin/ultralcd.pde
+++ b/Marlin/ultralcd.pde
@@ -1435,7 +1435,7 @@ void MainMenu::showMainMenu()
     switch(line)
     { 
       case ItemM_watch:
-        MENUITEM(  lcdprintPGM(" Watch \003")  ,  BLOCK;status=Main_Status;beepshort(); ) ;
+        MENUITEM(  lcdprintPGM(" Watch   \003")  ,  BLOCK;status=Main_Status;beepshort(); ) ;
        break;
       case ItemM_prepare:
         MENUITEM(  if(!tune) lcdprintPGM(" Prepare \x7E");else  lcdprintPGM(" Tune    \x7E"); ,  BLOCK;status=Main_Prepare;beepshort(); ) ;