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

Merge pull request #404 from stklcode/fix/chiron-regression

Browse Source 
fix regression from LCD_SERIAL migration for CHIRON targets
This commit is contained in:
Oliver Köster
2022-12-22 09:41:35 +01:00
committed by GitHub
parent bd5eba2a0c affad24f74
commit 0f75d5be1d
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Marlin/src/gcode/bedlevel/abl/G29.cpp
View File

@@ -35,10 +35,6 @@
#include "../../../module/probe.h" #include "../../../module/probe.h"
#include "../../queue.h" #include "../../queue.h"
#if ENABLED(KNUTWURST_TFT_LEVELING)
#include "../../../lcd/HardwareSerial.h"
#endif
#if ENABLED(AUTO_BED_LEVELING_LINEAR) #if ENABLED(AUTO_BED_LEVELING_LINEAR)
#include "../../../libs/least_squares_fit.h" #include "../../../libs/least_squares_fit.h"
#endif #endif
@@ -812,8 +808,7 @@ G29_TYPE GcodeSuite::G29() {
TERN_(IS_KINEMATIC, bedlevel.extrapolate_unprobed_bed_level()); TERN_(IS_KINEMATIC, bedlevel.extrapolate_unprobed_bed_level());
#if ENABLED(KNUTWURST_TFT_LEVELING) #if ENABLED(KNUTWURST_TFT_LEVELING)
HARDWARE_SERIAL_PROTOCOLPGM("J25"); // Autoleveling done! LCD_SERIAL.print("J25\r\n"); // Autoleveling done!
HARDWARE_SERIAL_ENTER();
#endif #endif
bedlevel.refresh_bed_level(); bedlevel.refresh_bed_level();

4
Marlin/src/lcd/anycubic_touchscreen.cpp
View File

@@ -1945,9 +1945,9 @@
} }
break; break;
case 30: // A30 auto leveling (Old Anycubic TFT) case 30: // A30 auto leveling (Old Anycubic TFT)
if ((planner.movesplanned()) || (card.isPrinting())) { if ((planner.movesplanned()) || (card.isPrinting()))
SENDLINE_DBG_PGM("J24", "TFT Serial Debug: Forbid auto leveling... J24"); SENDLINE_DBG_PGM("J24", "TFT Serial Debug: Forbid auto leveling... J24");
else { else
SENDLINE_DBG_PGM("J26", "TFT Serial Debug: Start auto leveling... J26"); SENDLINE_DBG_PGM("J26", "TFT Serial Debug: Start auto leveling... J26");
if (CodeSeen('S')) 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")); 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"));