From a6485456dfd7592233b95d262813bc2aa2661754 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 8 Apr 2018 03:20:33 -0500 Subject: [PATCH] Fix LIGHTWEIGHT_UI with UBL See https://github.com/MarlinFirmware/Marlin/issues/10317#issuecomment-379100702 --- Marlin/src/lcd/dogm/status_screen_DOGM.h | 6 ------ Marlin/src/lcd/ultralcd_impl_DOGM.h | 2 ++ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.h b/Marlin/src/lcd/dogm/status_screen_DOGM.h index 478cbf846..d4856fb8e 100644 --- a/Marlin/src/lcd/dogm/status_screen_DOGM.h +++ b/Marlin/src/lcd/dogm/status_screen_DOGM.h @@ -300,12 +300,6 @@ static void lcd_implementation_status_screen() { // XYZ Coordinates // - #if ENABLED(USE_SMALL_INFOFONT) - #define INFO_FONT_HEIGHT 7 - #else - #define INFO_FONT_HEIGHT 8 - #endif - #define XYZ_BASELINE (30 + INFO_FONT_HEIGHT) #define X_LABEL_POS 3 diff --git a/Marlin/src/lcd/ultralcd_impl_DOGM.h b/Marlin/src/lcd/ultralcd_impl_DOGM.h index f4f6f2ce8..5917ec310 100644 --- a/Marlin/src/lcd/ultralcd_impl_DOGM.h +++ b/Marlin/src/lcd/ultralcd_impl_DOGM.h @@ -74,8 +74,10 @@ #if ENABLED(USE_SMALL_INFOFONT) #include "dogm/dogm_font_data_6x9_marlin.h" #define FONT_STATUSMENU_NAME u8g_font_6x9 + #define INFO_FONT_HEIGHT 7 #else #define FONT_STATUSMENU_NAME FONT_MENU_NAME + #define INFO_FONT_HEIGHT 8 #endif #include "dogm/dogm_font_data_Marlin_symbols.h" // The Marlin special symbols