Implement BLE callbacks

also, extract image config

1 files changed, 6 insertions, 4 deletions

diff --git a/src/display.cpp b/src/display.cpp
index f115fd1..bc4c8dc 100644
--- a/src/display.cpp
+++ b/src/display.cpp
@@ -6,6 +6,7 @@
 #include <GxEPD2_BW.h>
 
 #include "badge/config.h"
+#include "badge/util.h"
 
 #if UVOK_EPAP_DISPLAY == DISPLAY_WAVESHARE_219_YBW
 // HINT: Update the library code, set budy timeout to 30 or 60 seconds!
@@ -85,8 +86,7 @@ void de::uvok::badge::display_demo(void)
 #undef TEXT_BORDER
 }
 
-#define IMAGE_DATA_T(name, text) {name##_bits, name##_width, name##_height, text}
-#define IMAGE_DATA(name) {name##_bits, name##_width, name##_height, #name}
+#define IMAGE_DATA(name, text) {name##_bits, name##_width, name##_height, text}
 
 const struct
 {
@@ -95,9 +95,11 @@ const struct
     const int width;
     const int height;
     const char *text;
-} imgs[] = {IMAGE_DATA_T(chleepy, "sleepy"), IMAGE_DATA(hungry), IMAGE_DATA_T(hug, "cuddly"), IMAGE_DATA(uvok)};
+} imgs[] = {
+    #include "./images.cfg"
+};
 
-const int de::uvok::badge::image_count = (sizeof(imgs) / sizeof(imgs[0]));
+const int de::uvok::badge::image_count = (ARRAY_LENGTH(imgs));
 
 typedef enum { DISPLAY_PREVIEW, DISPLAY_FULL} display_mode_t;
 static void displayDo(display_mode_t preview)