Merge branch piggz/nav into develop:

 - fix conflict
 - add a icon for the navigation app.

1 files changed, 96 insertions, 0 deletions

diff --git a/src/displayapp/icons/navigation/roundabout-slight-right.c b/src/displayapp/icons/navigation/roundabout-slight-right.c
new file mode 100644
index 00000000..e4ee2188
--- /dev/null
+++ b/src/displayapp/icons/navigation/roundabout-slight-right.c
@@ -0,0 +1,96 @@
+#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_ROUNDABOUT_SLIGHT_RIGHT
+#define LV_ATTRIBUTE_IMG_ROUNDABOUT_SLIGHT_RIGHT
+#endif
+
+const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_ROUNDABOUT_SLIGHT_RIGHT uint8_t roundabout_slight_right_map[] = {
+  0x04, 0x02, 0x04, 0xff, 	/*Color of index 0*/
+  0xfc, 0xfe, 0xfc, 0xff, 	/*Color of index 1*/
+
+  0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc0, 
+  0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0xc0, 
+  0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0xc0, 
+  0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0xc0, 
+  0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0xc0, 
+  0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0xc0, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc0, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xff, 0xc0, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xff, 0xc0, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xc0, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xc0, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc0, 
+  0x00, 0x00, 0x00, 0x00, 0x01, 0xff, 0xff, 0xc0, 
+  0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0xc0, 
+  0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 0xff, 0xc0, 
+  0x00, 0x00, 0x0f, 0xf0, 0x0f, 0xff, 0xdf, 0xc0, 
+  0x00, 0x00, 0xff, 0xff, 0x1f, 0xff, 0x9f, 0xc0, 
+  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xc0, 
+  0x00, 0x0f, 0xff, 0xff, 0xff, 0xfe, 0x0f, 0xc0, 
+  0x00, 0x1f, 0xff, 0xff, 0xff, 0xfc, 0x0f, 0x80, 
+  0x00, 0x3f, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 
+  0x00, 0x7f, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x00, 
+  0x00, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 
+  0x00, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 
+  0x01, 0xff, 0xfc, 0x3f, 0xff, 0x80, 0x00, 0x00, 
+  0x01, 0xff, 0xf0, 0x0f, 0xff, 0x80, 0x00, 0x00, 
+  0x01, 0xff, 0xc0, 0x03, 0xff, 0xc0, 0x00, 0x00, 
+  0x01, 0xff, 0x80, 0x01, 0xff, 0xc0, 0x00, 0x00, 
+  0x01, 0xff, 0x00, 0x00, 0xff, 0xc0, 0x00, 0x00, 
+  0x01, 0xfe, 0x00, 0x00, 0x7f, 0xe0, 0x00, 0x00, 
+  0x01, 0xfe, 0x00, 0x00, 0x7f, 0xe0, 0x00, 0x00, 
+  0x01, 0xfc, 0x00, 0x00, 0x3f, 0xe0, 0x00, 0x00, 
+  0x01, 0xfc, 0x00, 0x00, 0x3f, 0xe0, 0x00, 0x00, 
+  0x01, 0xfc, 0x00, 0x00, 0x3f, 0xe0, 0x00, 0x00, 
+  0x01, 0xfc, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 
+  0x01, 0xfc, 0x00, 0x00, 0x3f, 0xe0, 0x00, 0x00, 
+  0x01, 0xfc, 0x00, 0x00, 0x3f, 0xe0, 0x00, 0x00, 
+  0x01, 0xfc, 0x00, 0x00, 0x3f, 0xe0, 0x00, 0x00, 
+  0x01, 0xfe, 0x00, 0x00, 0x7f, 0xe0, 0x00, 0x00, 
+  0x01, 0xff, 0x00, 0x00, 0xff, 0xe0, 0x00, 0x00, 
+  0x01, 0xff, 0x00, 0x00, 0xff, 0xc0, 0x00, 0x00, 
+  0x01, 0xff, 0x80, 0x01, 0xff, 0xc0, 0x00, 0x00, 
+  0x01, 0xff, 0xc0, 0x03, 0xff, 0xc0, 0x00, 0x00, 
+  0x01, 0xff, 0xf0, 0x0f, 0xff, 0x80, 0x00, 0x00, 
+  0x01, 0xff, 0xfc, 0x3f, 0xff, 0x80, 0x00, 0x00, 
+  0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 
+  0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 
+  0x00, 0x7f, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 
+  0x00, 0x3f, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 
+  0x00, 0x1f, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x00, 
+  0x00, 0x07, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 
+  0x00, 0x03, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x7f, 0xfe, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 0x00, 
+};
+
+const lv_img_dsc_t roundabout_slight_right = {
+      {
+        LV_IMG_CF_INDEXED_1BIT,
+        0,
+        0,
+        64,
+        64
+    },
+    520,
+roundabout_slight_right_map,
+};