Browse Source

better icon, bugfix in bitmaps generator script

Ondřej Hruška 1 year ago
parent
commit
7240773581
Signed by: Ondřej Hruška <ondra@ondrovo.com> GPG key ID: 2C5FD5035250423D

+ 51 - 54
aseprite_c/graphics/bitmaps.c View File

@@ -3,59 +3,55 @@
3 3
 #include <string.h>
4 4
 
5 5
 
6
-/* 24x24: no_flame */
7
-// ··········██····█·······
8
-// ···········██···██······
9
-// ············██··········
10
-// ············███·····█···
11
-// ·······█····███····█····
12
-// ·····██····█████··█···█·
13
-// ····██···██████··█···█··
14
-// ····█···██████··█···█···
15
-// ···██··██████··█···█····
16
-// ···█··██████··█···█·····
17
-// ···█··█████··█···█······
18
-// ······████··█···█·······
19
-// ·······██··█···█··█··█··
20
-// ··········█···█··██··██·
21
-// ···█·····█···█··████··█·
22
-// ··█·····█···█··█████····
23
-// ··██···█···█··██████····
24
-// ··██··█···█····█████····
25
-// ·····█···█·····█████····
26
-// ····█···█······█·███····
27
-// ···█···█·········██·····
28
-// ··█···█·········██······
29
-// ·····█··██······█·······
30
-// ····█··········█········
31
-static const uint8_t G_NO_FLAME_BYTES[] = { 0x00, 0x00, 0x00, 0x00, 0xc0, 0x60, 0x20, 0x10, 0x80, 0xc0, 0xc1, 0xe3, 0xfe, 0xfc, 0x78, 0x20, 0x83, 0x42, 0x20, 0x10, 0x88, 0x40, 0x20, 0x00, 0x00, 0x00, 0x80, 0x47, 0x01, 0x00, 0x0e, 0x1f, 0x9f, 0x4f, 0x27, 0x13, 0x89, 0x44, 0x22, 0x91, 0xc8, 0xe4, 0xf2, 0xc1, 0x00, 0x30, 0x60, 0x00, 0x00, 0x00, 0x23, 0x13, 0x88, 0x44, 0x22, 0x11, 0x48, 0x44, 0x02, 0x01, 0x00, 0x00, 0x01, 0x8f, 0x67, 0x3f, 0x1f, 0x0f, 0x00, 0x00, 0x00, 0x00 };
6
+/* 21x22: no_flame */
7
+// ········██····█······
8
+// ·········██···██·····
9
+// ··········██·········
10
+// ··········███········
11
+// ·····█····███···█····
12
+// ···██····████··███···
13
+// ··██···█████··███····
14
+// ··█···█████··███·····
15
+// ·██··█████··███······
16
+// ·█··█████··███·······
17
+// ·█··████··███··█·····
18
+// ····███··███··███····
19
+// ·····█··███···███··█·
20
+// ·······███··█████··██
21
+// ·█····███··███████··█
22
+// █····███···███████···
23
+// ██··███··█··██████···
24
+// █··███··██···█████···
25
+// ··███··███···█████···
26
+// ·███··██·····█·███···
27
+// ███··█·········██····
28
+// ·█··███·······██·····
29
+static const uint8_t G_NO_FLAME_BYTES[] = { 0x00, 0x00, 0xc0, 0x60, 0x20, 0x10, 0x80, 0xc0, 0xc1, 0xe3, 0xfe, 0x7c, 0x38, 0x80, 0xc3, 0xe2, 0x70, 0x20, 0x00, 0x00, 0x00, 0x80, 0x47, 0x01, 0x00, 0x0e, 0x9f, 0xcf, 0xe7, 0x73, 0x39, 0x1c, 0xce, 0xe7, 0xe3, 0xf9, 0xfc, 0xf8, 0xc0, 0x00, 0x30, 0x60, 0x13, 0x39, 0x1c, 0x0e, 0x27, 0x33, 0x29, 0x0c, 0x06, 0x07, 0x00, 0x00, 0x01, 0x0f, 0x27, 0x3f, 0x1f, 0x0f, 0x00, 0x00, 0x00 };
32 30
 
33
-/* 24x24: flame */
34
-// ··········██····█·······
35
-// ···········██···██······
36
-// ············██··········
37
-// ············███·········
38
-// ·······█····███·········
39
-// ·····██····█████···█····
40
-// ····██···███████··█·····
41
-// ····█···███████··██·····
42
-// ···██··████████·██······
43
-// ···█··████████··██······
44
-// ···█··████████·███······
45
-// ······████████·████·····
46
-// ·······████·███·███··█··
47
-// ········███·███████··██·
48
-// ···█·····██··███████··█·
49
-// ··█·······██·███████····
50
-// ··██·····███··██████····
51
-// ··█████·████···█████····
52
-// ···█████████···█████····
53
-// ····██████·····█·███····
54
-// ·····███·········██·····
55
-// ······███·······██······
56
-// ········██······█·······
57
-// ···············█········
58
-static const uint8_t G_FLAME_BYTES[] = { 0x00, 0x00, 0x00, 0x00, 0xc0, 0x60, 0x20, 0x10, 0x80, 0xc0, 0xc1, 0xe3, 0xfe, 0xfc, 0xf8, 0x60, 0x03, 0x82, 0xc0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x47, 0x01, 0x00, 0x0e, 0x1f, 0x3f, 0x7f, 0xff, 0x8f, 0x3f, 0xff, 0xf1, 0xec, 0xff, 0xff, 0xf8, 0xc0, 0x00, 0x30, 0x60, 0x00, 0x00, 0x00, 0x03, 0x07, 0x0e, 0x1e, 0x3e, 0x3c, 0x6e, 0x4f, 0x07, 0x07, 0x00, 0x00, 0x01, 0x8f, 0x67, 0x3f, 0x1f, 0x0f, 0x00, 0x00, 0x00, 0x00 };
31
+/* 21x22: flame */
32
+// ········██····█······
33
+// ·········██···██·····
34
+// ··········██·········
35
+// ··········███········
36
+// ·····█····███········
37
+// ···██····█████···█···
38
+// ··██···███████··█····
39
+// ··█···███████··██····
40
+// ·██··████████·██·····
41
+// ·█··████████··██·····
42
+// ·█··████████·███·····
43
+// ····████████·████····
44
+// ·····████·███·███··█·
45
+// ······███·███████··██
46
+// ·█·····██··███████··█
47
+// █·······██·███████···
48
+// ██·····███··██████···
49
+// █████·████···█████···
50
+// ·█████████···█████···
51
+// ··██████·····█·███···
52
+// ···███·········██····
53
+// ····███·······██·····
54
+static const uint8_t G_FLAME_BYTES[] = { 0x00, 0x00, 0xc0, 0x60, 0x20, 0x10, 0x80, 0xc0, 0xc1, 0xe3, 0xfe, 0xfc, 0xf8, 0x60, 0x03, 0x82, 0xc0, 0x20, 0x00, 0x00, 0x00, 0x80, 0x47, 0x01, 0x00, 0x0e, 0x1f, 0x3f, 0x7f, 0xff, 0x8f, 0x3f, 0xff, 0xf1, 0xec, 0xff, 0xff, 0xf8, 0xc0, 0x00, 0x30, 0x60, 0x03, 0x07, 0x0e, 0x1e, 0x3e, 0x3c, 0x2e, 0x0f, 0x07, 0x07, 0x00, 0x00, 0x01, 0x0f, 0x27, 0x3f, 0x1f, 0x0f, 0x00, 0x00, 0x00 };
59 55
 
60 56
 /* 84x48: boot_logo */
61 57
 // ····················································································
@@ -109,8 +105,8 @@ static const uint8_t G_FLAME_BYTES[] = { 0x00, 0x00, 0x00, 0x00, 0xc0, 0x60, 0x2
109 105
 static const uint8_t G_BOOT_LOGO_BYTES[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0xc0, 0xc0, 0x40, 0xc0, 0xc0, 0x40, 0xc0, 0xa0, 0xa0, 0x20, 0xa0, 0xa0, 0xe0, 0x60, 0xd0, 0x90, 0xd0, 0xd0, 0xf0, 0xf0, 0xc8, 0xe8, 0xe8, 0xb8, 0xb8, 0x64, 0xd4, 0xb4, 0x94, 0x9c, 0x14, 0x0c, 0x0c, 0x1c, 0x14, 0x34, 0x34, 0x34, 0x12, 0x1a, 0x0a, 0x0a, 0x06, 0x82, 0x82, 0x82, 0x44, 0x44, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xc0, 0xc0, 0x60, 0x60, 0x60, 0x50, 0x30, 0x30, 0x38, 0x3c, 0x3c, 0x2c, 0x2c, 0x3c, 0x2e, 0x2e, 0x3e, 0x3e, 0x37, 0x3d, 0x2b, 0x3f, 0x3d, 0x2f, 0x3f, 0x3f, 0x5f, 0x4d, 0xad, 0x25, 0x16, 0x1d, 0x1f, 0x1e, 0x0a, 0x1b, 0x09, 0x0d, 0x04, 0x02, 0x03, 0x03, 0xc3, 0x43, 0x43, 0x43, 0xa5, 0x63, 0x23, 0x22, 0x21, 0x91, 0xd1, 0x31, 0x11, 0x08, 0x08, 0x28, 0x58, 0x2c, 0x04, 0x34, 0x1c, 0x16, 0x0a, 0x0a, 0x16, 0x0a, 0x05, 0x01, 0x04, 0x0b, 0x0f, 0x3c, 0x10, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x09, 0x09, 0x10, 0x10, 0x10, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x38, 0xe8, 0x08, 0xf4, 0x4c, 0x32, 0x29, 0x10, 0x08, 0x00, 0x10, 0x48, 0x84, 0x02, 0x05, 0x02, 0x05, 0x02, 0x01, 0x00, 0x00, 0x02, 0x05, 0x82, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x60, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x80, 0x87, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x06, 0x08, 0x10, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x8c, 0xb0, 0xc0, 0x80, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x11, 0x16, 0x18, 0x30, 0x28, 0x08, 0x08, 0x08, 0x08, 0x04, 0x05, 0x06, 0x04, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0xa1, 0x41, 0xa1, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x0f, 0x10, 0x20, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x0c, 0x05, 0x06, 0x02, 0x02, 0x02, 0x01, 0x01, 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x02, 0x07, 0x02, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x20, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x7f, 0x44, 0x44, 0x44, 0x2b, 0x10, 0x00, 0x02, 0xff, 0x19, 0x29, 0x29, 0x49, 0x49, 0xc6, 0x04, 0x0a, 0x09, 0x3f, 0x49, 0x49, 0x49, 0x49, 0x41, 0x21, 0x21, 0x00, 0x50, 0x38, 0x16, 0x11, 0x16, 0x18, 0x70, 0x40, 0x00, 0x21, 0x21, 0x3f, 0x21, 0x21, 0x11, 0x09, 0x06, 0x00, 0x0a, 0x09, 0x7f, 0x05, 0x05, 0x05, 0x05, 0x05, 0x00, 0x00, 0x1e, 0x21, 0x20, 0x20, 0x20, 0x20, 0x0e, 0x11, 0x20, 0x10, 0x09, 0x06, 0x00, 0x00, 0x00, 0x07, 0x18, 0x21, 0x1f, 0x08, 0x10, 0x20, 0x10, 0x0f, 0x00, 0x00, 0x00 };
110 106
 
111 107
 static const struct BitmapImage bitmaps[] = { 
112
-    { .name="no_flame", .width=24, .height=24, .bytes=G_NO_FLAME_BYTES },
113
-    { .name="flame", .width=24, .height=24, .bytes=G_FLAME_BYTES },
108
+    { .name="no_flame", .width=21, .height=22, .bytes=G_NO_FLAME_BYTES },
109
+    { .name="flame", .width=21, .height=22, .bytes=G_FLAME_BYTES },
114 110
     { .name="boot_logo", .width=84, .height=48, .bytes=G_BOOT_LOGO_BYTES },
115 111
     {}
116 112
 };
@@ -121,6 +117,7 @@ const struct BitmapImage *Bitmap_Get(const char *name) {
121 117
         if (0 == strcmp(ptr->name, name)) {
122 118
             return ptr;
123 119
         }
120
+        ptr++;
124 121
     }
125 122
     return NULL;
126 123
 }

BIN
aseprite_c/graphics/flame.ico View File


BIN
aseprite_c/graphics/gfx2h View File


+ 1 - 0
aseprite_c/graphics/gfx2h.rs View File

@@ -156,6 +156,7 @@ const struct BitmapImage *Bitmap_Get(const char *name) {{
156 156
         if (0 == strcmp(ptr->name, name)) {{
157 157
             return ptr;
158 158
         }}
159
+        ptr++;
159 160
     }}
160 161
     return NULL;
161 162
 }}

BIN
aseprite_c/graphics/no_flame.ase View File


BIN
aseprite_c/graphics/no_flame.ico View File


+ 52 - 55
main/graphics/bitmaps.c View File

@@ -3,59 +3,55 @@
3 3
 #include <string.h>
4 4
 
5 5
 
6
-/* 24x24: no_flame */
7
-// ··········██····█·······
8
-// ···········██···██······
9
-// ············██··········
10
-// ············███·····█···
11
-// ·······█····███····█····
12
-// ·····██····█████··█···█·
13
-// ····██···██████··█···█··
14
-// ····█···██████··█···█···
15
-// ···██··██████··█···█····
16
-// ···█··██████··█···█·····
17
-// ···█··█████··█···█······
18
-// ······████··█···█·······
19
-// ·······██··█···█··█··█··
20
-// ··········█···█··██··██·
21
-// ···█·····█···█··████··█·
22
-// ··█·····█···█··█████····
23
-// ··██···█···█··██████····
24
-// ··██··█···█····█████····
25
-// ·····█···█·····█████····
26
-// ····█···█······█·███····
27
-// ···█···█·········██·····
28
-// ··█···█·········██······
29
-// ·····█··██······█·······
30
-// ····█··········█········
31
-static const uint8_t G_NO_FLAME_BYTES[] = { 0x00, 0x00, 0x00, 0x00, 0xc0, 0x60, 0x20, 0x10, 0x80, 0xc0, 0xc1, 0xe3, 0xfe, 0xfc, 0x78, 0x20, 0x83, 0x42, 0x20, 0x10, 0x88, 0x40, 0x20, 0x00, 0x00, 0x00, 0x80, 0x47, 0x01, 0x00, 0x0e, 0x1f, 0x9f, 0x4f, 0x27, 0x13, 0x89, 0x44, 0x22, 0x91, 0xc8, 0xe4, 0xf2, 0xc1, 0x00, 0x30, 0x60, 0x00, 0x00, 0x00, 0x23, 0x13, 0x88, 0x44, 0x22, 0x11, 0x48, 0x44, 0x02, 0x01, 0x00, 0x00, 0x01, 0x8f, 0x67, 0x3f, 0x1f, 0x0f, 0x00, 0x00, 0x00, 0x00 };
6
+/* 21x22: no_flame */
7
+// ········██····█······
8
+// ·········██···██·····
9
+// ··········██·········
10
+// ··········███········
11
+// ·····█····███···█····
12
+// ···██····████··███···
13
+// ··██···█████··███····
14
+// ··█···█████··███·····
15
+// ·██··█████··███······
16
+// ·█··█████··███·······
17
+// ·█··████··███··█·····
18
+// ····███··███··███····
19
+// ·····█··███···███··█·
20
+// ·······███··█████··██
21
+// ·█····███··███████··█
22
+// █····███···███████···
23
+// ██··███··█··██████···
24
+// █··███··██···█████···
25
+// ··███··███···█████···
26
+// ·███··██·····█·███···
27
+// ███··█·········██····
28
+// ·█··███·······██·····
29
+static const uint8_t G_NO_FLAME_BYTES[] = { 0x00, 0x00, 0xc0, 0x60, 0x20, 0x10, 0x80, 0xc0, 0xc1, 0xe3, 0xfe, 0x7c, 0x38, 0x80, 0xc3, 0xe2, 0x70, 0x20, 0x00, 0x00, 0x00, 0x80, 0x47, 0x01, 0x00, 0x0e, 0x9f, 0xcf, 0xe7, 0x73, 0x39, 0x1c, 0xce, 0xe7, 0xe3, 0xf9, 0xfc, 0xf8, 0xc0, 0x00, 0x30, 0x60, 0x13, 0x39, 0x1c, 0x0e, 0x27, 0x33, 0x29, 0x0c, 0x06, 0x07, 0x00, 0x00, 0x01, 0x0f, 0x27, 0x3f, 0x1f, 0x0f, 0x00, 0x00, 0x00 };
32 30
 
33
-/* 24x24: flame */
34
-// ··········██····█·······
35
-// ···········██···██······
36
-// ············██··········
37
-// ············███·········
38
-// ·······█····███·········
39
-// ·····██····█████···█····
40
-// ····██···███████··█·····
41
-// ····█···███████··██·····
42
-// ···██··████████·██······
43
-// ···█··████████··██······
44
-// ···█··████████·███······
45
-// ······████████·████·····
46
-// ·······████·███·███··█··
47
-// ········███·███████··██·
48
-// ···█·····██··███████··█·
49
-// ··█·······██·███████····
50
-// ··██·····███··██████····
51
-// ··█████·████···█████····
52
-// ···█████████···█████····
53
-// ····██████·····█·███····
54
-// ·····███·········██·····
55
-// ······███·······██······
56
-// ········██······█·······
57
-// ···············█········
58
-static const uint8_t G_FLAME_BYTES[] = { 0x00, 0x00, 0x00, 0x00, 0xc0, 0x60, 0x20, 0x10, 0x80, 0xc0, 0xc1, 0xe3, 0xfe, 0xfc, 0xf8, 0x60, 0x03, 0x82, 0xc0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x47, 0x01, 0x00, 0x0e, 0x1f, 0x3f, 0x7f, 0xff, 0x8f, 0x3f, 0xff, 0xf1, 0xec, 0xff, 0xff, 0xf8, 0xc0, 0x00, 0x30, 0x60, 0x00, 0x00, 0x00, 0x03, 0x07, 0x0e, 0x1e, 0x3e, 0x3c, 0x6e, 0x4f, 0x07, 0x07, 0x00, 0x00, 0x01, 0x8f, 0x67, 0x3f, 0x1f, 0x0f, 0x00, 0x00, 0x00, 0x00 };
31
+/* 21x22: flame */
32
+// ········██····█······
33
+// ·········██···██·····
34
+// ··········██·········
35
+// ··········███········
36
+// ·····█····███········
37
+// ···██····█████···█···
38
+// ··██···███████··█····
39
+// ··█···███████··██····
40
+// ·██··████████·██·····
41
+// ·█··████████··██·····
42
+// ·█··████████·███·····
43
+// ····████████·████····
44
+// ·····████·███·███··█·
45
+// ······███·███████··██
46
+// ·█·····██··███████··█
47
+// █·······██·███████···
48
+// ██·····███··██████···
49
+// █████·████···█████···
50
+// ·█████████···█████···
51
+// ··██████·····█·███···
52
+// ···███·········██····
53
+// ····███·······██·····
54
+static const uint8_t G_FLAME_BYTES[] = { 0x00, 0x00, 0xc0, 0x60, 0x20, 0x10, 0x80, 0xc0, 0xc1, 0xe3, 0xfe, 0xfc, 0xf8, 0x60, 0x03, 0x82, 0xc0, 0x20, 0x00, 0x00, 0x00, 0x80, 0x47, 0x01, 0x00, 0x0e, 0x1f, 0x3f, 0x7f, 0xff, 0x8f, 0x3f, 0xff, 0xf1, 0xec, 0xff, 0xff, 0xf8, 0xc0, 0x00, 0x30, 0x60, 0x03, 0x07, 0x0e, 0x1e, 0x3e, 0x3c, 0x2e, 0x0f, 0x07, 0x07, 0x00, 0x00, 0x01, 0x0f, 0x27, 0x3f, 0x1f, 0x0f, 0x00, 0x00, 0x00 };
59 55
 
60 56
 /* 84x48: boot_logo */
61 57
 // ····················································································
@@ -109,14 +105,14 @@ static const uint8_t G_FLAME_BYTES[] = { 0x00, 0x00, 0x00, 0x00, 0xc0, 0x60, 0x2
109 105
 static const uint8_t G_BOOT_LOGO_BYTES[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0xc0, 0xc0, 0x40, 0xc0, 0xc0, 0x40, 0xc0, 0xa0, 0xa0, 0x20, 0xa0, 0xa0, 0xe0, 0x60, 0xd0, 0x90, 0xd0, 0xd0, 0xf0, 0xf0, 0xc8, 0xe8, 0xe8, 0xb8, 0xb8, 0x64, 0xd4, 0xb4, 0x94, 0x9c, 0x14, 0x0c, 0x0c, 0x1c, 0x14, 0x34, 0x34, 0x34, 0x12, 0x1a, 0x0a, 0x0a, 0x06, 0x82, 0x82, 0x82, 0x44, 0x44, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xc0, 0xc0, 0x60, 0x60, 0x60, 0x50, 0x30, 0x30, 0x38, 0x3c, 0x3c, 0x2c, 0x2c, 0x3c, 0x2e, 0x2e, 0x3e, 0x3e, 0x37, 0x3d, 0x2b, 0x3f, 0x3d, 0x2f, 0x3f, 0x3f, 0x5f, 0x4d, 0xad, 0x25, 0x16, 0x1d, 0x1f, 0x1e, 0x0a, 0x1b, 0x09, 0x0d, 0x04, 0x02, 0x03, 0x03, 0xc3, 0x43, 0x43, 0x43, 0xa5, 0x63, 0x23, 0x22, 0x21, 0x91, 0xd1, 0x31, 0x11, 0x08, 0x08, 0x28, 0x58, 0x2c, 0x04, 0x34, 0x1c, 0x16, 0x0a, 0x0a, 0x16, 0x0a, 0x05, 0x01, 0x04, 0x0b, 0x0f, 0x3c, 0x10, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x09, 0x09, 0x10, 0x10, 0x10, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x38, 0xe8, 0x08, 0xf4, 0x4c, 0x32, 0x29, 0x10, 0x08, 0x00, 0x10, 0x48, 0x84, 0x02, 0x05, 0x02, 0x05, 0x02, 0x01, 0x00, 0x00, 0x02, 0x05, 0x82, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x60, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x80, 0x87, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x06, 0x08, 0x10, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x8c, 0xb0, 0xc0, 0x80, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x11, 0x16, 0x18, 0x30, 0x28, 0x08, 0x08, 0x08, 0x08, 0x04, 0x05, 0x06, 0x04, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0xa1, 0x41, 0xa1, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x0f, 0x10, 0x20, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x0c, 0x05, 0x06, 0x02, 0x02, 0x02, 0x01, 0x01, 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x02, 0x07, 0x02, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x20, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x7f, 0x44, 0x44, 0x44, 0x2b, 0x10, 0x00, 0x02, 0xff, 0x19, 0x29, 0x29, 0x49, 0x49, 0xc6, 0x04, 0x0a, 0x09, 0x3f, 0x49, 0x49, 0x49, 0x49, 0x41, 0x21, 0x21, 0x00, 0x50, 0x38, 0x16, 0x11, 0x16, 0x18, 0x70, 0x40, 0x00, 0x21, 0x21, 0x3f, 0x21, 0x21, 0x11, 0x09, 0x06, 0x00, 0x0a, 0x09, 0x7f, 0x05, 0x05, 0x05, 0x05, 0x05, 0x00, 0x00, 0x1e, 0x21, 0x20, 0x20, 0x20, 0x20, 0x0e, 0x11, 0x20, 0x10, 0x09, 0x06, 0x00, 0x00, 0x00, 0x07, 0x18, 0x21, 0x1f, 0x08, 0x10, 0x20, 0x10, 0x0f, 0x00, 0x00, 0x00 };
110 106
 
111 107
 static const struct BitmapImage bitmaps[] = { 
112
-    { .name="no_flame", .width=24, .height=24, .bytes=G_NO_FLAME_BYTES },
113
-    { .name="flame", .width=24, .height=24, .bytes=G_FLAME_BYTES },
108
+    { .name="no_flame", .width=21, .height=22, .bytes=G_NO_FLAME_BYTES },
109
+    { .name="flame", .width=21, .height=22, .bytes=G_FLAME_BYTES },
114 110
     { .name="boot_logo", .width=84, .height=48, .bytes=G_BOOT_LOGO_BYTES },
115 111
     {}
116 112
 };
117 113
 
118 114
 const struct BitmapImage *Bitmap_Get(const char *name) {
119
-    const struct BitmapImage *ptr = bitmaps;
115
+    const struct BitmapImage *ptr = &bitmaps[0];
120 116
     while (ptr->name) {
121 117
         if (0 == strcmp(ptr->name, name)) {
122 118
             return ptr;
@@ -125,3 +121,4 @@ const struct BitmapImage *Bitmap_Get(const char *name) {
125 121
     }
126 122
     return NULL;
127 123
 }
124
+    

+ 1 - 1
main/scenes/scene_manual_menu.c View File

@@ -51,7 +51,7 @@ static struct SceneEvent onChildReturn(struct MenuScene *self, uint32_t tag, int
51 51
     return SceneEvent_Repaint();
52 52
 }
53 53
 
54
-#define XLINE 38
54
+#define XLINE 40
55 55
 
56 56
 void print_labels(struct MenuItem *items) {
57 57
     snprintf(items[0].label, MENUITEM_LABEL_LEN, "▶%.0f°C", fire_get_setpoint(false));