zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Clear up LCD-related compile issues

Browse source
This commit is contained in:
Scott Lahteine 2018-05-14 23:54:50 -05:00
parent eb2eb72720
commit 0ea60d506a
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Marlin/src/lcd/u8g_fontutf8.cpp
View file

@ -1,5 +1,5 @@
/** /**
* @file fontutf8.c * @file u8g_fontutf8.cpp
* @brief font api for u8g lib * @brief font api for u8g lib
* @author Yunhui Fu (yhfudev@gmail.com) * @author Yunhui Fu (yhfudev@gmail.com)
* @version 1.0 * @version 1.0
@ -7,9 +7,9 @@
* @copyright GPL/BSD * @copyright GPL/BSD
*/ */
#include "../inc/MarlinConfig.h" #include "../inc/MarlinConfigPre.h"
#if ENABLED(ULTRA_LCD) #if ENABLED(DOGLCD)
#include <string.h> #include <string.h>
#include "fontutils.h" #include "fontutils.h"
@ -373,4 +373,4 @@ int uxg_GetUtf8StrPixelWidthP(u8g_t *pu8g, const char *utf8_msg) {
return data.adv; return data.adv;
} }
#endif // ENABLED(ULTRA_LCD) #endif // DOGLCD

4
Marlin/src/lcd/ultralcd.cpp
View file

@ -24,6 +24,8 @@
#if ENABLED(ULTRA_LCD) #if ENABLED(ULTRA_LCD)
#include <stdarg.h>
#include "ultralcd.h" #include "ultralcd.h"
#include "../sd/cardreader.h" #include "../sd/cardreader.h"
@ -4867,7 +4869,7 @@ void lcd_quick_feedback(const bool clear_buttons) {
callbackFunc = callback; \ callbackFunc = callback; \
liveEdit = live; \ liveEdit = live; \
} \ } \
typedef void _name typedef void _name##_void
DEFINE_MENU_EDIT_TYPE(int16_t, int3, itostr3, 1); DEFINE_MENU_EDIT_TYPE(int16_t, int3, itostr3, 1);
DEFINE_MENU_EDIT_TYPE(uint8_t, int8, i8tostr3, 1); DEFINE_MENU_EDIT_TYPE(uint8_t, int8, i8tostr3, 1);

2
Marlin/src/lcd/ultralcd.h
View file

@ -223,7 +223,7 @@
EN_REPRAPWORLD_KEYPAD_LEFT) \ EN_REPRAPWORLD_KEYPAD_LEFT) \
) )
#elif ENABLED(NEWPANEL) #elif defined(EN_C)
#define LCD_CLICKED (buttons & EN_C) #define LCD_CLICKED (buttons & EN_C)