Robby Candra
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
2 additions and
5 deletions
-
Marlin/src/MarlinCore.cpp
-
Marlin/src/gcode/queue.cpp
-
Marlin/src/gcode/queue.h
|
|
@ -798,7 +798,6 @@ void stop() { |
|
|
#endif |
|
|
#endif |
|
|
|
|
|
|
|
|
if (IsRunning()) { |
|
|
if (IsRunning()) { |
|
|
queue.stop(); |
|
|
|
|
|
SERIAL_ERROR_MSG(MSG_ERR_STOPPED); |
|
|
SERIAL_ERROR_MSG(MSG_ERR_STOPPED); |
|
|
LCD_MESSAGEPGM(MSG_STOPPED); |
|
|
LCD_MESSAGEPGM(MSG_STOPPED); |
|
|
safe_delay(350); // allow enough time for messages to get out before stopping
|
|
|
safe_delay(350); // allow enough time for messages to get out before stopping
|
|
|
|
|
|
@ -52,7 +52,7 @@ GCodeQueue queue; |
|
|
* sending commands to Marlin, and lines will be checked for sequentiality. |
|
|
* sending commands to Marlin, and lines will be checked for sequentiality. |
|
|
* M110 N<int> sets the current line number. |
|
|
* M110 N<int> sets the current line number. |
|
|
*/ |
|
|
*/ |
|
|
long gcode_N, GCodeQueue::last_N, GCodeQueue::stopped_N = 0; |
|
|
long gcode_N, GCodeQueue::last_N; |
|
|
|
|
|
|
|
|
/**
|
|
|
/**
|
|
|
* GCode Command Queue |
|
|
* GCode Command Queue |
|
|
|
|
|
@ -35,9 +35,7 @@ public: |
|
|
* commands to Marlin, and lines will be checked for sequentiality. |
|
|
* commands to Marlin, and lines will be checked for sequentiality. |
|
|
* M110 N<int> sets the current line number. |
|
|
* M110 N<int> sets the current line number. |
|
|
*/ |
|
|
*/ |
|
|
static long last_N, stopped_N; |
|
|
static long last_N; |
|
|
|
|
|
|
|
|
static inline void stop() { stopped_N = last_N; } |
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
/**
|
|
|
* GCode Command Queue |
|
|
* GCode Command Queue |
|
|
|
