From 76c3f326ff357a25c654e127149446e4cf05ae91 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Sat, 20 Aug 2016 18:13:24 -0500
Subject: [PATCH] Clean up DOGM code, comments
---
Marlin/ultralcd_impl_DOGM.h | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/Marlin/ultralcd_impl_DOGM.h b/Marlin/ultralcd_impl_DOGM.h
index 1ce2728721..8defa94801 100644
--- a/Marlin/ultralcd_impl_DOGM.h
+++ b/Marlin/ultralcd_impl_DOGM.h
@@ -201,26 +201,20 @@ char lcd_print(char c) {
}
char lcd_print(const char* str) {
- char c;
int i = 0;
- char n = 0;
- while ((c = str[i++])) {
- n += lcd_print(c);
- }
+ char c, n = 0;
+ while ((c = str[i++])) n += lcd_print(c);
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 c;
- char n = 0;
- while ((c = pgm_read_byte(str++))) {
- n += lcd_print(c);
- }
+ char c, n = 0;
+ while ((c = pgm_read_byte(str++))) n += lcd_print(c);
return n;
}
-/* Warning: This function is called from interrupt context */
+// Initialize or re-initializw the LCD
static void lcd_implementation_init() {
#if defined(LCD_PIN_BL) && LCD_PIN_BL > -1 // Enable LCD backlight
@@ -291,6 +285,7 @@ static void lcd_implementation_init() {
#endif // SHOW_BOOTSCREEN
}
+// The kill screen is displayed for unrecoverable conditions
void lcd_kill_screen() {
lcd_setFont(FONT_MENU);
u8g.setPrintPos(0, u8g.getHeight()/4*1);
--
GitLab