fix(widget): reorder code

This commit is contained in:
down 2022-06-06 13:11:02 +07:00
parent 79bac9d9e4
commit 6e010d111a
2 changed files with 52 additions and 52 deletions

View file

@ -14,9 +14,9 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
static sys_slist_t widgets = SYS_SLIST_STATIC_INIT(&widgets);
LV_IMG_DECLARE(none);
LV_IMG_DECLARE(left);
LV_IMG_DECLARE(right);
LV_IMG_DECLARE(none);
LV_IMG_DECLARE(both);
enum bongo_state {

View file

@ -4,6 +4,57 @@
#define LV_ATTRIBUTE_MEM_ALIGN
#endif
#ifndef LV_ATTRIBUTE_IMG_NONE
#define LV_ATTRIBUTE_IMG_NONE
#endif
const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_NONE uint8_t none_map[] = {
0xff, 0xff, 0xff, 0xff, /*Color of index 0*/
0x00, 0x00, 0x00, 0xff, /*Color of index 1*/
0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x01, 0x80, 0x80, 0x00, 0x00, 0x00,
0x00, 0x00, 0x06, 0x00, 0x70, 0x00, 0x00, 0x00,
0x00, 0x00, 0x18, 0x00, 0x0e, 0x00, 0x00, 0x00,
0x00, 0x00, 0x60, 0x00, 0x01, 0xc0, 0x00, 0x00,
0x00, 0x38, 0x80, 0x00, 0x00, 0x30, 0x30, 0x00,
0x00, 0x45, 0x00, 0x00, 0x00, 0x0c, 0xc8, 0x00,
0x00, 0x82, 0x00, 0x00, 0x00, 0x03, 0x08, 0x00,
0x00, 0x82, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00,
0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00,
0x00, 0x80, 0x06, 0x00, 0x00, 0x00, 0x08, 0x00,
0x00, 0x80, 0x06, 0x00, 0x00, 0x00, 0x10, 0x00,
0xf0, 0x80, 0x00, 0x48, 0x00, 0x00, 0x10, 0x00,
0x0f, 0x80, 0x00, 0x31, 0x00, 0x70, 0x10, 0x00,
0x00, 0xf0, 0x00, 0x06, 0x30, 0x88, 0x20, 0x00,
0x00, 0x0f, 0x00, 0x00, 0x31, 0x04, 0x20, 0x00,
0x00, 0x00, 0xf0, 0x00, 0x01, 0x04, 0x20, 0x00,
0x00, 0x00, 0x0f, 0x00, 0x01, 0x00, 0x10, 0x00,
0x00, 0x00, 0x00, 0xf0, 0x01, 0x00, 0x10, 0x00,
0x00, 0x00, 0x00, 0x0f, 0x01, 0x00, 0x08, 0x00,
0x00, 0x00, 0x00, 0x00, 0xf1, 0x00, 0x08, 0x00,
0x00, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x04, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x04, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x04, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf4, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
const lv_img_dsc_t none = {
.header.cf = LV_IMG_CF_INDEXED_1BIT,
.header.always_zero = 0,
.header.reserved = 0,
.header.w = 60,
.header.h = 31,
.data_size = 256,
.data = none_map,
};
#ifndef LV_ATTRIBUTE_IMG_LEFT
#define LV_ATTRIBUTE_IMG_LEFT
#endif
@ -106,57 +157,6 @@ const lv_img_dsc_t right = {
.data = right_map,
};
#ifndef LV_ATTRIBUTE_IMG_NONE
#define LV_ATTRIBUTE_IMG_NONE
#endif
const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_NONE uint8_t none_map[] = {
0xff, 0xff, 0xff, 0xff, /*Color of index 0*/
0x00, 0x00, 0x00, 0xff, /*Color of index 1*/
0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x01, 0x80, 0x80, 0x00, 0x00, 0x00,
0x00, 0x00, 0x06, 0x00, 0x70, 0x00, 0x00, 0x00,
0x00, 0x00, 0x18, 0x00, 0x0e, 0x00, 0x00, 0x00,
0x00, 0x00, 0x60, 0x00, 0x01, 0xc0, 0x00, 0x00,
0x00, 0x38, 0x80, 0x00, 0x00, 0x30, 0x30, 0x00,
0x00, 0x45, 0x00, 0x00, 0x00, 0x0c, 0xc8, 0x00,
0x00, 0x82, 0x00, 0x00, 0x00, 0x03, 0x08, 0x00,
0x00, 0x82, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00,
0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00,
0x00, 0x80, 0x06, 0x00, 0x00, 0x00, 0x08, 0x00,
0x00, 0x80, 0x06, 0x00, 0x00, 0x00, 0x10, 0x00,
0xf0, 0x80, 0x00, 0x48, 0x00, 0x00, 0x10, 0x00,
0x0f, 0x80, 0x00, 0x31, 0x00, 0x70, 0x10, 0x00,
0x00, 0xf0, 0x00, 0x06, 0x30, 0x88, 0x20, 0x00,
0x00, 0x0f, 0x00, 0x00, 0x31, 0x04, 0x20, 0x00,
0x00, 0x00, 0xf0, 0x00, 0x01, 0x04, 0x20, 0x00,
0x00, 0x00, 0x0f, 0x00, 0x01, 0x00, 0x10, 0x00,
0x00, 0x00, 0x00, 0xf0, 0x01, 0x00, 0x10, 0x00,
0x00, 0x00, 0x00, 0x0f, 0x01, 0x00, 0x08, 0x00,
0x00, 0x00, 0x00, 0x00, 0xf1, 0x00, 0x08, 0x00,
0x00, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x04, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x04, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x04, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf4, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
const lv_img_dsc_t none = {
.header.cf = LV_IMG_CF_INDEXED_1BIT,
.header.always_zero = 0,
.header.reserved = 0,
.header.w = 60,
.header.h = 31,
.data_size = 256,
.data = none_map,
};
#ifndef LV_ATTRIBUTE_IMG_BOTH
#define LV_ATTRIBUTE_IMG_BOTH
#endif