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

10
Marlin/Configuration.h
View File

@@ -1130,10 +1130,8 @@
* Use G29 repeatedly, adjusting the Z height at each point with movement commands * Use G29 repeatedly, adjusting the Z height at each point with movement commands
* or (with LCD_BED_LEVELING) the LCD controller. * or (with LCD_BED_LEVELING) the LCD controller.
*/ */
#if DISABLED(KNUTWURST_BLTOUCH) #if NONE(KNUTWURST_BLTOUCH, KNUTWURST_TFT_LEVELING)
#if DISABLED(KNUTWURST_TFT_LEVELING) #define PROBE_MANUALLY
#define PROBE_MANUALLY
#endif
#endif #endif
//#define MANUAL_PROBE_START_Z 0.2 //#define MANUAL_PROBE_START_Z 0.2
@@ -1652,7 +1650,7 @@
* leveling in steps so you can manually adjust the Z height at each grid-point. * leveling in steps so you can manually adjust the Z height at each grid-point.
* With an LCD controller the process is guided step-by-step. * With an LCD controller the process is guided step-by-step.
*/ */
#if ANY(KNUTWURST_BLTOUCH, KNUTWURST_TFT_LEVELING) #if EITHER(KNUTWURST_BLTOUCH, KNUTWURST_TFT_LEVELING)
//#define AUTO_BED_LEVELING_3POINT //#define AUTO_BED_LEVELING_3POINT
//#define AUTO_BED_LEVELING_LINEAR //#define AUTO_BED_LEVELING_LINEAR
#define AUTO_BED_LEVELING_BILINEAR #define AUTO_BED_LEVELING_BILINEAR
@@ -1831,7 +1829,7 @@
#define HOMING_FEEDRATE_Z (4*60) #define HOMING_FEEDRATE_Z (4*60)
#endif #endif
#if ANY(KNUTWURST_MEGA_X, KNUTWURST_CHIRON) #if EITHER(KNUTWURST_MEGA_X, KNUTWURST_CHIRON)
// Homing speeds (mm/m) // Homing speeds (mm/m)
#define HOMING_FEEDRATE_XY (40*60) #define HOMING_FEEDRATE_XY (40*60)
#define HOMING_FEEDRATE_Z (6*60) #define HOMING_FEEDRATE_Z (6*60)

8
Marlin/Configuration_adv.h
View File

@@ -1579,10 +1579,10 @@
#if EITHER(MESH_BED_LEVELING, AUTO_BED_LEVELING_UBL) #if EITHER(MESH_BED_LEVELING, AUTO_BED_LEVELING_UBL)
// Override the mesh area if the automatic (max) area is too large // Override the mesh area if the automatic (max) area is too large
#define MESH_MIN_X MESH_INSET //#define MESH_MIN_X MESH_INSET
#define MESH_MIN_Y MESH_INSET //#define MESH_MIN_Y MESH_INSET
#define MESH_MAX_X X_BED_SIZE - (MESH_INSET) //#define MESH_MAX_X X_BED_SIZE - (MESH_INSET)
#define MESH_MAX_Y Y_BED_SIZE - (MESH_INSET) //#define MESH_MAX_Y Y_BED_SIZE - (MESH_INSET)
#endif #endif
/** /**

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.2.0-beta.1" #define CUSTOM_BUILD_VERSION "1.2.0-b1hotfix1"
#ifndef STRING_DISTRIBUTION_DATE #ifndef STRING_DISTRIBUTION_DATE
#define STRING_DISTRIBUTION_DATE "2021-04-18" #define STRING_DISTRIBUTION_DATE "2021-04-21"
#endif #endif
/** /**

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

@@ -662,7 +662,7 @@ void AnycubicTouchscreenClass::HandleSpecialMenu()
} }
#endif #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) 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))
{ {
@@ -937,7 +937,7 @@ void AnycubicTouchscreenClass::PrintList()
break; break;
#endif #endif
#if ANY(KNUTWURST_BLTOUCH, KNUTWURST_TFT_LEVELING) #if EITHER(KNUTWURST_BLTOUCH, KNUTWURST_TFT_LEVELING)
case 4: // Page 2 case 4: // Page 2
HARDWARE_SERIAL_PROTOCOLLNPGM(SM_EZLVL_MENU_S); HARDWARE_SERIAL_PROTOCOLLNPGM(SM_EZLVL_MENU_S);
HARDWARE_SERIAL_PROTOCOLLNPGM(SM_EZLVL_MENU_L); HARDWARE_SERIAL_PROTOCOLLNPGM(SM_EZLVL_MENU_L);