From 26cd35a8cb56a07bb3ae95b0593ecb30f191a28b Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Mon, 11 Sep 2017 17:31:06 +0200 Subject: [PATCH] reverting few changes, --- Firmware/Marlin_main.cpp | 26 +++++++++++++------------- Firmware/cardreader.cpp | 2 +- Firmware/cardreader.h | 3 +-- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 229789f64..4b2e30b08 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1405,19 +1405,6 @@ void proc_commands() { } } -bool check_commands() { - bool end_command_found = false; - - if (buflen) - { - if ((code_seen("M84")) || (code_seen("M 84"))) end_command_found = true; - if (!cmdbuffer_front_already_processed) - cmdqueue_pop_front(); - cmdbuffer_front_already_processed = false; - } - return end_command_found; -} - void get_command() { // Test and reserve space for the new command string. @@ -1905,6 +1892,19 @@ static float probe_pt(float x, float y, float z_before) { } #endif // LIN_ADVANCE +bool check_commands() { + bool end_command_found = false; + + if (buflen) + { + if ((code_seen("M84")) || (code_seen("M 84"))) end_command_found = true; + if (!cmdbuffer_front_already_processed) + cmdqueue_pop_front(); + cmdbuffer_front_already_processed = false; + } + return end_command_found; +} + void homeaxis(int axis) { #define HOMEAXIS_DO(LETTER) \ ((LETTER##_MIN_PIN > -1 && LETTER##_HOME_DIR==-1) || (LETTER##_MAX_PIN > -1 && LETTER##_HOME_DIR==1)) diff --git a/Firmware/cardreader.cpp b/Firmware/cardreader.cpp index b37b42233..59116f919 100644 --- a/Firmware/cardreader.cpp +++ b/Firmware/cardreader.cpp @@ -970,7 +970,7 @@ void CardReader::printingHasFinished() if(SD_FINISHED_STEPPERRELEASE) { //finishAndDisableSteppers(); - //enquecommand_P(PSTR(SD_FINISHED_RELEASECOMMAND)); + enquecommand_P(PSTR(SD_FINISHED_RELEASECOMMAND)); } autotempShutdown(); #ifdef SDCARD_SORT_ALPHA diff --git a/Firmware/cardreader.h b/Firmware/cardreader.h index ccc8df3f6..ec6c00728 100644 --- a/Firmware/cardreader.h +++ b/Firmware/cardreader.h @@ -74,7 +74,6 @@ public: char longFilename[LONG_FILENAME_LENGTH]; bool filenameIsDir; int lastnr; //last number of the autostart; - uint32_t sdpos; private: SdFile root,*curDir,workDir,workDirParents[MAX_DIR_DEPTH]; uint16_t workDirDepth; @@ -136,7 +135,7 @@ private: uint32_t filesize; //int16_t n; unsigned long autostart_atmillis; - //uint32_t sdpos ; + uint32_t sdpos ; bool autostart_stilltocheck; //the sd start is delayed, because otherwise the serial cannot answer fast enought to make contact with the hostsoftware.