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

Add M600 and M108 routines to display code

This commit is contained in:
David Ramiro 2019-02-15 22:58:42 +01:00
parent 1fe1842a75
commit 76b873baee
No known key found for this signature in database
GPG Key ID: 5B042737EBEEB736
2 changed files with 57 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
Marlin/AnycubicTFT.cpp
View File

@ -146,11 +146,11 @@ void AnycubicTFTClass::StartPrint(){
} }
starttime=millis(); starttime=millis();
#ifdef SDSUPPORT #ifdef SDSUPPORT
if((PausedByRunout==false)) // was that a regular pause? if((PausedByRunout==false) && (PausedByFilamentChange==false)) // was that a regular pause?
{ {
card.startFileprint(); // start or resume regularly card.startFileprint(); // start or resume regularly
} }
else // resuming from a pause that was caused by filament runout else if((PausedByRunout==true) && (PausedByFilamentChange==false)) // resuming from a pause that was caused by filament runout
{ {
enqueue_and_echo_commands_P(PSTR("M24")); // unpark nozzle and resume enqueue_and_echo_commands_P(PSTR("M24")); // unpark nozzle and resume
#ifdef ANYCUBIC_TFT_DEBUG #ifdef ANYCUBIC_TFT_DEBUG
@ -159,6 +159,17 @@ void AnycubicTFTClass::StartPrint(){
PausedByRunout=false; // clear flag PausedByRunout=false; // clear flag
#ifdef ANYCUBIC_TFT_DEBUG #ifdef ANYCUBIC_TFT_DEBUG
SERIAL_ECHOLNPGM("DEBUG: Filament Pause Flag cleared"); SERIAL_ECHOLNPGM("DEBUG: Filament Pause Flag cleared");
#endif
}
else if((PausedByRunout==false) && (PausedByFilamentChange==true)) // was M600 called?
{
FilamentChangeResume(); // enter M108 routine
#ifdef ANYCUBIC_TFT_DEBUG
SERIAL_ECHOLNPGM("DEBUG: Start M108 routine");
#endif
PausedByFilamentChange=false; // clear flag
#ifdef ANYCUBIC_TFT_DEBUG
SERIAL_ECHOLNPGM("DEBUG: Filament Change Flag cleared");
#endif #endif
} }
#endif #endif
@ -223,6 +234,25 @@ void AnycubicTFTClass::StopPrint(){
TFTstate=ANYCUBIC_TFT_STATE_SDSTOP_REQ; TFTstate=ANYCUBIC_TFT_STATE_SDSTOP_REQ;
} }
void AnycubicTFTClass::FilamentChangeResume(){
enqueue_and_echo_commands_P(PSTR("M108")); // call M108 to break out of M600 pause
HOTEND_LOOP() thermalManager.reset_heater_idle_timer(e); // resume heating if timed out
wait_for_heatup = false;
wait_for_user = false; // remove waiting flags
// TFTstate=ANYCUBIC_TFT_STATE_SDPRINT;
#ifdef ANYCUBIC_TFT_DEBUG
SERIAL_ECHOLNPGM("DEBUG: M108 Resume called");
#endif
}
void AnycubicTFTClass::FilamentChangePause(){
enqueue_and_echo_commands_P(PSTR("M600"));
TFTstate=ANYCUBIC_TFT_STATE_SDPAUSE_REQ; // set TFT state to paused
#ifdef ANYCUBIC_TFT_DEBUG
SERIAL_ECHOLNPGM("DEBUG: M600 Pause called");
#endif
}
float AnycubicTFTClass::CodeValue() float AnycubicTFTClass::CodeValue()
{ {
@ -272,12 +302,13 @@ void AnycubicTFTClass::HandleSpecialMenu()
} else if (strcmp(SelectedDirectory, "<z down 0.1>")==0) { } else if (strcmp(SelectedDirectory, "<z down 0.1>")==0) {
SERIAL_PROTOCOLLNPGM("Special Menu: Z Down 0.1"); SERIAL_PROTOCOLLNPGM("Special Menu: Z Down 0.1");
enqueue_and_echo_commands_P(PSTR("G91\nG1 Z-0.1\nG90")); enqueue_and_echo_commands_P(PSTR("G91\nG1 Z-0.1\nG90"));
} else if (strcmp(SelectedDirectory, "<m600 pause>")==0) { } else if (strcmp(SelectedDirectory, "<filament change pause>")==0) {
SERIAL_PROTOCOLLNPGM("Special Menu: M600 Pause"); SERIAL_PROTOCOLLNPGM("Special Menu: Filament Change Pause");
enqueue_and_echo_commands_P(PSTR("M600")); PausedByFilamentChange=true;
} else if (strcmp(SelectedDirectory, "<m108 resume>")==0) { FilamentChangePause();
SERIAL_PROTOCOLLNPGM("Special Menu: M108 Resume"); } else if (strcmp(SelectedDirectory, "<filament change resume>")==0) {
enqueue_and_echo_commands_P(PSTR("M108")); SERIAL_PROTOCOLLNPGM("Special Menu: Filament Change Resume");
FilamentChangeResume();
} else if (strcmp(SelectedDirectory, "<exit>")==0) { } else if (strcmp(SelectedDirectory, "<exit>")==0) {
SpecialMenu=false; SpecialMenu=false;
} }
@ -321,10 +352,10 @@ void AnycubicTFTClass::Ls()
break; break;
case 12: // Fourth Page case 12: // Fourth Page
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<M600 Pause>"); ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Filament Change Pause>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<M600 Pause>"); ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Filament Change Pause>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<M108 Resume>"); ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Filament Change Resume>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<M108 Resume>"); ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Filament Change Resume>");
break; break;
default: default:
@ -777,7 +808,8 @@ void AnycubicTFTClass::GetCommandFromTFT()
break; break;
case 13: // A13 SELECTION FILE case 13: // A13 SELECTION FILE
#ifdef SDSUPPORT #ifdef SDSUPPORT
if((!planner.movesplanned()) && (TFTstate!=ANYCUBIC_TFT_STATE_SDPAUSE) && (TFTstate!=ANYCUBIC_TFT_STATE_SDOUTAGE)) //if((!planner.movesplanned()) && (TFTstate!=ANYCUBIC_TFT_STATE_SDPAUSE) && (TFTstate!=ANYCUBIC_TFT_STATE_SDOUTAGE))
if((TFTstate!=ANYCUBIC_TFT_STATE_SDOUTAGE))
{ {
starpos = (strchr(TFTstrchr_pointer + 4,'*')); starpos = (strchr(TFTstrchr_pointer + 4,'*'));
if (TFTstrchr_pointer[4] == '/') { if (TFTstrchr_pointer[4] == '/') {

5
Marlin/AnycubicTFT.h
View File

@ -72,6 +72,8 @@ 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;
char PausedByRunout=false;
char PausedByFilamentChange=false;
struct OutageDataStruct { struct OutageDataStruct {
char OutageDataVersion; char OutageDataVersion;
@ -96,6 +98,8 @@ private:
void CheckSDCardChange(); void CheckSDCardChange();
void CheckHeaterError(); void CheckHeaterError();
void HandleSpecialMenu(); void HandleSpecialMenu();
void FilamentChangePause();
void FilamentChangeResume();
char SelectedDirectory[30]; char SelectedDirectory[30];
uint8_t SpecialMenu=false; uint8_t SpecialMenu=false;
@ -104,7 +108,6 @@ private:
char FilamentTestStatus=false; char FilamentTestStatus=false;
char FilamentTestLastStatus=false; char FilamentTestLastStatus=false;
long FilamentRunoutCounter=0; long FilamentRunoutCounter=0;
char PausedByRunout=false;
#endif #endif
}; };