josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reverting few changes,

This commit is contained in:
PavelSindler 2017-09-11 17:31:06 +02:00
parent fe04b9f467
commit 26cd35a8cb
3 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Firmware/Marlin_main.cpp
View File

@ -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() void get_command()
{ {
// Test and reserve space for the new command string. // 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 #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) { void homeaxis(int axis) {
#define HOMEAXIS_DO(LETTER) \ #define HOMEAXIS_DO(LETTER) \
((LETTER##_MIN_PIN > -1 && LETTER##_HOME_DIR==-1) || (LETTER##_MAX_PIN > -1 && LETTER##_HOME_DIR==1)) ((LETTER##_MIN_PIN > -1 && LETTER##_HOME_DIR==-1) || (LETTER##_MAX_PIN > -1 && LETTER##_HOME_DIR==1))

2
Firmware/cardreader.cpp
View File

@ -970,7 +970,7 @@ void CardReader::printingHasFinished()
if(SD_FINISHED_STEPPERRELEASE) if(SD_FINISHED_STEPPERRELEASE)
{ {
//finishAndDisableSteppers(); //finishAndDisableSteppers();
//enquecommand_P(PSTR(SD_FINISHED_RELEASECOMMAND)); enquecommand_P(PSTR(SD_FINISHED_RELEASECOMMAND));
} }
autotempShutdown(); autotempShutdown();
#ifdef SDCARD_SORT_ALPHA #ifdef SDCARD_SORT_ALPHA

3
Firmware/cardreader.h
View File

@ -74,7 +74,6 @@ public:
char longFilename[LONG_FILENAME_LENGTH]; char longFilename[LONG_FILENAME_LENGTH];
bool filenameIsDir; bool filenameIsDir;
int lastnr; //last number of the autostart; int lastnr; //last number of the autostart;
uint32_t sdpos;
private: private:
SdFile root,*curDir,workDir,workDirParents[MAX_DIR_DEPTH]; SdFile root,*curDir,workDir,workDirParents[MAX_DIR_DEPTH];
uint16_t workDirDepth; uint16_t workDirDepth;
@ -136,7 +135,7 @@ private:
uint32_t filesize; uint32_t filesize;
//int16_t n; //int16_t n;
unsigned long autostart_atmillis; 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. bool autostart_stilltocheck; //the sd start is delayed, because otherwise the serial cannot answer fast enought to make contact with the hostsoftware.