bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Merge remote-tracking branch 'MarlinFirmware/Development' into Development

Browse Source
This commit is contained in:
Chris Roadfeldt
2015-03-31 03:07:57 -05:00
parent 17707e7479 21ab44cfa7
commit 45ece5afb1
30 changed files with 3039 additions and 1305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Marlin/SanityCheck.h
View File

@ -17,8 +17,11 @@
* Progress Bar
*/
#ifdef LCD_PROGRESS_BAR
#ifndef SDSUPPORT
#error LCD_PROGRESS_BAR requires SDSUPPORT.
#endif
#ifdef DOGLCD
#warning LCD_PROGRESS_BAR does not apply to graphical displays.
#error LCD_PROGRESS_BAR does not apply to graphical displays.
#endif
#ifdef FILAMENT_LCD_DISPLAY
#error LCD_PROGRESS_BAR and FILAMENT_LCD_DISPLAY are not fully compatible. Comment out this line to use both.