forksand
/
marlin-lulzbot-laser
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix: Long menu entries (>14 or >18 chars) caused overrun in hitachi display implementation

Browse Source
master
Maik Stohn 12 years ago
parent 7ee70c2248
commit e8572c5239
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File

14
Marlin/ultralcd_implementation_hitachi_HD44780.h
Unescape View File

@ -503,7 +503,7 @@ static void lcd_implementation_drawmenu_generic(uint8_t row, const char* pstr, c
#endif #endif
lcd.setCursor(0, row); lcd.setCursor(0, row);
lcd.print(pre_char); lcd.print(pre_char);
while((c = pgm_read_byte(pstr)) != '\0') while( ((c = pgm_read_byte(pstr)) != '\0') && (n>0) )
{ {
lcd.print(c); lcd.print(c);
pstr++; pstr++;
@ -525,7 +525,7 @@ static void lcd_implementation_drawmenu_setting_edit_generic(uint8_t row, const
#endif #endif
lcd.setCursor(0, row); lcd.setCursor(0, row);
lcd.print(pre_char); lcd.print(pre_char);
while((c = pgm_read_byte(pstr)) != '\0') while( ((c = pgm_read_byte(pstr)) != '\0') && (n>0) )
{ {
lcd.print(c); lcd.print(c);
pstr++; pstr++;
@ -547,7 +547,7 @@ static void lcd_implementation_drawmenu_setting_edit_generic_P(uint8_t row, cons
#endif #endif
lcd.setCursor(0, row); lcd.setCursor(0, row);
lcd.print(pre_char); lcd.print(pre_char);
while((c = pgm_read_byte(pstr)) != '\0') while( ((c = pgm_read_byte(pstr)) != '\0') && (n>0) )
{ {
lcd.print(c); lcd.print(c);
pstr++; pstr++;
@ -617,7 +617,7 @@ static void lcd_implementation_drawmenu_sdfile_selected(uint8_t row, const char*
filename = longFilename; filename = longFilename;
longFilename[LCD_WIDTH-1] = '\0'; longFilename[LCD_WIDTH-1] = '\0';
} }
while((c = *filename) != '\0') while( ((c = *filename) != '\0') && (n>0) )
{ {
lcd.print(c); lcd.print(c);
filename++; filename++;
@ -637,7 +637,7 @@ static void lcd_implementation_drawmenu_sdfile(uint8_t row, const char* pstr, co
filename = longFilename; filename = longFilename;
longFilename[LCD_WIDTH-1] = '\0'; longFilename[LCD_WIDTH-1] = '\0';
} }
while((c = *filename) != '\0') while( ((c = *filename) != '\0') && (n>0) )
{ {
lcd.print(c); lcd.print(c);
filename++; filename++;
@ -658,7 +658,7 @@ static void lcd_implementation_drawmenu_sddirectory_selected(uint8_t row, const
filename = longFilename; filename = longFilename;
longFilename[LCD_WIDTH-2] = '\0'; longFilename[LCD_WIDTH-2] = '\0';
} }
while((c = *filename) != '\0') while( ((c = *filename) != '\0') && (n>0) )
{ {
lcd.print(c); lcd.print(c);
filename++; filename++;
@ -679,7 +679,7 @@ static void lcd_implementation_drawmenu_sddirectory(uint8_t row, const char* pst
filename = longFilename; filename = longFilename;
longFilename[LCD_WIDTH-2] = '\0'; longFilename[LCD_WIDTH-2] = '\0';
} }
while((c = *filename) != '\0') while( ((c = *filename) != '\0') && (n>0) )
{ {
lcd.print(c); lcd.print(c);
filename++; filename++;

Write Preview
Loading…
Cancel
Save