Merge pull request MarlinFirmware#4165 from leptun/binary.h

Remove last <binary.h> dependencies
drewmoseley · Apr 24, 2023 · 3692a24 · 3692a24
2 parents eb8ac25 + dd16cf4
commit 3692a24
Showing 1 changed file with 104 additions and 104 deletions.
diff --git a/Firmware/lcd.cpp b/Firmware/lcd.cpp
@@ -10,7 +10,6 @@
 
 #include "Configuration.h"
 #include "pins.h"
-#include <binary.h>
 #include <Arduino.h>
 #include "Marlin.h"
 #include "fastio.h"
@@ -810,114 +809,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 +931,24 @@ 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,
+	0b00000};
 
 void lcd_set_custom_characters_nextpage(void)
 {