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

Fix custom bootscreen compiler warning

Browse Source
This commit is contained in:
Scott Lahteine 2018-03-04 23:37:01 -06:00
parent f0d8d76f68
commit b01f10dfac
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/SanityCheck.h
View File

@ -42,11 +42,11 @@
* the bleeding-edge source code, but sometimes this is not enough. This check * the bleeding-edge source code, but sometimes this is not enough. This check
* forces a minimum config file revision. Otherwise Marlin will not build. * forces a minimum config file revision. Otherwise Marlin will not build.
*/ */
#if ! defined(CONFIGURATION_H_VERSION) || CONFIGURATION_H_VERSION < REQUIRED_CONFIGURATION_H_VERSION #if !defined(CONFIGURATION_H_VERSION) || CONFIGURATION_H_VERSION < REQUIRED_CONFIGURATION_H_VERSION
#error "You are using an old Configuration.h file, update it before building Marlin." #error "You are using an old Configuration.h file, update it before building Marlin."
#endif #endif
#if ! defined(CONFIGURATION_ADV_H_VERSION) || CONFIGURATION_ADV_H_VERSION < REQUIRED_CONFIGURATION_ADV_H_VERSION #if !defined(CONFIGURATION_ADV_H_VERSION) || CONFIGURATION_ADV_H_VERSION < REQUIRED_CONFIGURATION_ADV_H_VERSION
#error "You are using an old Configuration_adv.h file, update it before building Marlin." #error "You are using an old Configuration_adv.h file, update it before building Marlin."
#endif #endif

6
Marlin/ultralcd_impl_DOGM.h
View File

@ -282,9 +282,11 @@ void lcd_printPGM_utf(const char *str, uint8_t n=LCD_WIDTH) {
void lcd_custom_bootscreen() { void lcd_custom_bootscreen() {
constexpr u8g_uint_t left = (LCD_PIXEL_WIDTH - (CUSTOM_BOOTSCREEN_BMPWIDTH)) / 2, constexpr u8g_uint_t left = (LCD_PIXEL_WIDTH - (CUSTOM_BOOTSCREEN_BMPWIDTH)) / 2,
top = (LCD_PIXEL_HEIGHT - (CUSTOM_BOOTSCREEN_BMPHEIGHT)) / 2, top = (LCD_PIXEL_HEIGHT - (CUSTOM_BOOTSCREEN_BMPHEIGHT)) / 2;
right = left + CUSTOM_BOOTSCREEN_BMPWIDTH, #if ENABLED(CUSTOM_BOOTSCREEN_INVERTED)
constexpr u8g_uint_t right = left + CUSTOM_BOOTSCREEN_BMPWIDTH,
bottom = top + CUSTOM_BOOTSCREEN_BMPHEIGHT; bottom = top + CUSTOM_BOOTSCREEN_BMPHEIGHT;
#endif
u8g.firstPage(); u8g.firstPage();
do { do {
u8g.drawBitmapP( u8g.drawBitmapP(