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

This commit is contained in:
Bernhard 2011-11-25 22:14:36 +01:00
commit 71ca78982b

View File

@ -281,7 +281,7 @@ ISR(TIMER1_COMPA_vect)
if(busy){ if(busy){
OCR1A_error = OCR1A; OCR1A_error = OCR1A;
bussy_error = true; bussy_error = true;
OCR1A = 0x30000; OCR1A = 30000;
return; return;
} // The busy-flag is used to avoid reentering this interrupt } // The busy-flag is used to avoid reentering this interrupt