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

cardreader - new member "paused" 

tmc2130 - decreased crash sensitivity for Y
This commit is contained in:
Robert Pelnar 2018-01-31 15:20:27 +01:00 committed by PavelSindler
parent 88f8faaaec
commit 9ab6fbe3df
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Firmware/cardreader.cpp
View File

@ -24,6 +24,7 @@ CardReader::CardReader()
sdpos = 0; sdpos = 0;
sdprinting = false; sdprinting = false;
cardOK = false; cardOK = false;
paused = false;
saving = false; saving = false;
logging = false; logging = false;
autostart_atmillis=0; autostart_atmillis=0;
@ -243,9 +244,10 @@ void CardReader::startFileprint()
if(cardOK) if(cardOK)
{ {
sdprinting = true; sdprinting = true;
#ifdef SDCARD_SORT_ALPHA paused = false;
// flush_presort(); #ifdef SDCARD_SORT_ALPHA
#endif //flush_presort();
#endif
} }
} }
@ -254,6 +256,7 @@ void CardReader::pauseSDPrint()
if(sdprinting) if(sdprinting)
{ {
sdprinting = false; sdprinting = false;
paused = true;
} }
} }
@ -327,6 +330,7 @@ void CardReader::openFile(char* name,bool read, bool replace_current/*=true*/)
SERIAL_ECHOLN(name); SERIAL_ECHOLN(name);
} }
sdprinting = false; sdprinting = false;
paused = false;
SdFile myDir; SdFile myDir;

1
Firmware/cardreader.h
View File

@ -73,6 +73,7 @@ public:
bool logging; bool logging;
bool sdprinting ; bool sdprinting ;
bool cardOK ; bool cardOK ;
bool paused ;
char filename[13]; char filename[13];
uint16_t creationTime, creationDate; uint16_t creationTime, creationDate;
uint32_t cluster, position; uint32_t cluster, position;