DOGLCD and LCD_PROGRESS_BAR to coexist

Small changes (and formatting to confuse the diff’er) which first
allows DOGLCD and LCD_PROGRESS_BAR to be enabled in tandem, then a
#warning (rather than error) that the extra progress bar / message
options don’t apply to graphical displays at this time. This leaves
open perhaps combining the progress bar and message area in some future
(or forked custom) graphical LCD display arrangement (at which time the
relevant variables may be moved into ultralcd.cpp with externs in
ultralcd.h). I also added a conditional error that the progress bar and
the filament display may not work well together.
This commit is contained in:
Scott Lahteine
2015-01-09 18:16:56 -08:00
parent 6e8e9bb41e
commit 326b925557
4 changed files with 208 additions and 237 deletions

View File

@ -49,7 +49,7 @@
#ifdef FILAMENT_LCD_DISPLAY
extern unsigned long message_millis;
#endif
void lcd_buzz(long duration,uint16_t freq);
bool lcd_clicked();