bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Merge remote-tracking branch 'MarlinFirmware/Development' into Development

Browse Source
This commit is contained in:
Chris Roadfeldt
2015-03-31 03:07:57 -05:00
parent 17707e7479 21ab44cfa7
commit 45ece5afb1
30 changed files with 3039 additions and 1305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/stepper.cpp
View File

@ -397,7 +397,9 @@ ISR(TIMER1_COMPA_vect) {
{
current_block = NULL;
plan_discard_current_block();
if ((cleaning_buffer_counter == 1) && (SD_FINISHED_STEPPERRELEASE)) enquecommands_P(PSTR(SD_FINISHED_RELEASECOMMAND));
#ifdef SD_FINISHED_RELEASECOMMAND
if ((cleaning_buffer_counter == 1) && (SD_FINISHED_STEPPERRELEASE)) enquecommands_P(PSTR(SD_FINISHED_RELEASECOMMAND));
#endif
cleaning_buffer_counter--;
OCR1A = 200;
return;