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

1 files changed, 0 insertions, 93 deletions

diff --git a/src/displayapp/icons/navigation/.c b/src/displayapp/icons/navigation/.c
deleted file mode 100644
index 3bfa1c66..00000000
--- a/src/displayapp/icons/navigation/.c
+++ /dev/null
@@ -1,93 +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_
-#define LV_ATTRIBUTE_IMG_
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_ uint8_t _map[] = {
-  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
-  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
-
-  0x00, 0x00, 0x00, 0x0f, 0xff, 0xff, 0xf8, 0x00, 
-  0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xfc, 0x00, 
-  0x00, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 0x00, 
-  0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 0x80, 
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xc0, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xe0, 
-  0x00, 0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xf0, 
-  0x00, 0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf8, 
-  0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xf8, 
-  0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xfc, 
-  0x00, 0x00, 0x3f, 0xff, 0xff, 0x7f, 0xff, 0xfe, 
-  0x00, 0x00, 0x3f, 0xff, 0xf0, 0x0f, 0xff, 0xfe, 
-  0x00, 0x00, 0x7f, 0xff, 0xe0, 0x03, 0xff, 0xfe, 
-  0x00, 0x00, 0x7f, 0xff, 0x80, 0x01, 0xff, 0xfe, 
-  0x00, 0x00, 0x7f, 0xff, 0x00, 0x00, 0xff, 0xfe, 
-  0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x7f, 0xfe, 
-  0x00, 0x00, 0xff, 0xfc, 0x00, 0x00, 0x3f, 0xfe, 
-  0x00, 0x00, 0xff, 0xfc, 0x00, 0x00, 0x1f, 0xfe, 
-  0x00, 0x00, 0xff, 0xf8, 0x00, 0x00, 0x1f, 0xfe, 
-  0x00, 0x00, 0xff, 0xf8, 0x00, 0x00, 0x0f, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x0f, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x0f, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x0f, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe, 
-  0x7c, 0x00, 0xff, 0xf0, 0x03, 0xf0, 0x07, 0xfe, 
-  0x7f, 0x00, 0xff, 0xf0, 0x1f, 0xf0, 0x07, 0xfe, 
-  0x7f, 0xc0, 0xff, 0xf0, 0x7f, 0xf0, 0x07, 0xfe, 
-  0x7f, 0xf8, 0xff, 0xf1, 0xff, 0xf0, 0x07, 0xfe, 
-  0x7f, 0xfe, 0xff, 0xf7, 0xff, 0xf0, 0x07, 0xfe, 
-  0x7f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x07, 0xfe, 
-  0x7f, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x07, 0xfe, 
-  0x7f, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x07, 0xfe, 
-  0x7f, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x07, 0xfe, 
-  0x3f, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x07, 0xfe, 
-  0x3f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x07, 0xfe, 
-  0x1f, 0xff, 0xff, 0xff, 0xff, 0x00, 0x07, 0xfe, 
-  0x0f, 0xff, 0xff, 0xff, 0xff, 0x00, 0x07, 0xfe, 
-  0x07, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x07, 0xfe, 
-  0x03, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x07, 0xfe, 
-  0x03, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x07, 0xfe, 
-  0x01, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x07, 0xfe, 
-  0x00, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x07, 0xfe, 
-  0x00, 0x7f, 0xff, 0xff, 0xe0, 0x00, 0x07, 0xfe, 
-  0x00, 0x7f, 0xff, 0xff, 0xc0, 0x00, 0x07, 0xfe, 
-  0x00, 0x3f, 0xff, 0xff, 0x80, 0x00, 0x07, 0xfe, 
-  0x00, 0x1f, 0xff, 0xff, 0x80, 0x00, 0x07, 0xfe, 
-  0x00, 0x0f, 0xff, 0xff, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x07, 0xff, 0xfe, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x07, 0xff, 0xfc, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x03, 0xff, 0xfc, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x01, 0xff, 0xf8, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0xff, 0xe0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0x7f, 0xc0, 0x00, 0x00, 0x07, 0xfe, 
-  0x00, 0x00, 0x3f, 0xc0, 0x00, 0x00, 0x07, 0xfe, 
-};
-
-const lv_img_dsc_t  = {
-  .header.always_zero = 0,
-  .header.w = 64,
-  .header.h = 64,
-  .data_size = 520,
-  .header.cf = LV_IMG_CF_INDEXED_1BIT,
-  .data = _map,
-};