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

Compare commits

base: wp:1.4.2
Branches Tags
wp:master
wp:1.5.4 wp:1.5.3 wp:1.5.2 wp:1.5.1 wp:1.5.0 wp:1.5.0-RC1 wp:1.5.0-beta.6 wp:1.5.0-beta.5 wp:1.5.0-beta.4 wp:1.5.0-beta.3 wp:1.5.0-beta.2 wp:1.5.0-beta.1 wp:1.4.4 wp:1.4.3 wp:1.4.2 wp:1.4.1 wp:1.4.0 wp:1.3.1 wp:1.3.0 wp:1.2.0 wp:1.1.9 wp:1.1.8 wp:1.1.7 wp:1.1.6 wp:1.1.5 wp:1.1.4 wp:1.1.3 wp:1.1.2 wp:1.1.1 wp:1.1.0 wp:1.0.6 wp:1.0.5 wp:1.0.4 wp:1.0.3-Bugfix wp:1.0.2 wp:1.0.1 wp:1.0.0
...
compare: wp:1.4.3
Branches Tags
wp:master
wp:1.5.4 wp:1.5.3 wp:1.5.2 wp:1.5.1 wp:1.5.0 wp:1.5.0-RC1 wp:1.5.0-beta.6 wp:1.5.0-beta.5 wp:1.5.0-beta.4 wp:1.5.0-beta.3 wp:1.5.0-beta.2 wp:1.5.0-beta.1 wp:1.4.4 wp:1.4.3 wp:1.4.2 wp:1.4.1 wp:1.4.0 wp:1.3.1 wp:1.3.0 wp:1.2.0 wp:1.1.9 wp:1.1.8 wp:1.1.7 wp:1.1.6 wp:1.1.5 wp:1.1.4 wp:1.1.3 wp:1.1.2 wp:1.1.1 wp:1.1.0 wp:1.0.6 wp:1.0.5 wp:1.0.4 wp:1.0.3-Bugfix wp:1.0.2 wp:1.0.1 wp:1.0.0

3 Commits
1.4.2 ... 1.4.3

Author SHA1 Message Date
Knutwurst
0440770618 Bump version for next release 2022-02-18 10:32:20 +01:00
Knutwurst
c66f3559d7 Reenable Mesh after 4 point easy level. 2022-02-18 09:57:27 +01:00
Knutwurst
1183a5b51c Fix bug, where Mesh was always applied when using 4 point easy leveling. 2022-02-18 09:53:43 +01:00
2 changed files with 5 additions and 5 deletions
Expand all files Collapse all files

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

@@ -41,10 +41,10 @@
* 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.4.2" #define CUSTOM_BUILD_VERSION "1.4.3"
#ifndef STRING_DISTRIBUTION_DATE #ifndef STRING_DISTRIBUTION_DATE
#define STRING_DISTRIBUTION_DATE "2022-02-13" #define STRING_DISTRIBUTION_DATE "2022-02-18"
#endif #endif
/** /**

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

@@ -729,7 +729,7 @@ void AnycubicTouchscreenClass::HandleSpecialMenu() {
else if ((strcasestr_P(currentTouchscreenSelection, PSTR(SM_BLTOUCH_L)) != NULL) else if ((strcasestr_P(currentTouchscreenSelection, PSTR(SM_BLTOUCH_L)) != NULL)
|| (strcasestr_P(currentTouchscreenSelection, PSTR(SM_BLTOUCH_S)) != NULL)) { || (strcasestr_P(currentTouchscreenSelection, PSTR(SM_BLTOUCH_S)) != NULL)) {
SERIAL_ECHOLNPGM("Special Menu: BLTouch Leveling"); SERIAL_ECHOLNPGM("Special Menu: BLTouch Leveling");
queue.inject_P(PSTR("G28\nG29\nM500\nG90\nM300 S440 P200\nM300 S660 P250\nM300 S880 P300\nG1 Z30 F4000\nG1 X0 F4000\nG91\nM84")); queue.inject_P(PSTR("G28\nG29\nM500\nG90\nM300 S440 P200\nM300 S660 P250\nM300 S880 P300\nG1 Z30 F4000\nG1 X0 F4000\nG91\nM84\nM420 S1"));
buzzer.tone(105, 1108); buzzer.tone(105, 1108);
buzzer.tone(210, 1661); buzzer.tone(210, 1661);
} }
@@ -850,7 +850,7 @@ void AnycubicTouchscreenClass::HandleSpecialMenu() {
|| (strcasestr_P(currentTouchscreenSelection, PSTR(SM_EZLVL_MENU_S)) != NULL)) { || (strcasestr_P(currentTouchscreenSelection, PSTR(SM_EZLVL_MENU_S)) != NULL)) {
SERIAL_ECHOLNPGM("Special Menu: Enter Easy Level Menu"); SERIAL_ECHOLNPGM("Special Menu: Enter Easy Level Menu");
LevelMenu = true; LevelMenu = true;
queue.inject_P(PSTR("G28\nG90\nG1 Z5\nG1 X15 Y15 F4000\nG1 Z0")); queue.inject_P(PSTR("G28\nM420 S0\nG90\nG1 Z5\nG1 X15 Y15 F4000\nG1 Z0"));
} }
else if ((strcasestr_P(currentTouchscreenSelection, PSTR(SM_EZLVL_P1_L)) != NULL) else if ((strcasestr_P(currentTouchscreenSelection, PSTR(SM_EZLVL_P1_L)) != NULL)
|| (strcasestr_P(currentTouchscreenSelection, PSTR(SM_EZLVL_P1_S)) != NULL)) { || (strcasestr_P(currentTouchscreenSelection, PSTR(SM_EZLVL_P1_S)) != NULL)) {
@@ -918,7 +918,7 @@ void AnycubicTouchscreenClass::HandleSpecialMenu() {
|| (strcasestr_P(currentTouchscreenSelection, PSTR(SM_EZLVL_EXIT_S)) != NULL)) { || (strcasestr_P(currentTouchscreenSelection, PSTR(SM_EZLVL_EXIT_S)) != NULL)) {
SERIAL_ECHOLNPGM("Special Menu: Exit Easy Level Menu"); SERIAL_ECHOLNPGM("Special Menu: Exit Easy Level Menu");
LevelMenu = false; LevelMenu = false;
queue.inject_P(PSTR("G90\nG1 Z10\nG1 X15 Y15 F4000")); queue.inject_P(PSTR("G90\nG1 Z10\nG1 X15 Y15 F4000\nM420 S1"));
} }
#endif #endif
} }