From c67cefd913f8985b21a4464dd44e7efef61dd621 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 17 Feb 2018 08:06:11 -0600
Subject: [PATCH] 2.0.x parity in ultralcd__impl_HD44780.h
---
Marlin/ultralcd_impl_HD44780.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/Marlin/ultralcd_impl_HD44780.h b/Marlin/ultralcd_impl_HD44780.h
index b7e20498ae..a69534cce3 100644
--- a/Marlin/ultralcd_impl_HD44780.h
+++ b/Marlin/ultralcd_impl_HD44780.h
@@ -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_RI (_BV(BL_RI))
#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 // ULTIPANEL
@@ -797,7 +797,7 @@ static void lcd_implementation_status_screen() {
lcd.setCursor(0, 1);
// 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)
@@ -1321,18 +1321,18 @@ static void lcd_implementation_status_screen() {
}
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);
clear_custom_char(&new_char);
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
- 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);
clear_custom_char(&new_char);
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);
clear_custom_char(&new_char);