3d-print/anadyr-marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Apply composite tests

Browse Source
This commit is contained in:
Scott Lahteine
2020-04-23 21:42:38 -05:00
parent 55d66fb897
commit ab2b98e425
53 changed files with 103 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/MarlinCore.cpp
View File

@@ -466,7 +466,7 @@ inline void manage_inactivity(const bool ignore_stepper_queue=false) {
if (ENABLED(DISABLE_INACTIVE_Y)) DISABLE_AXIS_Y();
if (ENABLED(DISABLE_INACTIVE_Z)) DISABLE_AXIS_Z();
if (ENABLED(DISABLE_INACTIVE_E)) disable_e_steppers();
#if HAS_LCD_MENU && ENABLED(AUTO_BED_LEVELING_UBL)
#if BOTH(HAS_LCD_MENU, AUTO_BED_LEVELING_UBL)
if (ubl.lcd_map_control) {
ubl.lcd_map_control = false;
ui.defer_status_screen(false);
@@ -943,7 +943,7 @@ void setup() {
SETUP_RUN(ui.init());
SETUP_RUN(ui.reset_status()); // Load welcome message early. (Retained if no errors exist.)
#if HAS_SPI_LCD && ENABLED(SHOW_BOOTSCREEN)
#if BOTH(HAS_SPI_LCD, SHOW_BOOTSCREEN)
SETUP_RUN(ui.show_bootscreen());
#endif