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

Only home X after G29, play some beeping tones and save eeprom automatically. Also bump version for next release.

Browse Source
This commit is contained in:
Knutwurst
2021-06-21 15:48:48 +02:00
parent 955b3aa21b
commit 00155509a3
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,7 +36,7 @@
#include "../../../module/probe.h" #include "../../../module/probe.h"
#include "../../queue.h" #include "../../queue.h"
#ifdef KNUTWURST_TFT_LEVELING #if ENABLED(KNUTWURST_TFT_LEVELING)
#include "../../../lcd/HardwareSerial.h" #include "../../../lcd/HardwareSerial.h"
#endif #endif

2
Marlin/src/inc/Version.h
View File

@@ -41,7 +41,7 @@
* here we define this default string as the date where the latest release * here we define this default string as the date where the latest release
* version was tagged. * version was tagged.
*/ */
#define CUSTOM_BUILD_VERSION "1.2.0-b_4.10" #define CUSTOM_BUILD_VERSION "1.2.0-beta.5"
#ifndef STRING_DISTRIBUTION_DATE #ifndef STRING_DISTRIBUTION_DATE
#define STRING_DISTRIBUTION_DATE "2021-06-21" #define STRING_DISTRIBUTION_DATE "2021-06-21"

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

@@ -24,13 +24,17 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "../module/configuration_store.h"
#include "../gcode/queue.h" #include "../gcode/queue.h"
#include "../gcode/parser.h" #include "../gcode/parser.h"
#include "../feature/e_parser.h" #include "../feature/e_parser.h"
#include "../feature/pause.h" #include "../feature/pause.h"
#include "../feature/bedlevel/bedlevel.h" #include "../module/configuration_store.h"
#include "../feature/bedlevel/abl/abl.h"
#if ENABLED(KNUTWURST_TFT_LEVELING)
#include "../feature/bedlevel/bedlevel.h"
#include "../feature/bedlevel/abl/abl.h"
#endif
#include "../libs/buzzer.h" #include "../libs/buzzer.h"
#include "../module/planner.h" #include "../module/planner.h"
#include "../module/printcounter.h" #include "../module/printcounter.h"
@@ -2054,7 +2058,7 @@ void AnycubicTouchscreenClass::GetCommandFromTFT()
HARDWARE_SERIAL_ENTER(); HARDWARE_SERIAL_ENTER();
} }
if(CodeSeen('S') ) { if(CodeSeen('S') ) {
queue.enqueue_now_P(PSTR("G28\nG29\nG28")); 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"));
} }
break; break;
case 31: // A31 z-offset case 31: // A31 z-offset
@@ -2140,7 +2144,7 @@ void AnycubicTouchscreenClass::GetCommandFromTFT()
HARDWARE_SERIAL_ENTER(); HARDWARE_SERIAL_ENTER();
} }
if(CodeSeen('S') ) { if(CodeSeen('S') ) {
queue.enqueue_now_P(PSTR("G28\nG29\nG28")); 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 #endif