From 548ed0eb31b4b371eef4c3eeead3e1d8a88fc325 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Mon, 24 Apr 2023 10:42:09 +0200 Subject: [PATCH 1/3] Convert to native binary literals --- Firmware/lcd.cpp | 206 +++++++++++++++++++++++------------------------ 1 file changed, 103 insertions(+), 103 deletions(-) diff --git a/Firmware/lcd.cpp b/Firmware/lcd.cpp index b1b15176d..cc640a2ca 100644 --- a/Firmware/lcd.cpp +++ b/Firmware/lcd.cpp @@ -810,114 +810,114 @@ void lcd_buttons_update(void) // Custom character data const uint8_t lcd_chardata_bedTemp[8] PROGMEM = { - B00000, - B11111, - B10101, - B10001, - B10101, - B11111, - B00000, - B00000}; //thanks Sonny Mounicou + 0b00000, + 0b11111, + 0b10101, + 0b10001, + 0b10101, + 0b11111, + 0b00000, + 0b00000}; //thanks Sonny Mounicou const uint8_t lcd_chardata_degree[8] PROGMEM = { - B01100, - B10010, - B10010, - B01100, - B00000, - B00000, - B00000, - B00000}; + 0b01100, + 0b10010, + 0b10010, + 0b01100, + 0b00000, + 0b00000, + 0b00000, + 0b00000}; const uint8_t lcd_chardata_thermometer[8] PROGMEM = { - B00100, - B01010, - B01010, - B01010, - B01010, - B10001, - B10001, - B01110}; + 0b00100, + 0b01010, + 0b01010, + 0b01010, + 0b01010, + 0b10001, + 0b10001, + 0b01110}; const uint8_t lcd_chardata_uplevel[8] PROGMEM = { - B00100, - B01110, - B11111, - B00100, - B11100, - B00000, - B00000, - B00000}; //thanks joris + 0b00100, + 0b01110, + 0b11111, + 0b00100, + 0b11100, + 0b00000, + 0b00000, + 0b00000}; //thanks joris const uint8_t lcd_chardata_refresh[8] PROGMEM = { - B00000, - B00110, - B11001, - B11000, - B00011, - B10011, - B01100, - B00000}; //thanks joris + 0b00000, + 0b00110, + 0b11001, + 0b11000, + 0b00011, + 0b10011, + 0b01100, + 0b00000}; //thanks joris const uint8_t lcd_chardata_folder[8] PROGMEM = { - B00000, - B11100, - B11111, - B10001, - B10001, - B11111, - B00000, - B00000}; //thanks joris + 0b00000, + 0b11100, + 0b11111, + 0b10001, + 0b10001, + 0b11111, + 0b00000, + 0b00000}; //thanks joris /*const uint8_t lcd_chardata_feedrate[8] PROGMEM = { - B11100, - B10000, - B11000, - B10111, - B00101, - B00110, - B00101, - B00000};*/ //thanks Sonny Mounicou + 0b11100, + 0b10000, + 0b11000, + 0b10111, + 0b00101, + 0b00110, + 0b00101, + 0b00000};*/ //thanks Sonny Mounicou /*const uint8_t lcd_chardata_feedrate[8] PROGMEM = { - B11100, - B10100, - B11000, - B10100, - B00000, - B00111, - B00010, - B00010};*/ + 0b11100, + 0b10100, + 0b11000, + 0b10100, + 0b00000, + 0b00111, + 0b00010, + 0b00010};*/ /*const uint8_t lcd_chardata_feedrate[8] PROGMEM = { - B01100, - B10011, - B00000, - B01100, - B10011, - B00000, - B01100, - B10011};*/ + 0b01100, + 0b10011, + 0b00000, + 0b01100, + 0b10011, + 0b00000, + 0b01100, + 0b10011};*/ const uint8_t lcd_chardata_feedrate[8] PROGMEM = { - B00000, - B00100, - B10010, - B01001, - B10010, - B00100, - B00000, - B00000}; + 0b00000, + 0b00100, + 0b10010, + 0b01001, + 0b10010, + 0b00100, + 0b00000, + 0b00000}; const uint8_t lcd_chardata_clock[8] PROGMEM = { - B00000, - B01110, - B10011, - B10101, - B10001, - B01110, - B00000, - B00000}; //thanks Sonny Mounicou + 0b00000, + 0b01110, + 0b10011, + 0b10101, + 0b10001, + 0b01110, + 0b00000, + 0b00000}; //thanks Sonny Mounicou void lcd_set_custom_characters(void) { @@ -932,23 +932,23 @@ void lcd_set_custom_characters(void) } const uint8_t lcd_chardata_arr2down[8] PROGMEM = { - B00000, - B00000, - B10001, - B01010, - B00100, - B10001, - B01010, - B00100}; + 0b00000, + 0b00000, + 0b10001, + 0b01010, + 0b00100, + 0b10001, + 0b01010, + 0b00100}; const uint8_t lcd_chardata_confirm[8] PROGMEM = { - B00000, - B00001, - B00011, - B10110, - B11100, - B01000, - B00000}; + 0b00000, + 0b00001, + 0b00011, + 0b10110, + 0b11100, + 0b01000, + 0b00000}; void lcd_set_custom_characters_nextpage(void) { From 17e085040c977d54423c20724b4aaec6f0f832b8 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Mon, 24 Apr 2023 10:44:48 +0200 Subject: [PATCH 2/3] Add missing line to custom character Shouldn't make a difference since the array is already defined as 8B long, but I just found it weird and surprising when I noticed only 7 lines were defined --- Firmware/lcd.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Firmware/lcd.cpp b/Firmware/lcd.cpp index cc640a2ca..2027b84da 100644 --- a/Firmware/lcd.cpp +++ b/Firmware/lcd.cpp @@ -948,6 +948,7 @@ const uint8_t lcd_chardata_confirm[8] PROGMEM = { 0b10110, 0b11100, 0b01000, + 0b00000, 0b00000}; void lcd_set_custom_characters_nextpage(void) From dd16cf45259981bd8f93513de5ad877099681e65 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Mon, 24 Apr 2023 09:13:17 +0200 Subject: [PATCH 3/3] Remove Binary.h include --- Firmware/lcd.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Firmware/lcd.cpp b/Firmware/lcd.cpp index 2027b84da..4a88f7ea6 100644 --- a/Firmware/lcd.cpp +++ b/Firmware/lcd.cpp @@ -10,7 +10,6 @@ #include "Configuration.h" #include "pins.h" -#include #include #include "Marlin.h" #include "fastio.h"