From 95963121b097875d0a6bf84a94f5cc3bd6da1ad4 Mon Sep 17 00:00:00 2001 From: Scott Lahteine <github@thinkyhead.com> Date: Wed, 28 Aug 2019 08:12:18 -0500 Subject: [PATCH] Patch a u8g include --- Marlin/src/lcd/dogm/HAL_LCD_com_defines.h | 2 ++ Marlin/src/lcd/dogm/u8g_dev_st7565_64128n_HAL.cpp | 1 - Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp | 1 - .../src/lcd/dogm/u8g_dev_tft_320x240_upscale_from_128x64.cpp | 3 ++- Marlin/src/lcd/dogm/u8g_dev_uc1701_mini12864_HAL.cpp | 1 - 5 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h b/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h index 6412e59869..215ab29a2f 100644 --- a/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h +++ b/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h @@ -23,6 +23,8 @@ // Use this file to select the com driver for device drivers that are NOT in the U8G library +#include <U8glib.h> + #ifndef U8G_HAL_LINKS #ifdef __SAM3X8E__ diff --git a/Marlin/src/lcd/dogm/u8g_dev_st7565_64128n_HAL.cpp b/Marlin/src/lcd/dogm/u8g_dev_st7565_64128n_HAL.cpp index c1961117c4..8db341293a 100644 --- a/Marlin/src/lcd/dogm/u8g_dev_st7565_64128n_HAL.cpp +++ b/Marlin/src/lcd/dogm/u8g_dev_st7565_64128n_HAL.cpp @@ -58,7 +58,6 @@ #if HAS_GRAPHICAL_LCD #include <U8glib.h> - #include "HAL_LCD_com_defines.h" #define WIDTH 128 diff --git a/Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp b/Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp index 71c8efd500..75bb4bf95c 100644 --- a/Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp +++ b/Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp @@ -58,7 +58,6 @@ #if HAS_GRAPHICAL_LCD #include <U8glib.h> - #include "HAL_LCD_com_defines.h" #define LCD_PIXEL_WIDTH 128 diff --git a/Marlin/src/lcd/dogm/u8g_dev_tft_320x240_upscale_from_128x64.cpp b/Marlin/src/lcd/dogm/u8g_dev_tft_320x240_upscale_from_128x64.cpp index dfd327e2a1..74e767fa3f 100644 --- a/Marlin/src/lcd/dogm/u8g_dev_tft_320x240_upscale_from_128x64.cpp +++ b/Marlin/src/lcd/dogm/u8g_dev_tft_320x240_upscale_from_128x64.cpp @@ -59,8 +59,9 @@ #if HAS_GRAPHICAL_LCD && PIN_EXISTS(FSMC_CS) -#include "U8glib.h" +#include <U8glib.h> #include "HAL_LCD_com_defines.h" + #include <string.h> #if ENABLED(LCD_USE_DMA_FSMC) diff --git a/Marlin/src/lcd/dogm/u8g_dev_uc1701_mini12864_HAL.cpp b/Marlin/src/lcd/dogm/u8g_dev_uc1701_mini12864_HAL.cpp index e7750b4ac4..20b6a24891 100644 --- a/Marlin/src/lcd/dogm/u8g_dev_uc1701_mini12864_HAL.cpp +++ b/Marlin/src/lcd/dogm/u8g_dev_uc1701_mini12864_HAL.cpp @@ -58,7 +58,6 @@ #if HAS_GRAPHICAL_LCD #include <U8glib.h> - #include "HAL_LCD_com_defines.h" #define WIDTH 128 -- GitLab