melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3908 from jbrazio/bugfix/3826

Browse Source 
Closes #3826: SD printing will now pause and stop the print counter
This commit is contained in:
Scott Lahteine 2016-05-30 00:08:57 -07:00
commit 3861f1e0da
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/printcounter.cpp
View File

@ -86,7 +86,7 @@ void PrintCounter::showStats() {
SERIAL_ECHOPGM(", Failed: ");
SERIAL_ECHO(this->data.totalPrints - this->data.finishedPrints
- (this->isRunning() || this->isPaused()) ? 1 : 0); // Removes 1 from failures with an active counter
- ((this->isRunning() || this->isPaused()) ? 1 : 0)); // Removes 1 from failures with an active counter
uint32_t t = this->data.printTime /60;
SERIAL_ECHOPGM(", Total print time: ");

11
Marlin/ultralcd.cpp
View File

@ -470,14 +470,21 @@ inline void line_to_current(AxisEnum axis) {
#if ENABLED(SDSUPPORT)
static void lcd_sdcard_pause() { card.pauseSDPrint(); }
static void lcd_sdcard_pause() {
card.pauseSDPrint();
print_job_timer.pause();
}
static void lcd_sdcard_resume() { card.startFileprint(); }
static void lcd_sdcard_resume() {
card.startFileprint();
print_job_timer.start();
}
static void lcd_sdcard_stop() {
stepper.quick_stop();
card.sdprinting = false;
card.closefile();
print_job_timer.stop();
thermalManager.autotempShutdown();
cancel_heatup = true;
lcd_setstatus(MSG_PRINT_ABORTED, true);