From 9ab6fbe3df3241886a2d0c33bbda9a573e006826 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Wed, 31 Jan 2018 15:20:27 +0100 Subject: [PATCH] cardreader - new member "paused" tmc2130 - decreased crash sensitivity for Y --- Firmware/cardreader.cpp | 10 +++++++--- Firmware/cardreader.h | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Firmware/cardreader.cpp b/Firmware/cardreader.cpp index bef12a130..6e6db946a 100644 --- a/Firmware/cardreader.cpp +++ b/Firmware/cardreader.cpp @@ -24,6 +24,7 @@ CardReader::CardReader() sdpos = 0; sdprinting = false; cardOK = false; + paused = false; saving = false; logging = false; autostart_atmillis=0; @@ -243,9 +244,10 @@ void CardReader::startFileprint() if(cardOK) { sdprinting = true; - #ifdef SDCARD_SORT_ALPHA - // flush_presort(); - #endif + paused = false; + #ifdef SDCARD_SORT_ALPHA + //flush_presort(); + #endif } } @@ -254,6 +256,7 @@ void CardReader::pauseSDPrint() if(sdprinting) { sdprinting = false; + paused = true; } } @@ -327,6 +330,7 @@ void CardReader::openFile(char* name,bool read, bool replace_current/*=true*/) SERIAL_ECHOLN(name); } sdprinting = false; + paused = false; SdFile myDir; diff --git a/Firmware/cardreader.h b/Firmware/cardreader.h index 3ce327d62..e00dc3a77 100644 --- a/Firmware/cardreader.h +++ b/Firmware/cardreader.h @@ -73,6 +73,7 @@ public: bool logging; bool sdprinting ; bool cardOK ; + bool paused ; char filename[13]; uint16_t creationTime, creationDate; uint32_t cluster, position;