From 25b351124169e5e82ddbf5ec94cd42a6f81f4bea Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 23 May 2018 02:25:52 -0500 Subject: [PATCH] Suppress U8glib warnings on build --- Marlin/ultralcd.cpp | 3 +++ Marlin/ultralcd_impl_DOGM.h | 33 ++++++++++++++++++--------------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index 273b4d5bd..22a0ba2c9 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -94,7 +94,10 @@ uint8_t lcd_status_update_delay = 1, // First update one loop delayed #if ENABLED(DOGLCD) #include "ultralcd_impl_DOGM.h" + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wuninitialized" #include + #pragma GCC diagnostic pop bool drawing_screen, // = false first_page; #else diff --git a/Marlin/ultralcd_impl_DOGM.h b/Marlin/ultralcd_impl_DOGM.h index b39bb3a1f..59a88198c 100644 --- a/Marlin/ultralcd_impl_DOGM.h +++ b/Marlin/ultralcd_impl_DOGM.h @@ -33,31 +33,26 @@ * License: http://opensource.org/licenses/BSD-3-Clause */ +/** + * Implementation of the LCD display routines for a DOGM128 graphic display. + * These are common LCD 128x64 pixel graphic displays. + */ + #ifndef ULTRALCD_IMPL_DOGM_H #define ULTRALCD_IMPL_DOGM_H #include "MarlinConfig.h" -/** - * Implementation of the LCD display routines for a DOGM128 graphic display. - * These are common LCD 128x64 pixel graphic displays. - */ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wuninitialized" +#include +#pragma GCC diagnostic pop + #include "ultralcd.h" - -#if ENABLED(U8GLIB_ST7920) - #include "ultralcd_st7920_u8glib_rrd.h" -#endif - -#if ENABLED(U8GLIB_ST7565_64128N) - #include "ultralcd_st7565_u8glib_VIKI.h" -#endif - #include "dogm_bitmaps.h" #include "utility.h" #include "duration_t.h" -#include - #if ENABLED(AUTO_BED_LEVELING_UBL) #include "ubl.h" #endif @@ -68,6 +63,14 @@ #undef USE_SMALL_INFOFONT #endif +#if ENABLED(U8GLIB_ST7920) + #include "ultralcd_st7920_u8glib_rrd.h" +#endif + +#if ENABLED(U8GLIB_ST7565_64128N) + #include "ultralcd_st7565_u8glib_VIKI.h" +#endif + #if ENABLED(USE_SMALL_INFOFONT) #include "dogm_font_data_6x9_marlin.h" #define FONT_STATUSMENU_NAME u8g_font_6x9