wp
/
Marlin-Ai3M
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev'

This commit is contained in:
David Ramiro 2019-02-18 19:35:21 +01:00
parent 078678d434 b447245ddd
commit afcdb69cee
No known key found for this signature in database
GPG Key ID: 5B042737EBEEB736
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/AnycubicTFT.h
View File

@ -55,6 +55,9 @@ public:
void HeatingStart(); void HeatingStart();
void FilamentRunout(); void FilamentRunout();
void KillTFT(); void KillTFT();
char TFTstate=ANYCUBIC_TFT_STATE_IDLE;
bool PausedByRunout=false;
bool PausedByFilamentChange=false;
private: private:
char TFTcmdbuffer[TFTBUFSIZE][TFT_MAX_CMD_SIZE]; char TFTcmdbuffer[TFTBUFSIZE][TFT_MAX_CMD_SIZE];
@ -64,7 +67,6 @@ private:
char serial3_char; char serial3_char;
int serial3_count = 0; int serial3_count = 0;
char *TFTstrchr_pointer; char *TFTstrchr_pointer;
char TFTstate=ANYCUBIC_TFT_STATE_IDLE;
char FlagResumFromOutage=0; char FlagResumFromOutage=0;
uint16_t filenumber=0; uint16_t filenumber=0;
unsigned long starttime=0; unsigned long starttime=0;
@ -72,8 +74,6 @@ private:
uint8_t tmp_extruder=0; uint8_t tmp_extruder=0;
char LastSDstatus=0; char LastSDstatus=0;
uint16_t HeaterCheckCount=0; uint16_t HeaterCheckCount=0;
bool PausedByRunout=false;
bool PausedByFilamentChange=false;
struct OutageDataStruct { struct OutageDataStruct {
char OutageDataVersion; char OutageDataVersion;

6
Marlin/Marlin_main.cpp
View File

@ -10992,6 +10992,12 @@ inline void gcode_M502() {
* Default values are used for omitted arguments. * Default values are used for omitted arguments.
*/ */
inline void gcode_M600() { inline void gcode_M600() {
#ifdef SDSUPPORT
if ((AnycubicTFT.TFTstate==ANYCUBIC_TFT_STATE_SDPRINT)){
AnycubicTFT.TFTstate=ANYCUBIC_TFT_STATE_SDPAUSE_REQ;
AnycubicTFT.PausedByFilamentChange=true;
}
#endif
point_t park_point = NOZZLE_PARK_POINT; point_t park_point = NOZZLE_PARK_POINT;
if (get_target_extruder_from_command(600)) return; if (get_target_extruder_from_command(600)) return;