3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #3467 from gudnimg/autostart_stilltocheck-optimisation

Browse source 
Optimise `autostart_stilltocheck` variable
This commit is contained in:
Alex Voinea 2022-04-21 13:57:02 +02:00 committed by GitHub
commit a4887b542f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Firmware/cardreader.cpp
View file

@ -30,7 +30,6 @@ CardReader::CardReader()
memset(workDirParents, 0, sizeof(workDirParents)); memset(workDirParents, 0, sizeof(workDirParents));
presort_flag = false; presort_flag = false;
autostart_stilltocheck=true; //the SD start is delayed, because otherwise the serial cannot answer fast enough to make contact with the host software.
lastnr=0; lastnr=0;
//power to SD reader //power to SD reader
#if SDPOWER > -1 #if SDPOWER > -1
@ -614,6 +613,9 @@ void CardReader::write_command_no_newline(char *buf)
void CardReader::checkautostart(bool force) void CardReader::checkautostart(bool force)
{ {
// The SD start is delayed because otherwise the serial cannot answer
// fast enough to make contact with the host software.
static bool autostart_stilltocheck = true;
if(!force) if(!force)
{ {
if(!autostart_stilltocheck) if(!autostart_stilltocheck)
@ -621,7 +623,7 @@ void CardReader::checkautostart(bool force)
if(autostart_atmillis.expired(5000)) if(autostart_atmillis.expired(5000))
return; return;
} }
autostart_stilltocheck=false; autostart_stilltocheck = false;
if(!cardOK) if(!cardOK)
{ {
initsd(); initsd();

2
Firmware/cardreader.h
View file

@ -133,8 +133,6 @@ private:
ShortTimer autostart_atmillis; ShortTimer 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.
uint16_t nrFiles; //counter for the files in the current directory and recycled as position counter for getting the nrFiles'th name in the directory. uint16_t nrFiles; //counter for the files in the current directory and recycled as position counter for getting the nrFiles'th name in the directory.
bool diveSubfolder (const char *&fileName); bool diveSubfolder (const char *&fileName);