Browse Source

Fix compile error with LCD_I2C_VIKI

Scott Lahteine 7 years ago
parent
commit
3fb43c11fc
2 changed files with 3 additions and 6 deletions
  1. 2
    0
      Marlin/ultralcd.cpp
  2. 1
    6
      Marlin/ultralcd.h

+ 2
- 0
Marlin/ultralcd.cpp View File

3154
 
3154
 
3155
   #if (ENABLED(LCD_I2C_TYPE_MCP23017) || ENABLED(LCD_I2C_TYPE_MCP23008)) && ENABLED(DETECT_DEVICE)
3155
   #if (ENABLED(LCD_I2C_TYPE_MCP23017) || ENABLED(LCD_I2C_TYPE_MCP23008)) && ENABLED(DETECT_DEVICE)
3156
     bool lcd_detected() { return lcd.LcdDetected() == 1; }
3156
     bool lcd_detected() { return lcd.LcdDetected() == 1; }
3157
+  #else
3158
+    bool lcd_detected() { return true; }
3157
   #endif
3159
   #endif
3158
 
3160
 
3159
 #endif // ULTIPANEL
3161
 #endif // ULTIPANEL

+ 1
- 6
Marlin/ultralcd.h View File

43
   void lcd_reset_alert_level();
43
   void lcd_reset_alert_level();
44
   void lcd_kill_screen();
44
   void lcd_kill_screen();
45
   void kill_screen(const char* lcd_msg);
45
   void kill_screen(const char* lcd_msg);
46
-
47
-  #if (ENABLED(LCD_I2C_TYPE_MCP23017) || ENABLED(LCD_I2C_TYPE_MCP23008)) && ENABLED(DETECT_DEVICE)
48
-    bool lcd_detected();
49
-  #else
50
-    inline bool lcd_detected() { return true; }
51
-  #endif
46
+  bool lcd_detected(void);
52
 
47
 
53
   #if HAS_BUZZER
48
   #if HAS_BUZZER
54
     void lcd_buzz(long duration, uint16_t freq);
49
     void lcd_buzz(long duration, uint16_t freq);

Loading…
Cancel
Save