From f14d0e098382d4ac001d7b897cdee4739ffed239 Mon Sep 17 00:00:00 2001 From: Mike La Spina Date: Mon, 12 Apr 2021 17:52:18 -0500 Subject: [PATCH] Tweak cooler / flowmeter icons (#21573) --- Marlin/src/lcd/dogm/dogm_Statusscreen.h | 4 +- Marlin/src/lcd/dogm/status/cooler.h | 153 ++++++++++++------------ 2 files changed, 81 insertions(+), 76 deletions(-) diff --git a/Marlin/src/lcd/dogm/dogm_Statusscreen.h b/Marlin/src/lcd/dogm/dogm_Statusscreen.h index f0e37aa24..6d2c5369d 100644 --- a/Marlin/src/lcd/dogm/dogm_Statusscreen.h +++ b/Marlin/src/lcd/dogm/dogm_Statusscreen.h @@ -547,7 +547,7 @@ #endif #ifndef STATUS_COOLER_TEXT_X - #define STATUS_COOLER_TEXT_X (STATUS_COOLER_X + 8) + #define STATUS_COOLER_TEXT_X (STATUS_COOLER_X + 12) #endif static_assert( @@ -583,7 +583,7 @@ #endif #ifndef STATUS_FLOWMETER_TEXT_X - #define STATUS_FLOWMETER_TEXT_X (STATUS_FLOWMETER_X + 8) + #define STATUS_FLOWMETER_TEXT_X (STATUS_FLOWMETER_X + 12) #endif static_assert( diff --git a/Marlin/src/lcd/dogm/status/cooler.h b/Marlin/src/lcd/dogm/status/cooler.h index df596b5c5..6cf67a4b6 100644 --- a/Marlin/src/lcd/dogm/status/cooler.h +++ b/Marlin/src/lcd/dogm/status/cooler.h @@ -25,90 +25,95 @@ // lcd/dogm/status/cooler.h - Status Screen Laser Cooler bitmaps // #if HAS_COOLER - #define STATUS_COOLER_WIDTH 16 + + #define STATUS_COOLER_WIDTH 22 + const unsigned char status_cooler_bmp2[] PROGMEM = { - B00010000,B00001000, - B00010010,B01001001, - B01010100,B00101010, - B00111000,B00011100, - B11111110,B11111111, - B00111000,B00011100, - B01010100,B00101010, - B10010000,B10001001, - B00010000,B10000000, - B00000100,B10010000, - B00000010,B10100000, - B00000001,B11000000, - B00011111,B11111100, - B00000001,B11000000, - B00000010,B10100000, - B00000100,B10010000 + B00000100,B00000010,B00000000, + B00000100,B10010010,B01000000, + B00010101,B00001010,B10000000, + B00001110,B00000111,B00000000, + B00111111,B10111111,B11000000, + B00001110,B00000111,B00000000, + B00010101,B00001010,B10000000, + B00100100,B00100010,B01000000, + B00000100,B00100000,B00000000, + B00000001,B00100100,B00000000, + B00000000,B10101000,B00000000, + B00000000,B01110000,B00000000, + B00000111,B11111111,B00000000, + B00000000,B01110000,B00000000, + B00000000,B10101000,B00000000, + B00000001,B00100100,B00000000 }; const unsigned char status_cooler_bmp1[] PROGMEM = { - B00010000,B00001000, - B00010010,B01001001, - B01010100,B00101010, - B00101000,B00010100, - B11000111,B01100011, - B00101000,B00010100, - B01010100,B00101010, - B10010000,B10001001, - B00010000,B10000000, - B00000100,B10010000, - B00000010,B10100000, - B00000001,B01000000, - B00011110,B00111100, - B00000001,B01000000, - B00000010,B10100000, - B00000100,B10010000 + B00000100,B00000010,B00000000, + B00000100,B10010010,B01000000, + B00010101,B00001010,B10000000, + B00001010,B00000101,B00000000, + B00110001,B11011000,B11000000, + B00001010,B00000101,B00000000, + B00010101,B00001010,B10000000, + B00100100,B00100010,B01000000, + B00000100,B00100000,B00000000, + B00000001,B00100100,B00000000, + B00000000,B10101000,B00000000, + B00000000,B01010000,B00000000, + B00000111,B10001111,B00000000, + B00000000,B01010000,B00000000, + B00000000,B10101000,B00000000, + B00000001,B00100100,B00000000 }; + #endif #if ENABLED(LASER_COOLANT_FLOW_METER) + #define STATUS_FLOWMETER_WIDTH 24 + const unsigned char status_flowmeter_bmp2[] PROGMEM = { - B00000001,B11111000,B00000000, - B00000110,B00000110,B00000000, - B00001000,B01100001,B00000000, - B00010000,B01100000,B10000000, - B00100000,B01100000,B01000000, - B00100000,B01100000,B01000000, - B01000000,B01100000,B00100000, - B01000000,B01100000,B00100000, - B01011111,B11111111,B10100000, - B01011111,B11111111,B10100000, - B01000000,B01100000,B00100000, - B01000000,B01100000,B00100000, - B00100000,B01100000,B01000000, - B00100000,B01100000,B01000000, - B00010000,B01100000,B10000000, - B00001000,B01100001,B00000000, - B00000110,B00000110,B00000000, - B00000001,B11111000,B00000000, - B00000000,B01100000,B00000000, - B00011111,B11111111,B10000000 + B00000000,B01111110,B00000000, + B00000001,B10000001,B10000000, + B00000010,B00011000,B01000000, + B00000100,B00011000,B00100000, + B00001000,B00011000,B00010000, + B00001000,B00011000,B00010000, + B00010000,B00011000,B00001000, + B00010000,B00011000,B00001000, + B00010111,B11111111,B11101000, + B00010111,B11111111,B11101000, + B00010000,B00011000,B00001000, + B00010000,B00011000,B00001000, + B00001000,B00011000,B00010000, + B00001000,B00011000,B00010000, + B00000100,B00011000,B00100000, + B00000010,B00011000,B01000000, + B00000001,B10000001,B10000000, + B00000000,B01111110,B00000000, + B00000000,B00011000,B00000000, + B00000111,B11111111,B11100000 }; const unsigned char status_flowmeter_bmp1[] PROGMEM = { - B00000001,B11111000,B00000000, - B00000110,B00000110,B00000000, - B00001000,B00000001,B00000000, - B00010100,B00000010,B10000000, - B00101110,B00000111,B01000000, - B00100111,B00001110,B01000000, - B01000011,B10011100,B00100000, - B01000001,B11111000,B00100000, - B01000000,B11110000,B00100000, - B01000000,B11110000,B00100000, - B01000001,B11111000,B00100000, - B01000011,B10011100,B00100000, - B00100111,B00001110,B01000000, - B00101110,B00000111,B01000000, - B00010100,B00000010,B10000000, - B00001000,B00000001,B00000000, - B00000110,B00000110,B00000000, - B00000001,B11111000,B00000000, - B00000000,B01100000,B00000000, - B00011111,B11111111,B10000000 + B00000000,B01111110,B00000000, + B00000001,B10000001,B10000000, + B00000010,B00000000,B01000000, + B00000101,B00000000,B10100000, + B00001011,B10000001,B11010000, + B00001001,B11000011,B10010000, + B00010000,B11100111,B00001000, + B00010000,B01111110,B00001000, + B00010000,B00111100,B00001000, + B00010000,B00111100,B00001000, + B00010000,B01111110,B00001000, + B00010000,B11100111,B00001000, + B00001001,B11000011,B10010000, + B00001011,B10000001,B11010000, + B00000101,B00000000,B10100000, + B00000010,B00000000,B01000000, + B00000001,B10000001,B10000000, + B00000000,B01111110,B00000000, + B00000000,B00011000,B00000000, + B00000111,B11111111,B11100000 }; -#endif +#endif