Przeglądaj źródła

Tweak cooler / flowmeter icons (#21573)

Mike La Spina 4 lat temu
rodzic
commit
1e357b3c74
No account linked to committer's email address

+ 2
- 2
Marlin/src/lcd/dogm/dogm_Statusscreen.h Wyświetl plik

@@ -547,7 +547,7 @@
547 547
     #endif
548 548
 
549 549
     #ifndef STATUS_COOLER_TEXT_X
550
-      #define STATUS_COOLER_TEXT_X (STATUS_COOLER_X + 8)
550
+      #define STATUS_COOLER_TEXT_X (STATUS_COOLER_X + 12)
551 551
     #endif
552 552
 
553 553
     static_assert(
@@ -583,7 +583,7 @@
583 583
     #endif
584 584
 
585 585
     #ifndef STATUS_FLOWMETER_TEXT_X
586
-      #define STATUS_FLOWMETER_TEXT_X (STATUS_FLOWMETER_X + 8)
586
+      #define STATUS_FLOWMETER_TEXT_X (STATUS_FLOWMETER_X + 12)
587 587
     #endif
588 588
 
589 589
     static_assert(

+ 79
- 74
Marlin/src/lcd/dogm/status/cooler.h Wyświetl plik

@@ -25,90 +25,95 @@
25 25
 // lcd/dogm/status/cooler.h - Status Screen Laser Cooler bitmaps
26 26
 //
27 27
 #if HAS_COOLER
28
-  #define STATUS_COOLER_WIDTH 16
28
+
29
+  #define STATUS_COOLER_WIDTH 22
30
+
29 31
   const unsigned char status_cooler_bmp2[] PROGMEM = {
30
-    B00010000,B00001000,
31
-    B00010010,B01001001,
32
-    B01010100,B00101010,
33
-    B00111000,B00011100,
34
-    B11111110,B11111111,
35
-    B00111000,B00011100,
36
-    B01010100,B00101010,
37
-    B10010000,B10001001,
38
-    B00010000,B10000000,
39
-    B00000100,B10010000,
40
-    B00000010,B10100000,
41
-    B00000001,B11000000,
42
-    B00011111,B11111100,
43
-    B00000001,B11000000,
44
-    B00000010,B10100000,
45
-    B00000100,B10010000
32
+    B00000100,B00000010,B00000000,
33
+    B00000100,B10010010,B01000000,
34
+    B00010101,B00001010,B10000000,
35
+    B00001110,B00000111,B00000000,
36
+    B00111111,B10111111,B11000000,
37
+    B00001110,B00000111,B00000000,
38
+    B00010101,B00001010,B10000000,
39
+    B00100100,B00100010,B01000000,
40
+    B00000100,B00100000,B00000000,
41
+    B00000001,B00100100,B00000000,
42
+    B00000000,B10101000,B00000000,
43
+    B00000000,B01110000,B00000000,
44
+    B00000111,B11111111,B00000000,
45
+    B00000000,B01110000,B00000000,
46
+    B00000000,B10101000,B00000000,
47
+    B00000001,B00100100,B00000000
46 48
   };
47 49
   const unsigned char status_cooler_bmp1[] PROGMEM = {
48
-    B00010000,B00001000,
49
-    B00010010,B01001001,
50
-    B01010100,B00101010,
51
-    B00101000,B00010100,
52
-    B11000111,B01100011,
53
-    B00101000,B00010100,
54
-    B01010100,B00101010,
55
-    B10010000,B10001001,
56
-    B00010000,B10000000,
57
-    B00000100,B10010000,
58
-    B00000010,B10100000,
59
-    B00000001,B01000000,
60
-    B00011110,B00111100,
61
-    B00000001,B01000000,
62
-    B00000010,B10100000,
63
-    B00000100,B10010000
50
+    B00000100,B00000010,B00000000,
51
+    B00000100,B10010010,B01000000,
52
+    B00010101,B00001010,B10000000,
53
+    B00001010,B00000101,B00000000,
54
+    B00110001,B11011000,B11000000,
55
+    B00001010,B00000101,B00000000,
56
+    B00010101,B00001010,B10000000,
57
+    B00100100,B00100010,B01000000,
58
+    B00000100,B00100000,B00000000,
59
+    B00000001,B00100100,B00000000,
60
+    B00000000,B10101000,B00000000,
61
+    B00000000,B01010000,B00000000,
62
+    B00000111,B10001111,B00000000,
63
+    B00000000,B01010000,B00000000,
64
+    B00000000,B10101000,B00000000,
65
+    B00000001,B00100100,B00000000
64 66
   };
67
+
65 68
 #endif
66 69
 
67 70
 #if ENABLED(LASER_COOLANT_FLOW_METER)
71
+
68 72
   #define STATUS_FLOWMETER_WIDTH 24
73
+
69 74
   const unsigned char status_flowmeter_bmp2[] PROGMEM = {
70
-    B00000001,B11111000,B00000000,
71
-    B00000110,B00000110,B00000000,
72
-    B00001000,B01100001,B00000000,
73
-    B00010000,B01100000,B10000000,
74
-    B00100000,B01100000,B01000000,
75
-    B00100000,B01100000,B01000000,
76
-    B01000000,B01100000,B00100000,
77
-    B01000000,B01100000,B00100000,
78
-    B01011111,B11111111,B10100000,
79
-    B01011111,B11111111,B10100000,
80
-    B01000000,B01100000,B00100000,
81
-    B01000000,B01100000,B00100000,
82
-    B00100000,B01100000,B01000000,
83
-    B00100000,B01100000,B01000000,
84
-    B00010000,B01100000,B10000000,
85
-    B00001000,B01100001,B00000000,
86
-    B00000110,B00000110,B00000000,
87
-    B00000001,B11111000,B00000000,
88
-    B00000000,B01100000,B00000000,
89
-    B00011111,B11111111,B10000000
75
+    B00000000,B01111110,B00000000,
76
+    B00000001,B10000001,B10000000,
77
+    B00000010,B00011000,B01000000,
78
+    B00000100,B00011000,B00100000,
79
+    B00001000,B00011000,B00010000,
80
+    B00001000,B00011000,B00010000,
81
+    B00010000,B00011000,B00001000,
82
+    B00010000,B00011000,B00001000,
83
+    B00010111,B11111111,B11101000,
84
+    B00010111,B11111111,B11101000,
85
+    B00010000,B00011000,B00001000,
86
+    B00010000,B00011000,B00001000,
87
+    B00001000,B00011000,B00010000,
88
+    B00001000,B00011000,B00010000,
89
+    B00000100,B00011000,B00100000,
90
+    B00000010,B00011000,B01000000,
91
+    B00000001,B10000001,B10000000,
92
+    B00000000,B01111110,B00000000,
93
+    B00000000,B00011000,B00000000,
94
+    B00000111,B11111111,B11100000
90 95
   };
91 96
   const unsigned char status_flowmeter_bmp1[] PROGMEM = {
92
-    B00000001,B11111000,B00000000,
93
-    B00000110,B00000110,B00000000,
94
-    B00001000,B00000001,B00000000,
95
-    B00010100,B00000010,B10000000,
96
-    B00101110,B00000111,B01000000,
97
-    B00100111,B00001110,B01000000,
98
-    B01000011,B10011100,B00100000,
99
-    B01000001,B11111000,B00100000,
100
-    B01000000,B11110000,B00100000,
101
-    B01000000,B11110000,B00100000,
102
-    B01000001,B11111000,B00100000,
103
-    B01000011,B10011100,B00100000,
104
-    B00100111,B00001110,B01000000,
105
-    B00101110,B00000111,B01000000,
106
-    B00010100,B00000010,B10000000,
107
-    B00001000,B00000001,B00000000,
108
-    B00000110,B00000110,B00000000,
109
-    B00000001,B11111000,B00000000,
110
-    B00000000,B01100000,B00000000,
111
-    B00011111,B11111111,B10000000
97
+    B00000000,B01111110,B00000000,
98
+    B00000001,B10000001,B10000000,
99
+    B00000010,B00000000,B01000000,
100
+    B00000101,B00000000,B10100000,
101
+    B00001011,B10000001,B11010000,
102
+    B00001001,B11000011,B10010000,
103
+    B00010000,B11100111,B00001000,
104
+    B00010000,B01111110,B00001000,
105
+    B00010000,B00111100,B00001000,
106
+    B00010000,B00111100,B00001000,
107
+    B00010000,B01111110,B00001000,
108
+    B00010000,B11100111,B00001000,
109
+    B00001001,B11000011,B10010000,
110
+    B00001011,B10000001,B11010000,
111
+    B00000101,B00000000,B10100000,
112
+    B00000010,B00000000,B01000000,
113
+    B00000001,B10000001,B10000000,
114
+    B00000000,B01111110,B00000000,
115
+    B00000000,B00011000,B00000000,
116
+    B00000111,B11111111,B11100000
112 117
   };
113
-#endif
114 118
 
119
+#endif

Ładowanie…
Anuluj
Zapisz