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

2.0.x parity in ultralcd__impl_HD44780.h

Browse Source
This commit is contained in:
Scott Lahteine 2018-02-17 08:06:11 -06:00
parent c71f542d61
commit c67cefd913
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Marlin/ultralcd_impl_HD44780.h
View File

@ -116,7 +116,7 @@ extern volatile uint8_t buttons; //an extended version of the last checked butt
#define B_DW (_BV(BL_DW)) #define B_DW (_BV(BL_DW))
#define B_RI (_BV(BL_RI)) #define B_RI (_BV(BL_RI))
#define B_ST (_BV(BL_ST)) #define B_ST (_BV(BL_ST))
#define LCD_CLICKED ((buttons & B_MI) || (buttons & B_ST)) #define LCD_CLICKED (buttons & (B_MI|B_ST))
#endif #endif
#endif // ULTIPANEL #endif // ULTIPANEL
@ -797,7 +797,7 @@ static void lcd_implementation_status_screen() {
lcd.setCursor(0, 1); lcd.setCursor(0, 1);
// If the first line has two extruder temps, // If the first line has two extruder temps,
// show more temperatures on the next line. // show more temperatures on the next line
#if HOTENDS > 2 || (HOTENDS > 1 && TEMP_SENSOR_BED) #if HOTENDS > 2 || (HOTENDS > 1 && TEMP_SENSOR_BED)
@ -1321,18 +1321,18 @@ static void lcd_implementation_status_screen() {
} }
clear_custom_char(&new_char); clear_custom_char(&new_char);
new_char.custom_char_bits[0] = 0B11111U; // char #0 is used for the top line of the box new_char.custom_char_bits[0] = 0b11111U; // char #0 is used for the top line of the box
lcd.createChar(0, (uint8_t*)&new_char); lcd.createChar(0, (uint8_t*)&new_char);
clear_custom_char(&new_char); clear_custom_char(&new_char);
k = (GRID_MAX_POINTS_Y) * pixels_per_y_mesh_pnt + 1; // row of pixels for the bottom box line k = (GRID_MAX_POINTS_Y) * pixels_per_y_mesh_pnt + 1; // row of pixels for the bottom box line
l = k % (ULTRA_Y_PIXELS_PER_CHAR); // row within relevant character cell l = k % (ULTRA_Y_PIXELS_PER_CHAR); // row within relevant character cell
new_char.custom_char_bits[l] = 0B11111U; // char #1 is used for the bottom line of the box new_char.custom_char_bits[l] = 0b11111U; // char #1 is used for the bottom line of the box
lcd.createChar(1, (uint8_t*)&new_char); lcd.createChar(1, (uint8_t*)&new_char);
clear_custom_char(&new_char); clear_custom_char(&new_char);
for (j = 0; j < ULTRA_Y_PIXELS_PER_CHAR; j++) for (j = 0; j < ULTRA_Y_PIXELS_PER_CHAR; j++)
new_char.custom_char_bits[j] = 0B10000U; // char #2 is used for the left edge of the box new_char.custom_char_bits[j] = 0b10000U; // char #2 is used for the left edge of the box
lcd.createChar(2, (uint8_t*)&new_char); lcd.createChar(2, (uint8_t*)&new_char);
clear_custom_char(&new_char); clear_custom_char(&new_char);