Browse Source

Clear up LCD-related compile issues

Scott Lahteine 7 years ago
parent
commit
0ea60d506a
3 changed files with 8 additions and 6 deletions
  1. 4
    4
      Marlin/src/lcd/u8g_fontutf8.cpp
  2. 3
    1
      Marlin/src/lcd/ultralcd.cpp
  3. 1
    1
      Marlin/src/lcd/ultralcd.h

+ 4
- 4
Marlin/src/lcd/u8g_fontutf8.cpp View File

1
 /**
1
 /**
2
- * @file    fontutf8.c
2
+ * @file    u8g_fontutf8.cpp
3
  * @brief   font api for u8g lib
3
  * @brief   font api for u8g lib
4
  * @author  Yunhui Fu (yhfudev@gmail.com)
4
  * @author  Yunhui Fu (yhfudev@gmail.com)
5
  * @version 1.0
5
  * @version 1.0
7
  * @copyright GPL/BSD
7
  * @copyright GPL/BSD
8
  */
8
  */
9
 
9
 
10
-#include "../inc/MarlinConfig.h"
10
+#include "../inc/MarlinConfigPre.h"
11
 
11
 
12
-#if ENABLED(ULTRA_LCD)
12
+#if ENABLED(DOGLCD)
13
 
13
 
14
 #include <string.h>
14
 #include <string.h>
15
 #include "fontutils.h"
15
 #include "fontutils.h"
373
   return data.adv;
373
   return data.adv;
374
 }
374
 }
375
 
375
 
376
-#endif // ENABLED(ULTRA_LCD)
376
+#endif // DOGLCD

+ 3
- 1
Marlin/src/lcd/ultralcd.cpp View File

24
 
24
 
25
 #if ENABLED(ULTRA_LCD)
25
 #if ENABLED(ULTRA_LCD)
26
 
26
 
27
+#include <stdarg.h>
28
+
27
 #include "ultralcd.h"
29
 #include "ultralcd.h"
28
 
30
 
29
 #include "../sd/cardreader.h"
31
 #include "../sd/cardreader.h"
4867
       callbackFunc = callback; \
4869
       callbackFunc = callback; \
4868
       liveEdit = live; \
4870
       liveEdit = live; \
4869
     } \
4871
     } \
4870
-    typedef void _name
4872
+    typedef void _name##_void
4871
 
4873
 
4872
   DEFINE_MENU_EDIT_TYPE(int16_t, int3, itostr3, 1);
4874
   DEFINE_MENU_EDIT_TYPE(int16_t, int3, itostr3, 1);
4873
   DEFINE_MENU_EDIT_TYPE(uint8_t, int8, i8tostr3, 1);
4875
   DEFINE_MENU_EDIT_TYPE(uint8_t, int8, i8tostr3, 1);

+ 1
- 1
Marlin/src/lcd/ultralcd.h View File

223
                                               EN_REPRAPWORLD_KEYPAD_LEFT) \
223
                                               EN_REPRAPWORLD_KEYPAD_LEFT) \
224
                                             )
224
                                             )
225
 
225
 
226
-  #elif ENABLED(NEWPANEL)
226
+  #elif defined(EN_C)
227
 
227
 
228
     #define LCD_CLICKED (buttons & EN_C)
228
     #define LCD_CLICKED (buttons & EN_C)
229
 
229
 

Loading…
Cancel
Save