CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make M125 work with SDSUPPORT (#12289)

Browse Source
This commit is contained in:
Scott Lahteine 2018-11-01 15:03:45 -05:00 committed by GitHub
parent f319087372
commit 42f8b6c530
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Marlin/src/gcode/feature/pause/M125.cpp
View File

@ -28,10 +28,8 @@
#include "../../parser.h" #include "../../parser.h"
#include "../../../feature/pause.h" #include "../../../feature/pause.h"
#include "../../../module/motion.h" #include "../../../module/motion.h"
#include "../../../sd/cardreader.h"
#if DISABLED(SDSUPPORT) #include "../../../module/printcounter.h"
#include "../../../module/printcounter.h"
#endif
/** /**
* M125: Store current position and move to filament change position. * M125: Store current position and move to filament change position.
@ -70,21 +68,14 @@ void GcodeSuite::M125() {
park_point.y += (active_extruder ? hotend_offset[Y_AXIS][active_extruder] : 0); park_point.y += (active_extruder ? hotend_offset[Y_AXIS][active_extruder] : 0);
#endif #endif
#if DISABLED(SDSUPPORT) const bool job_running = print_job_timer.isRunning();
const bool job_running = print_job_timer.isRunning();
#endif
if (pause_print(retract, park_point)) { if (pause_print(retract, park_point) && !IS_SD_PRINTING()) {
#if DISABLED(SDSUPPORT) wait_for_filament_reload(); // Wait for lcd click or M108
// Wait for lcd click or M108 resume_print(); // Return to print position and continue
wait_for_filament_reload();
// Return to print position and continue
resume_print();
if (job_running) print_job_timer.start();
#endif
} }
if (job_running) print_job_timer.start();
} }
#endif // PARK_HEAD_ON_PAUSE #endif // PARK_HEAD_ON_PAUSE

20
Marlin/src/sd/cardreader.h
View File

@ -19,9 +19,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#pragma once
#ifndef _CARDREADER_H_
#define _CARDREADER_H_
#include "../inc/MarlinConfig.h" #include "../inc/MarlinConfig.h"
@ -265,16 +263,14 @@ private:
#define IS_SD_INSERTED() true #define IS_SD_INSERTED() true
#endif #endif
#define IS_SD_PRINTING() card.sdprinting
#define IS_SD_FILE_OPEN() card.isFileOpen()
extern CardReader card; extern CardReader card;
#endif // SDSUPPORT #else // !SDSUPPORT
#if ENABLED(SDSUPPORT) #define IS_SD_PRINTING() false
#define IS_SD_PRINTING() card.sdprinting #define IS_SD_FILE_OPEN() false
#define IS_SD_FILE_OPEN() card.isFileOpen()
#else
#define IS_SD_PRINTING() false
#define IS_SD_FILE_OPEN() false
#endif
#endif // _CARDREADER_H_ #endif // !SDSUPPORT