From: Erik van der Zalm <erik@vdzalm.eu>
Date: Sun, 4 Dec 2011 18:54:43 +0000 (+0100)
Subject: Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
X-Git-Tag: iwj-success-2012-07-29~163^2~2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=95a0b28acbf8ee93cf1cb06fd0c76ccd582712d4;p=marlin.git

Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
---

95a0b28acbf8ee93cf1cb06fd0c76ccd582712d4
diff --cc Marlin/stepper.cpp
index bcad026,e0b7678..e25d179
--- a/Marlin/stepper.cpp
+++ b/Marlin/stepper.cpp
@@@ -471,14 -462,9 +472,14 @@@ ISR(TIMER1_COMPA_vect
          for(int8_t i=0; i < step_loops; i++) {
            advance += advance_rate;
          }
 +        //if(advance > current_block->advance) advance = current_block->advance;
 +        // Do E steps + advance steps
 +        e_steps += ((advance >>8) - old_advance);
 +        old_advance = advance >>8;  
 +        
        #endif
      } 
-     else if (step_events_completed > current_block->decelerate_after) {   
+     else if (step_events_completed > (unsigned long int)current_block->decelerate_after) {   
        MultiU24X24toH16(step_rate, deceleration_time, current_block->acceleration_rate);
        
        if(step_rate > acc_step_rate) { // Check step_rate stays positive