MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Suppress U8glib warnings on build

Browse Source
This commit is contained in:
Scott Lahteine 2018-05-23 02:25:52 -05:00
parent 0a0f2a5857
commit 25b3511241
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Marlin/ultralcd.cpp
View File

@ -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 <U8glib.h>
#pragma GCC diagnostic pop
bool drawing_screen, // = false
first_page;
#else

33
Marlin/ultralcd_impl_DOGM.h
View File

@ -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 <U8glib.h>
#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 <U8glib.h>
#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