Merge branch 'develop' of JF/PineTime into master

6 files changed, 114 insertions, 0 deletions

diff --git a/src/DisplayApp/Icons/bluetooth/ck_os_bt_connected.png b/src/DisplayApp/Icons/bluetooth/ck_os_bt_connected.png
new file mode 100644
index 00000000..53716115
--- /dev/null
+++ b/src/DisplayApp/Icons/bluetooth/ck_os_bt_connected.png
diff --git a/src/DisplayApp/Icons/bluetooth/ck_os_bt_disconnected.png b/src/DisplayApp/Icons/bluetooth/ck_os_bt_disconnected.png
new file mode 100644
index 00000000..3275895d
--- /dev/null
+++ b/src/DisplayApp/Icons/bluetooth/ck_os_bt_disconnected.png
diff --git a/src/DisplayApp/Icons/bluetooth/os_bt_connected.c b/src/DisplayApp/Icons/bluetooth/os_bt_connected.c
new file mode 100644
index 00000000..d30dc9d0
--- /dev/null
+++ b/src/DisplayApp/Icons/bluetooth/os_bt_connected.c
@@ -0,0 +1,56 @@
+#include "lvgl/lvgl.h"
+
+#ifndef LV_ATTRIBUTE_MEM_ALIGN
+#define LV_ATTRIBUTE_MEM_ALIGN
+#endif
+
+#ifndef LV_ATTRIBUTE_IMG_CK_OS_BT_CONNECTED
+#define LV_ATTRIBUTE_IMG_CK_OS_BT_CONNECTED
+#endif
+
+const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_IMG_CK_OS_BT_CONNECTED uint8_t ck_os_bt_connected_map[] = {
+  0x6c, 0xfe, 0x6c, 0xff, 	/*Color of index 0*/
+  0xe4, 0xe6, 0xe4, 0xff, 	/*Color of index 1*/
+
+  0x00, 0x0e, 0x00, 0x00, 
+  0x00, 0x0f, 0x00, 0x00, 
+  0x00, 0x0f, 0x80, 0x00, 
+  0x00, 0x0f, 0xc0, 0x00, 
+  0x00, 0x0f, 0xe0, 0x00, 
+  0x00, 0x0f, 0xf0, 0x00, 
+  0x03, 0x8f, 0xf8, 0x00, 
+  0x03, 0xcf, 0x7c, 0x00, 
+  0x03, 0xef, 0x3e, 0x00, 
+  0x01, 0xff, 0x1f, 0x00, 
+  0x00, 0xff, 0x1f, 0x00, 
+  0x00, 0x7f, 0x3e, 0x00, 
+  0x00, 0x3f, 0x7c, 0x00, 
+  0x00, 0x1f, 0xf8, 0x00, 
+  0x00, 0x0f, 0xf0, 0x00, 
+  0x00, 0x0f, 0xe0, 0x00, 
+  0x00, 0x0f, 0xe0, 0x00, 
+  0x00, 0x0f, 0xf0, 0x00, 
+  0x00, 0x1f, 0xf8, 0x00, 
+  0x00, 0x3f, 0x7c, 0x00, 
+  0x00, 0x7f, 0x3e, 0x00, 
+  0x00, 0xff, 0x1f, 0x00, 
+  0x01, 0xff, 0x1f, 0x00, 
+  0x03, 0xef, 0x3e, 0x00, 
+  0x03, 0xcf, 0x7c, 0x00, 
+  0x03, 0x8f, 0xf8, 0x00, 
+  0x00, 0x0f, 0xf0, 0x00, 
+  0x00, 0x0f, 0xe0, 0x00, 
+  0x00, 0x0f, 0xc0, 0x00, 
+  0x00, 0x0f, 0x80, 0x00, 
+  0x00, 0x0f, 0x00, 0x00, 
+  0x00, 0x0e, 0x00, 0x00, 
+};
+
+const lv_img_dsc_t ck_os_bt_connected = {
+  .header.always_zero = 0,
+  .header.w = 32,
+  .header.h = 32,
+  .data_size = 136,
+  .header.cf = LV_IMG_CF_INDEXED_1BIT,
+  .data = ck_os_bt_connected_map,
+};
diff --git a/src/DisplayApp/Icons/bluetooth/os_bt_connected.png b/src/DisplayApp/Icons/bluetooth/os_bt_connected.png
new file mode 100644
index 00000000..53716115
--- /dev/null
+++ b/src/DisplayApp/Icons/bluetooth/os_bt_connected.png
diff --git a/src/DisplayApp/Icons/bluetooth/os_bt_disconnected.c b/src/DisplayApp/Icons/bluetooth/os_bt_disconnected.c
new file mode 100644
index 00000000..930179b6
--- /dev/null
+++ b/src/DisplayApp/Icons/bluetooth/os_bt_disconnected.c
@@ -0,0 +1,58 @@
+#include "lvgl/lvgl.h"
+
+#ifndef LV_ATTRIBUTE_MEM_ALIGN
+#define LV_ATTRIBUTE_MEM_ALIGN
+#endif
+
+#ifndef LV_ATTRIBUTE_IMG_CK_OS_BT_DISCONNECTED
+#define LV_ATTRIBUTE_IMG_CK_OS_BT_DISCONNECTED
+#endif
+
+const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_IMG_CK_OS_BT_DISCONNECTED uint8_t ck_os_bt_disconnected_map[] = {
+  0x6c, 0xfe, 0x6c, 0xff, 	/*Color of index 0*/
+  0xc4, 0xc2, 0xc4, 0xff, 	/*Color of index 1*/
+  0xe4, 0xe6, 0xe4, 0xff, 	/*Color of index 2*/
+  0xff, 0xff, 0xff, 0xff, 	/*Color of index 3*/
+
+  0x00, 0x00, 0x00, 0x54, 0x00, 0x00, 0x00, 0x00, 
+  0x0a, 0x00, 0x00, 0x55, 0x00, 0x00, 0x00, 0x00, 
+  0x2a, 0x80, 0x00, 0x55, 0x40, 0x00, 0x00, 0x00, 
+  0x2a, 0xa0, 0x00, 0x55, 0x50, 0x00, 0x00, 0x00, 
+  0x0a, 0xa8, 0x00, 0x55, 0x54, 0x00, 0x00, 0x00, 
+  0x02, 0xaa, 0x00, 0x55, 0x55, 0x00, 0x00, 0x00, 
+  0x00, 0xaa, 0x80, 0x55, 0x55, 0x40, 0x00, 0x00, 
+  0x00, 0x2a, 0xa0, 0x55, 0x15, 0x50, 0x00, 0x00, 
+  0x00, 0x0a, 0xa8, 0x15, 0x05, 0x54, 0x00, 0x00, 
+  0x00, 0x02, 0xaa, 0x05, 0x01, 0x55, 0x00, 0x00, 
+  0x00, 0x00, 0xaa, 0x81, 0x01, 0x55, 0x00, 0x00, 
+  0x00, 0x00, 0x2a, 0xa0, 0x05, 0x54, 0x00, 0x00, 
+  0x00, 0x00, 0x0a, 0xa8, 0x15, 0x50, 0x00, 0x00, 
+  0x00, 0x00, 0x02, 0xaa, 0x05, 0x40, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0xaa, 0x81, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x2a, 0xa0, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x0a, 0xa8, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x42, 0xaa, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x01, 0x50, 0xaa, 0x80, 0x00, 0x00, 
+  0x00, 0x00, 0x05, 0x54, 0x2a, 0xa0, 0x00, 0x00, 
+  0x00, 0x00, 0x15, 0x55, 0x0a, 0xa8, 0x00, 0x00, 
+  0x00, 0x00, 0x55, 0x55, 0x02, 0xaa, 0x00, 0x00, 
+  0x00, 0x01, 0x55, 0x55, 0x00, 0xaa, 0x80, 0x00, 
+  0x00, 0x05, 0x54, 0x55, 0x04, 0x2a, 0xa0, 0x00, 
+  0x00, 0x05, 0x50, 0x55, 0x15, 0x0a, 0xa8, 0x00, 
+  0x00, 0x05, 0x40, 0x55, 0x55, 0x42, 0xaa, 0x00, 
+  0x00, 0x00, 0x00, 0x55, 0x55, 0x00, 0xaa, 0x80, 
+  0x00, 0x00, 0x00, 0x55, 0x54, 0x00, 0x2a, 0xa0, 
+  0x00, 0x00, 0x00, 0x55, 0x50, 0x00, 0x0a, 0xa8, 
+  0x00, 0x00, 0x00, 0x55, 0x40, 0x00, 0x02, 0xa8, 
+  0x00, 0x00, 0x00, 0x55, 0x00, 0x00, 0x00, 0xa0, 
+  0x00, 0x00, 0x00, 0x54, 0x00, 0x00, 0x00, 0x00, 
+};
+
+const lv_img_dsc_t ck_os_bt_disconnected = {
+  .header.always_zero = 0,
+  .header.w = 32,
+  .header.h = 32,
+  .data_size = 272,
+  .header.cf = LV_IMG_CF_INDEXED_2BIT,
+  .data = ck_os_bt_disconnected_map,
+};
diff --git a/src/DisplayApp/Icons/bluetooth/os_bt_disconnected.png b/src/DisplayApp/Icons/bluetooth/os_bt_disconnected.png
new file mode 100644
index 00000000..3275895d
--- /dev/null
+++ b/src/DisplayApp/Icons/bluetooth/os_bt_disconnected.png