diff options
author | Jean-François Milants <jf@codingfield.com> | 2021-04-09 21:16:21 +0200 |
---|---|---|
committer | Jean-François Milants <jf@codingfield.com> | 2021-04-09 21:16:21 +0200 |
commit | 15b3b8e282dd5b2132b0095716cd9d88740d4579 (patch) | |
tree | c26870103f8baaa933399cfb86cca25aa7e60d8b /src/displayapp/icons/navigation/merge-slight-right.c | |
parent | 9ac4be8b759bb2cedeb999ce5e87d983261beded (diff) | |
parent | 57b4c3f0edc6acfa31bd2160abdcd6091920ba63 (diff) |
Merge branch 'develop' into motion-sensor
# Conflicts:
# src/CMakeLists.txt
# src/displayapp/Apps.h
# src/displayapp/DisplayApp.cpp
# src/displayapp/DisplayApp.h
# src/displayapp/lv_pinetime_theme.c
# src/displayapp/screens/ApplicationList.cpp
# src/drivers/TwiMaster.cpp
# src/systemtask/SystemTask.h
Diffstat (limited to 'src/displayapp/icons/navigation/merge-slight-right.c')
-rw-r--r-- | src/displayapp/icons/navigation/merge-slight-right.c | 96 |
1 files changed, 0 insertions, 96 deletions
diff --git a/src/displayapp/icons/navigation/merge-slight-right.c b/src/displayapp/icons/navigation/merge-slight-right.c deleted file mode 100644 index 9e5a25e8..00000000 --- a/src/displayapp/icons/navigation/merge-slight-right.c +++ /dev/null @@ -1,96 +0,0 @@ -#if defined(LV_LVGL_H_INCLUDE_SIMPLE) -#include "lvgl.h" -#else -#include "lvgl/lvgl.h" -#endif - - -#ifndef LV_ATTRIBUTE_MEM_ALIGN -#define LV_ATTRIBUTE_MEM_ALIGN -#endif - -#ifndef LV_ATTRIBUTE_IMG_MERGE_SLIGHT_RIGHT -#define LV_ATTRIBUTE_IMG_MERGE_SLIGHT_RIGHT -#endif - -const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_MERGE_SLIGHT_RIGHT uint8_t merge_slight_right_map[] = { - 0x04, 0x02, 0x04, 0xff, /*Color of index 0*/ - 0xfc, 0xfe, 0xfc, 0xff, /*Color of index 1*/ - - 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc0, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x7f, 0xe0, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x7f, 0xe0, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x01, 0xff, 0xf8, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x03, 0xff, 0xfc, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x03, 0xff, 0xfc, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x07, 0xff, 0xfe, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x0f, 0xff, 0xff, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0x80, 0x00, - 0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xc0, 0x00, - 0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xc0, 0x00, - 0x00, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xe0, 0x00, - 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xf0, 0x00, - 0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 0xf8, 0x00, - 0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 0xf8, 0x00, - 0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xfc, 0x00, - 0x00, 0x00, 0x07, 0xff, 0xff, 0xff, 0xfe, 0x00, - 0x00, 0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0x00, - 0x00, 0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0x00, - 0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x80, - 0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 0x80, - 0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 0x80, - 0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 0x80, - 0x00, 0x00, 0x3f, 0xfe, 0xff, 0xf7, 0xff, 0x80, - 0x00, 0x00, 0x3f, 0xfc, 0xff, 0xf1, 0xff, 0x80, - 0x00, 0x00, 0x3f, 0xe0, 0xff, 0xf0, 0x7f, 0x80, - 0x00, 0x00, 0x3f, 0x80, 0xff, 0xf0, 0x1f, 0x80, - 0x00, 0x00, 0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x01, 0xff, 0xf0, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x01, 0xff, 0xf0, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x01, 0xff, 0xf0, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x03, 0xff, 0xf0, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x07, 0xff, 0xf0, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x07, 0xff, 0xf0, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x0f, 0xff, 0xf0, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x1f, 0xff, 0xf0, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x3f, 0xff, 0xf0, 0x00, 0x00, - 0x00, 0x00, 0x00, 0xff, 0xff, 0xf0, 0x00, 0x00, - 0x00, 0x00, 0x01, 0xff, 0xff, 0xf0, 0x00, 0x00, - 0x00, 0x00, 0x07, 0xff, 0xff, 0xf0, 0x00, 0x00, - 0x00, 0x00, 0x0f, 0xff, 0xff, 0xf0, 0x00, 0x00, - 0x00, 0x00, 0x3f, 0xff, 0xff, 0xf0, 0x00, 0x00, - 0x00, 0x00, 0xff, 0xff, 0xfd, 0xf0, 0x00, 0x00, - 0x00, 0x01, 0xff, 0xff, 0xf9, 0xf0, 0x00, 0x00, - 0x00, 0x07, 0xff, 0xff, 0xf9, 0xf0, 0x00, 0x00, - 0x00, 0x1f, 0xff, 0xff, 0xf9, 0xf0, 0x00, 0x00, - 0x00, 0x3f, 0xff, 0xff, 0xf9, 0xf0, 0x00, 0x00, - 0x00, 0x7f, 0xff, 0xff, 0xf9, 0xf0, 0x00, 0x00, - 0x00, 0xff, 0xff, 0xfe, 0xf9, 0xf0, 0x00, 0x00, - 0x00, 0xff, 0xff, 0xfc, 0xf9, 0xf0, 0x00, 0x00, - 0x00, 0xff, 0xff, 0xf0, 0xf9, 0xf0, 0x00, 0x00, - 0x00, 0xff, 0xff, 0xe0, 0xf9, 0xf0, 0x00, 0x00, - 0x00, 0xff, 0xff, 0x80, 0xf9, 0xf0, 0x00, 0x00, - 0x00, 0xff, 0xfe, 0x00, 0xf9, 0xf0, 0x00, 0x00, - 0x00, 0xff, 0xfc, 0x00, 0xf9, 0xf0, 0x00, 0x00, - 0x00, 0xff, 0xf0, 0x00, 0xf9, 0xf0, 0x00, 0x00, - 0x00, 0xff, 0xe0, 0x00, 0xff, 0xf0, 0x00, 0x00, - 0x00, 0xff, 0x80, 0x00, 0xff, 0xf0, 0x00, 0x00, - 0x00, 0x7e, 0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, -}; - -const lv_img_dsc_t merge_slight_right = { - { - LV_IMG_CF_INDEXED_1BIT, - 0, - 0, - 64, - 64 - }, - 520, -merge_slight_right_map, -}; |