0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #5429 from thinkyhead/rc_mention_M205

Browse source 
Fix compile error with LCD_I2C_VIKI
This commit is contained in:
Scott Lahteine 2016-12-07 22:16:57 -08:00 committed by GitHub
parent c1e1f63ffa 3fb43c11fc
commit a9f64537ff
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/ultralcd.cpp
View file

@ -3154,6 +3154,8 @@ void lcd_reset_alert_level() { lcd_status_message_level = 0; }
#if (ENABLED(LCD_I2C_TYPE_MCP23017) || ENABLED(LCD_I2C_TYPE_MCP23008)) && ENABLED(DETECT_DEVICE) #if (ENABLED(LCD_I2C_TYPE_MCP23017) || ENABLED(LCD_I2C_TYPE_MCP23008)) && ENABLED(DETECT_DEVICE)
bool lcd_detected() { return lcd.LcdDetected() == 1; } bool lcd_detected() { return lcd.LcdDetected() == 1; }
#else
bool lcd_detected() { return true; }
#endif #endif
#endif // ULTIPANEL #endif // ULTIPANEL

7
Marlin/ultralcd.h
View file

@ -43,12 +43,7 @@
void lcd_reset_alert_level(); void lcd_reset_alert_level();
void lcd_kill_screen(); void lcd_kill_screen();
void kill_screen(const char* lcd_msg); void kill_screen(const char* lcd_msg);
bool lcd_detected(void);
#if (ENABLED(LCD_I2C_TYPE_MCP23017) || ENABLED(LCD_I2C_TYPE_MCP23008)) && ENABLED(DETECT_DEVICE)
bool lcd_detected();
#else
inline bool lcd_detected() { return true; }
#endif
#if HAS_BUZZER #if HAS_BUZZER
void lcd_buzz(long duration, uint16_t freq); void lcd_buzz(long duration, uint16_t freq);