bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

🚸 JyersUI updates (#24451)

Browse Source
This commit is contained in:
Meilleur Gars
2022-07-06 13:46:11 -07:00
committed by Scott Lahteine
parent 03760fd79e
commit e93a1dd2fa
32 changed files with 4336 additions and 984 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Marlin/src/inc/Conditionals_LCD.h
View File

@ -1256,6 +1256,8 @@
#endif
#if ANY(AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_3POINT)
#define HAS_ABL_NOT_UBL 1
#else
#undef PROBE_MANUALLY
#endif
#if ANY(AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_UBL, MESH_BED_LEVELING)
#define HAS_MESH 1
@ -1274,14 +1276,11 @@
#if DISABLED(AUTO_BED_LEVELING_UBL)
#define PLANNER_LEVELING 1
#endif
#endif
#if !HAS_LEVELING
#else
#undef RESTORE_LEVELING_AFTER_G28
#undef ENABLE_LEVELING_AFTER_G28
#undef G29_RETRY_AND_RECOVER
#endif
#if !HAS_LEVELING || EITHER(MESH_BED_LEVELING, AUTO_BED_LEVELING_UBL)
#undef PROBE_MANUALLY
#undef PREHEAT_BEFORE_LEVELING
#endif
#if ANY(HAS_BED_PROBE, PROBE_MANUALLY, MESH_BED_LEVELING)
#define PROBE_SELECTED 1

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

@ -3541,7 +3541,7 @@
#ifndef MESH_MAX_Y
#define MESH_MAX_Y _MESH_MAX_Y
#endif
#else
#elif DISABLED(DWIN_CREALITY_LCD_JYERSUI)
#undef MESH_MIN_X
#undef MESH_MIN_Y
#undef MESH_MAX_X

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

@ -3671,7 +3671,7 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
#error "A very large BLOCK_BUFFER_SIZE is not needed and takes longer to drain the buffer on pause / cancel."
#endif
#if ENABLED(LED_CONTROL_MENU) && NONE(HAS_MARLINUI_MENU, DWIN_LCD_PROUI)
#if ENABLED(LED_CONTROL_MENU) && NONE(HAS_MARLINUI_MENU, DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI)
#error "LED_CONTROL_MENU requires an LCD controller that implements the menu."
#endif