wp/Marlin-2-0-x-Anycubic-i3-MEGA-S
1
0
Fork 0
Code Issues 28 Pull Requests 2 Actions Packages Projects Releases 30 Wiki Activity

Add new mediaPrintingState for probing, which is needed by the chiron routine.

Browse Source
This commit is contained in:
Knutwurst
2023-06-02 16:48:10 +02:00
parent 37ef0ca742
commit ff5b808dea
2 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Marlin/src/lcd/extui/knutwurst/anycubic_touchscreen.cpp
View File

@@ -1565,13 +1565,16 @@ void AnycubicTouchscreenClass::RenderCurrentFolder(uint16_t selectedNumber) {
} }
break; break;
case 30: // A30 auto leveling (Old Anycubic TFT) case 30: // A30 auto leveling (Old Anycubic TFT)
if (isPrinting()) if (CodeSeen('S')) {
SENDLINE_DBG_PGM("J24", "TFT Serial Debug: Forbid auto leveling... J24"); if (isPrinting()) {
else SENDLINE_DBG_PGM("J24", "TFT Serial Debug: Forbid auto leveling... J24");
SENDLINE_DBG_PGM("J26", "TFT Serial Debug: Start auto leveling... J26"); } else {
if (CodeSeen('S')) SENDLINE_DBG_PGM("J26", "TFT Serial Debug: Start auto leveling... J26");
injectCommands(F("G28\nG29\nM500\nG90\nM300 S440 P200\nM300 S660 P250\nM300 S880 P300\nG1 Z30 F4000\nG1 X0 F4000\nG91\nM84")); injectCommands(F("G28\nG29"));
mediaPrintingState = AMPRINTSTATE_PROBING;
}
}
break; break;
case 31: // A31 z-offset case 31: // A31 z-offset
@@ -1589,7 +1592,9 @@ void AnycubicTouchscreenClass::RenderCurrentFolder(uint16_t selectedNumber) {
if (!isPrinting()) { if (!isPrinting()) {
setAxisPosition_mm(1.0,Z); // Lift nozzle before any further movements are made setAxisPosition_mm(1.0,Z); // Lift nozzle before any further movements are made
injectCommands(F("M500")); injectCommands(F("M500"));
SERIAL_ECHOLNF(F("Mesh changes saved.")); #if ENABLED(ANYCUBIC_TFT_DEBUG)
SERIAL_ECHOLNF(F("Mesh changes saved."));
#endif
selectedmeshpoint.x = selectedmeshpoint.y = 99; selectedmeshpoint.x = selectedmeshpoint.y = 99;
} }
} }
@@ -1690,7 +1695,7 @@ void AnycubicTouchscreenClass::RenderCurrentFolder(uint16_t selectedNumber) {
SERIAL_ECHOLNPGM("from ", currmesh, " to ", newval); SERIAL_ECHOLNPGM("from ", currmesh, " to ", newval);
#endif #endif
setMeshPoint(pos,newval); setMeshPoint(pos,newval);
if (!isPrinting()) { if (mediaPrintingState == AMPRINTSTATE_NOT_PRINTING || mediaPrintingState == AMPRINTSTATE_PROBING/*!isPrinting()*/) {
// if we are at the current mesh point indicated on the panel Move Z pos +/- 0.05mm // if we are at the current mesh point indicated on the panel Move Z pos +/- 0.05mm
// (The panel changes the mesh value by +/- 0.05mm on each button press) // (The panel changes the mesh value by +/- 0.05mm on each button press)
if (selectedmeshpoint.x == pos.x && selectedmeshpoint.y == pos.y) { if (selectedmeshpoint.x == pos.x && selectedmeshpoint.y == pos.y) {
@@ -1718,13 +1723,8 @@ void AnycubicTouchscreenClass::RenderCurrentFolder(uint16_t selectedNumber) {
break; break;
case 36: // A36 auto leveling (New Anycubic TFT) case 36: // A36 auto leveling (New Anycubic TFT)
if (isPrinting()) SENDLINE_DBG_PGM("J26", "TFT Serial Debug: Start auto leveling... J26");
SENDLINE_DBG_PGM("J24", "TFT Serial Debug: Forbid auto leveling... J24"); break;
else
SENDLINE_DBG_PGM("J26", "TFT Serial Debug: Start auto leveling... J26");
if (CodeSeen('S'))
queue.enqueue_now_P(PSTR("G28\nG29\nM500\nG90\nM300 S440 P200\nM300 S660 P250\nM300 S880 P300\nG1 Z30 F4000\nG1 X0 F4000\nG91\nM84"));
#endif // if ENABLED(KNUTWURST_TFT_LEVELING) #endif // if ENABLED(KNUTWURST_TFT_LEVELING)
#if ENABLED(KNUTWURST_4MAXP2) #if ENABLED(KNUTWURST_4MAXP2)

3
Marlin/src/lcd/extui/knutwurst/anycubic_touchscreen.h
View File

@@ -41,7 +41,8 @@ enum AnycubicMediaPrintState {
AMPRINTSTATE_PRINTING, AMPRINTSTATE_PRINTING,
AMPRINTSTATE_PAUSE_REQUESTED, AMPRINTSTATE_PAUSE_REQUESTED,
AMPRINTSTATE_PAUSED, AMPRINTSTATE_PAUSED,
AMPRINTSTATE_STOP_REQUESTED AMPRINTSTATE_STOP_REQUESTED,
AMPRINTSTATE_PROBING
}; };
enum AnycubicMediaPauseState { enum AnycubicMediaPauseState {