Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1

2012-12-09 23:46:42 +01:00
parent e036750bdf fcd9de72ef
commit 9b160972a1
8 changed files with 134 additions and 49 deletions
--- a/Marlin/stepper.cpp
+++ b/Marlin/stepper.cpp
@ -478,10 +478,10 @@ ISR(TIMER1_COMPA_vect)

    
    for(int8_t i=0; i < step_loops; i++) { // Take multiple steps per interrupt (For high speed moves) 
-      #if MOTHERBOARD != 8 // !teensylu
+      #ifndef AT90USB
      MSerial.checkRx(); // Check for serial chars.
-      #endif 
-      
+      #endif
+
      #ifdef ADVANCE
      counter_e += current_block->steps_e;
      if (counter_e > 0) {