From 0ea60d506a9d5676afe0a47c39dea32411068f1b Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 14 May 2018 23:54:50 -0500 Subject: [PATCH] Clear up LCD-related compile issues --- Marlin/src/lcd/u8g_fontutf8.cpp | 8 ++++---- Marlin/src/lcd/ultralcd.cpp | 4 +++- Marlin/src/lcd/ultralcd.h | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Marlin/src/lcd/u8g_fontutf8.cpp b/Marlin/src/lcd/u8g_fontutf8.cpp index 4e0b17088..a90403528 100644 --- a/Marlin/src/lcd/u8g_fontutf8.cpp +++ b/Marlin/src/lcd/u8g_fontutf8.cpp @@ -1,5 +1,5 @@ /** - * @file fontutf8.c + * @file u8g_fontutf8.cpp * @brief font api for u8g lib * @author Yunhui Fu (yhfudev@gmail.com) * @version 1.0 @@ -7,9 +7,9 @@ * @copyright GPL/BSD */ -#include "../inc/MarlinConfig.h" +#include "../inc/MarlinConfigPre.h" -#if ENABLED(ULTRA_LCD) +#if ENABLED(DOGLCD) #include #include "fontutils.h" @@ -373,4 +373,4 @@ int uxg_GetUtf8StrPixelWidthP(u8g_t *pu8g, const char *utf8_msg) { return data.adv; } -#endif // ENABLED(ULTRA_LCD) +#endif // DOGLCD diff --git a/Marlin/src/lcd/ultralcd.cpp b/Marlin/src/lcd/ultralcd.cpp index 94108ee1d..b4007a45c 100644 --- a/Marlin/src/lcd/ultralcd.cpp +++ b/Marlin/src/lcd/ultralcd.cpp @@ -24,6 +24,8 @@ #if ENABLED(ULTRA_LCD) +#include + #include "ultralcd.h" #include "../sd/cardreader.h" @@ -4867,7 +4869,7 @@ void lcd_quick_feedback(const bool clear_buttons) { callbackFunc = callback; \ liveEdit = live; \ } \ - typedef void _name + typedef void _name##_void DEFINE_MENU_EDIT_TYPE(int16_t, int3, itostr3, 1); DEFINE_MENU_EDIT_TYPE(uint8_t, int8, i8tostr3, 1); diff --git a/Marlin/src/lcd/ultralcd.h b/Marlin/src/lcd/ultralcd.h index dca13bccc..b4b1ba44a 100644 --- a/Marlin/src/lcd/ultralcd.h +++ b/Marlin/src/lcd/ultralcd.h @@ -223,7 +223,7 @@ EN_REPRAPWORLD_KEYPAD_LEFT) \ ) - #elif ENABLED(NEWPANEL) + #elif defined(EN_C) #define LCD_CLICKED (buttons & EN_C)