Browse Source

Fix function definitions for Malyan LCD

xC0000005 7 years ago
parent
commit
24d23ce49b
1 changed files with 8 additions and 6 deletions
  1. 8
    6
      Marlin/src/lcd/ultralcd.h

+ 8
- 6
Marlin/src/lcd/ultralcd.h View File

@@ -28,6 +28,13 @@
28 28
 #if ENABLED(ULTRA_LCD) || ENABLED(MALYAN_LCD)
29 29
   void lcd_init();
30 30
   bool lcd_detected();
31
+  void lcd_update();
32
+  void lcd_setalertstatusPGM(const char* message);
33
+#else
34
+  inline void lcd_init() {}
35
+  inline bool lcd_detected() { return true; }
36
+  inline void lcd_update() {}
37
+  inline void lcd_setalertstatusPGM(const char* message) { UNUSED(message); }
31 38
 #endif
32 39
 
33 40
 #if ENABLED(ULTRA_LCD)
@@ -52,7 +59,6 @@
52 59
     constexpr bool lcd_wait_for_move = false;
53 60
   #endif
54 61
 
55
-  void lcd_update();
56 62
   bool lcd_hasstatus();
57 63
   void lcd_setstatus(const char* message, const bool persist=false);
58 64
   void lcd_setstatusPGM(const char* message, const int8_t level=0);
@@ -230,20 +236,16 @@
230 236
     void wait_for_release();
231 237
   #endif
232 238
 
233
-#else // no LCD
239
+#else // MALYAN_LCD or no LCD
234 240
 
235 241
   constexpr bool lcd_wait_for_move = false;
236 242
 
237
-  inline void lcd_init() {}
238
-  inline bool lcd_detected() { return true; }
239
-  inline void lcd_update() {}
240 243
   inline void lcd_refresh() {}
241 244
   inline void lcd_buttons_update() {}
242 245
   inline bool lcd_hasstatus() { return false; }
243 246
   inline void lcd_setstatus(const char* const message, const bool persist=false) { UNUSED(message); UNUSED(persist); }
244 247
   inline void lcd_setstatusPGM(const char* const message, const int8_t level=0) { UNUSED(message); UNUSED(level); }
245 248
   inline void lcd_status_printf_P(const uint8_t level, const char * const fmt, ...) { UNUSED(level); UNUSED(fmt); }
246
-  inline void lcd_setalertstatusPGM(const char* message) { UNUSED(message); }
247 249
   inline void lcd_reset_alert_level() {}
248 250
   inline void lcd_reset_status() {}
249 251
 

Loading…
Cancel
Save