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

Hotfix for BLTouch on Mega S and Mega X.

Browse Source
This commit is contained in:
Knutwurst
2021-04-21 11:12:34 +02:00
parent f2f1d6213a
commit d7a11222a8
4 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File 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
* version was tagged.
*/
#define CUSTOM_BUILD_VERSION "1.2.0-beta.1"
#define CUSTOM_BUILD_VERSION "1.2.0-b1hotfix1"
#ifndef STRING_DISTRIBUTION_DATE
#define STRING_DISTRIBUTION_DATE "2021-04-18"
#define STRING_DISTRIBUTION_DATE "2021-04-21"
#endif
/**

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

@@ -662,7 +662,7 @@ void AnycubicTouchscreenClass::HandleSpecialMenu()
}
#endif
#if ANY(KNUTWURST_BLTOUCH, KNUTWURST_TFT_LEVELING)
#if EITHER(KNUTWURST_BLTOUCH, KNUTWURST_TFT_LEVELING)
else if ((strcasestr_P(currentTouchscreenSelection, PSTR(SM_BLTOUCH_L)) != NULL)
|| (strcasestr_P(currentTouchscreenSelection, PSTR(SM_BLTOUCH_S)) != NULL))
{
@@ -937,7 +937,7 @@ void AnycubicTouchscreenClass::PrintList()
break;
#endif
#if ANY(KNUTWURST_BLTOUCH, KNUTWURST_TFT_LEVELING)
#if EITHER(KNUTWURST_BLTOUCH, KNUTWURST_TFT_LEVELING)
case 4: // Page 2
HARDWARE_SERIAL_PROTOCOLLNPGM(SM_EZLVL_MENU_S);
HARDWARE_SERIAL_PROTOCOLLNPGM(SM_EZLVL_MENU_L);