MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clean up DOGM code, comments

Browse Source
This commit is contained in:
Scott Lahteine 2016-08-20 18:13:24 -05:00
parent 71319adbb8
commit 76c3f326ff
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Marlin/ultralcd_impl_DOGM.h
View File

@ -201,26 +201,20 @@ char lcd_print(char c) {
} }
char lcd_print(const char* str) { char lcd_print(const char* str) {
char c;
int i = 0; int i = 0;
char n = 0; char c, n = 0;
while ((c = str[i++])) { while ((c = str[i++])) n += lcd_print(c);
n += lcd_print(c);
}
return n; return n;
} }
/* Arduino < 1.0.0 is missing a function to print PROGMEM strings, so we need to implement our own */ // Needed for Arduino < 1.0.0
char lcd_printPGM(const char* str) { char lcd_printPGM(const char* str) {
char c; char c, n = 0;
char n = 0; while ((c = pgm_read_byte(str++))) n += lcd_print(c);
while ((c = pgm_read_byte(str++))) {
n += lcd_print(c);
}
return n; return n;
} }
/* Warning: This function is called from interrupt context */ // Initialize or re-initializw the LCD
static void lcd_implementation_init() { static void lcd_implementation_init() {
#if defined(LCD_PIN_BL) && LCD_PIN_BL > -1 // Enable LCD backlight #if defined(LCD_PIN_BL) && LCD_PIN_BL > -1 // Enable LCD backlight
@ -291,6 +285,7 @@ static void lcd_implementation_init() {
#endif // SHOW_BOOTSCREEN #endif // SHOW_BOOTSCREEN
} }
// The kill screen is displayed for unrecoverable conditions
void lcd_kill_screen() { void lcd_kill_screen() {
lcd_setFont(FONT_MENU); lcd_setFont(FONT_MENU);
u8g.setPrintPos(0, u8g.getHeight()/4*1); u8g.setPrintPos(0, u8g.getHeight()/4*1);