diff --git a/aseprite_c/graphics/bitmaps.c b/aseprite_c/graphics/bitmaps.c index 1215691..0a6bc9e 100644 --- a/aseprite_c/graphics/bitmaps.c +++ b/aseprite_c/graphics/bitmaps.c @@ -3,59 +3,55 @@ #include -/* 24x24: no_flame */ -// ··········██····█······· -// ···········██···██······ -// ············██·········· -// ············███·····█··· -// ·······█····███····█···· -// ·····██····█████··█···█· -// ····██···██████··█···█·· -// ····█···██████··█···█··· -// ···██··██████··█···█···· -// ···█··██████··█···█····· -// ···█··█████··█···█······ -// ······████··█···█······· -// ·······██··█···█··█··█·· -// ··········█···█··██··██· -// ···█·····█···█··████··█· -// ··█·····█···█··█████···· -// ··██···█···█··██████···· -// ··██··█···█····█████···· -// ·····█···█·····█████···· -// ····█···█······█·███···· -// ···█···█·········██····· -// ··█···█·········██······ -// ·····█··██······█······· -// ····█··········█········ -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 }; +/* 21x22: no_flame */ +// ········██····█······ +// ·········██···██····· +// ··········██········· +// ··········███········ +// ·····█····███···█···· +// ···██····████··███··· +// ··██···█████··███···· +// ··█···█████··███····· +// ·██··█████··███······ +// ·█··█████··███······· +// ·█··████··███··█····· +// ····███··███··███···· +// ·····█··███···███··█· +// ·······███··█████··██ +// ·█····███··███████··█ +// █····███···███████··· +// ██··███··█··██████··· +// █··███··██···█████··· +// ··███··███···█████··· +// ·███··██·····█·███··· +// ███··█·········██···· +// ·█··███·······██····· +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 }; -/* 24x24: flame */ -// ··········██····█······· -// ···········██···██······ -// ············██·········· -// ············███········· -// ·······█····███········· -// ·····██····█████···█···· -// ····██···███████··█····· -// ····█···███████··██····· -// ···██··████████·██······ -// ···█··████████··██······ -// ···█··████████·███······ -// ······████████·████····· -// ·······████·███·███··█·· -// ········███·███████··██· -// ···█·····██··███████··█· -// ··█·······██·███████···· -// ··██·····███··██████···· -// ··█████·████···█████···· -// ···█████████···█████···· -// ····██████·····█·███···· -// ·····███·········██····· -// ······███·······██······ -// ········██······█······· -// ···············█········ -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 }; +/* 21x22: flame */ +// ········██····█······ +// ·········██···██····· +// ··········██········· +// ··········███········ +// ·····█····███········ +// ···██····█████···█··· +// ··██···███████··█···· +// ··█···███████··██···· +// ·██··████████·██····· +// ·█··████████··██····· +// ·█··████████·███····· +// ····████████·████···· +// ·····████·███·███··█· +// ······███·███████··██ +// ·█·····██··███████··█ +// █·······██·███████··· +// ██·····███··██████··· +// █████·████···█████··· +// ·█████████···█████··· +// ··██████·····█·███··· +// ···███·········██···· +// ····███·······██····· +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 }; /* 84x48: boot_logo */ // ···················································································· @@ -109,8 +105,8 @@ static const uint8_t G_FLAME_BYTES[] = { 0x00, 0x00, 0x00, 0x00, 0xc0, 0x60, 0x2 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 }; static const struct BitmapImage bitmaps[] = { - { .name="no_flame", .width=24, .height=24, .bytes=G_NO_FLAME_BYTES }, - { .name="flame", .width=24, .height=24, .bytes=G_FLAME_BYTES }, + { .name="no_flame", .width=21, .height=22, .bytes=G_NO_FLAME_BYTES }, + { .name="flame", .width=21, .height=22, .bytes=G_FLAME_BYTES }, { .name="boot_logo", .width=84, .height=48, .bytes=G_BOOT_LOGO_BYTES }, {} }; @@ -121,6 +117,7 @@ const struct BitmapImage *Bitmap_Get(const char *name) { if (0 == strcmp(ptr->name, name)) { return ptr; } + ptr++; } return NULL; } diff --git a/aseprite_c/graphics/flame.ico b/aseprite_c/graphics/flame.ico index b06bf93..4267348 100644 Binary files a/aseprite_c/graphics/flame.ico and b/aseprite_c/graphics/flame.ico differ diff --git a/aseprite_c/graphics/gfx2h b/aseprite_c/graphics/gfx2h index 4c68f2e..7913df0 100755 Binary files a/aseprite_c/graphics/gfx2h and b/aseprite_c/graphics/gfx2h differ diff --git a/aseprite_c/graphics/gfx2h.rs b/aseprite_c/graphics/gfx2h.rs index 81ded79..cdb8e93 100644 --- a/aseprite_c/graphics/gfx2h.rs +++ b/aseprite_c/graphics/gfx2h.rs @@ -156,6 +156,7 @@ const struct BitmapImage *Bitmap_Get(const char *name) {{ if (0 == strcmp(ptr->name, name)) {{ return ptr; }} + ptr++; }} return NULL; }} diff --git a/aseprite_c/graphics/no_flame.ase b/aseprite_c/graphics/no_flame.ase new file mode 100644 index 0000000..eb23ae6 Binary files /dev/null and b/aseprite_c/graphics/no_flame.ase differ diff --git a/aseprite_c/graphics/no_flame.ico b/aseprite_c/graphics/no_flame.ico index c2253b4..27788d3 100644 Binary files a/aseprite_c/graphics/no_flame.ico and b/aseprite_c/graphics/no_flame.ico differ diff --git a/main/graphics/bitmaps.c b/main/graphics/bitmaps.c index 4e7d01e..0a6bc9e 100644 --- a/main/graphics/bitmaps.c +++ b/main/graphics/bitmaps.c @@ -3,59 +3,55 @@ #include -/* 24x24: no_flame */ -// ··········██····█······· -// ···········██···██······ -// ············██·········· -// ············███·····█··· -// ·······█····███····█···· -// ·····██····█████··█···█· -// ····██···██████··█···█·· -// ····█···██████··█···█··· -// ···██··██████··█···█···· -// ···█··██████··█···█····· -// ···█··█████··█···█······ -// ······████··█···█······· -// ·······██··█···█··█··█·· -// ··········█···█··██··██· -// ···█·····█···█··████··█· -// ··█·····█···█··█████···· -// ··██···█···█··██████···· -// ··██··█···█····█████···· -// ·····█···█·····█████···· -// ····█···█······█·███···· -// ···█···█·········██····· -// ··█···█·········██······ -// ·····█··██······█······· -// ····█··········█········ -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 }; +/* 21x22: no_flame */ +// ········██····█······ +// ·········██···██····· +// ··········██········· +// ··········███········ +// ·····█····███···█···· +// ···██····████··███··· +// ··██···█████··███···· +// ··█···█████··███····· +// ·██··█████··███······ +// ·█··█████··███······· +// ·█··████··███··█····· +// ····███··███··███···· +// ·····█··███···███··█· +// ·······███··█████··██ +// ·█····███··███████··█ +// █····███···███████··· +// ██··███··█··██████··· +// █··███··██···█████··· +// ··███··███···█████··· +// ·███··██·····█·███··· +// ███··█·········██···· +// ·█··███·······██····· +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 }; -/* 24x24: flame */ -// ··········██····█······· -// ···········██···██······ -// ············██·········· -// ············███········· -// ·······█····███········· -// ·····██····█████···█···· -// ····██···███████··█····· -// ····█···███████··██····· -// ···██··████████·██······ -// ···█··████████··██······ -// ···█··████████·███······ -// ······████████·████····· -// ·······████·███·███··█·· -// ········███·███████··██· -// ···█·····██··███████··█· -// ··█·······██·███████···· -// ··██·····███··██████···· -// ··█████·████···█████···· -// ···█████████···█████···· -// ····██████·····█·███···· -// ·····███·········██····· -// ······███·······██······ -// ········██······█······· -// ···············█········ -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 }; +/* 21x22: flame */ +// ········██····█······ +// ·········██···██····· +// ··········██········· +// ··········███········ +// ·····█····███········ +// ···██····█████···█··· +// ··██···███████··█···· +// ··█···███████··██···· +// ·██··████████·██····· +// ·█··████████··██····· +// ·█··████████·███····· +// ····████████·████···· +// ·····████·███·███··█· +// ······███·███████··██ +// ·█·····██··███████··█ +// █·······██·███████··· +// ██·····███··██████··· +// █████·████···█████··· +// ·█████████···█████··· +// ··██████·····█·███··· +// ···███·········██···· +// ····███·······██····· +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 }; /* 84x48: boot_logo */ // ···················································································· @@ -109,14 +105,14 @@ static const uint8_t G_FLAME_BYTES[] = { 0x00, 0x00, 0x00, 0x00, 0xc0, 0x60, 0x2 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 }; static const struct BitmapImage bitmaps[] = { - { .name="no_flame", .width=24, .height=24, .bytes=G_NO_FLAME_BYTES }, - { .name="flame", .width=24, .height=24, .bytes=G_FLAME_BYTES }, + { .name="no_flame", .width=21, .height=22, .bytes=G_NO_FLAME_BYTES }, + { .name="flame", .width=21, .height=22, .bytes=G_FLAME_BYTES }, { .name="boot_logo", .width=84, .height=48, .bytes=G_BOOT_LOGO_BYTES }, {} }; const struct BitmapImage *Bitmap_Get(const char *name) { - const struct BitmapImage *ptr = bitmaps; + const struct BitmapImage *ptr = &bitmaps[0]; while (ptr->name) { if (0 == strcmp(ptr->name, name)) { return ptr; @@ -125,3 +121,4 @@ const struct BitmapImage *Bitmap_Get(const char *name) { } return NULL; } + \ No newline at end of file diff --git a/main/scenes/scene_manual_menu.c b/main/scenes/scene_manual_menu.c index 340d2ad..eb0db2c 100644 --- a/main/scenes/scene_manual_menu.c +++ b/main/scenes/scene_manual_menu.c @@ -51,7 +51,7 @@ static struct SceneEvent onChildReturn(struct MenuScene *self, uint32_t tag, int return SceneEvent_Repaint(); } -#define XLINE 38 +#define XLINE 40 void print_labels(struct MenuItem *items) { snprintf(items[0].label, MENUITEM_LABEL_LEN, "▶%.0f°C", fire_get_setpoint(false));