Merge pull request #1448 from NickeZ/nickez/bootaoder-pairing-beautify

ble: Make bootloader pairing confirmation better

Author: NickeZ

src/bootloader/bootloader.c

@@ -299,7 +299,7 @@ static void _render_message(const char* message, int duration)
     delay_ms(duration);
 }
 
-static void _render_default_screen(void)
+void bootloader_render_default_screen(void)
 {
     UG_ClearBuffer();
     _load_logo();
@@ -310,6 +310,30 @@ static void _render_default_screen(void)
     UG_SendBuffer();
 }
 
+extern bool bootloader_pairing_request;
+extern uint8_t bootloader_pairing_code_bytes[16];
+
+void bootloader_render_ble_confirm_screen(bool confirmed)
+{
+    bootloader_pairing_request = true;
+    uint32_t pairing_code_int = (*(uint32_t*)&bootloader_pairing_code_bytes[0]) % 1000000;
+    char code_str[10] = {0};
+    snprintf(code_str, sizeof(code_str), "%06u", (unsigned)pairing_code_int);
+    UG_ClearBuffer();
+    uint16_t check_width = IMAGE_DEFAULT_CHECKMARK_HEIGHT + IMAGE_DEFAULT_CHECKMARK_HEIGHT / 2 - 1;
+    UG_FontSelect(&font_font_a_11X10);
+    if (confirmed) {
+        UG_PutString(15, 0, "Confirm on app", false);
+    } else {
+        UG_PutString(30, 0, "Pairing code", false);
+        image_cross(SCREEN_WIDTH / 16, 0, IMAGE_DEFAULT_CROSS_HEIGHT);
+        image_checkmark(SCREEN_WIDTH * 15 / 16 - check_width, 0, IMAGE_DEFAULT_CHECKMARK_HEIGHT);
+    }
+    UG_FontSelect(&font_monogram_5X9);
+    UG_PutString(45, SCREEN_HEIGHT / 2 - 9, code_str, false);
+    UG_SendBuffer();
+}
+
 static void _render_progress(float progress)
 {
     UG_ClearBuffer();
@@ -378,7 +402,7 @@ static void _render_hash(const char* title, const uint8_t* hash)
         UG_SendBuffer();
         delay_ms(1000);
     }
-    _render_default_screen();
+    bootloader_render_default_screen();
 }
 
 // Sets _is_app_flash_empty by computing a "bare" hash, identical to _firmware_hash
@@ -786,7 +810,7 @@ static size_t _api_screen_rotate(uint8_t* output)
         return _report_status(OP_STATUS_ERR_LOAD_FLAG, output);
     }
     screen_rotate();
-    _render_default_screen();
+    bootloader_render_default_screen();
     return _report_status(OP_STATUS_OK, output);
 }
 
@@ -840,7 +864,7 @@ static size_t _api_command(const uint8_t* input, uint8_t* output, const size_t m
         uint8_t chunk_num = input[1];
         len = _api_write_chunk(input + 2, chunk_num, output);
         if (output[1] != OP_STATUS_OK) {
-            _render_default_screen();
+            bootloader_render_default_screen();
         } else {
             _render_progress((float)chunk_num / (float)(_firmware_num_chunks - 1));
         }
@@ -1021,7 +1045,7 @@ void bootloader_jump(void)
     // App not entered. Start USB API to receive boot commands
     util_log("Not jumping to firmware");
     _compute_is_app_flash_empty();
-    _render_default_screen();
+    bootloader_render_default_screen();
     if (usb_start(_api_setup) != ERR_NONE) {
         _render_message("Failed to initialize USB", 0);
     }

src/bootloader/bootloader.h

@@ -15,6 +15,21 @@
 #ifndef _BOOTLOADER_H_
 #define _BOOTLOADER_H_
 
+#include <stdbool.h>
+
 void bootloader_jump(void);
 
+/**
+ * Renders the default bootloader screen
+ */
+void bootloader_render_default_screen(void);
+
+/**
+ * Renders a BLE pairing confirmations screen. Use the `confirmed` argument to display the
+ * "user has confirmed on bitbox" version.
+ *
+ * confirmed - If false renders Yes/No icons at top, otherwise renders "See app".
+ */
+void bootloader_render_ble_confirm_screen(bool confirmed);
+
 #endif

src/bootloader/startup.c

@@ -156,10 +156,10 @@ int main(void)
                 bool ok;
                 UG_ClearBuffer();
                 if (qtouch_get_scroller_position(top_slider) < 127) {
-                    UG_PutString(0, 0, "deny", false);
+                    bootloader_render_default_screen();
                     ok = false;
                 } else {
-                    UG_PutString(0, 0, "confirm", false);
+                    bootloader_render_ble_confirm_screen(true);
                     ok = true;
                 }
                 uint8_t payload[18] = {0};

src/da14531/da14531_handler.c

@@ -22,6 +22,7 @@
 #include "usb/usb_packet.h"
 #include "utils_ringbuffer.h"
 #include <ui/components/confirm.h>
+#include <ui/components/ui_images.h>
 #include <ui/fonts/monogram_5X9.h>
 
 struct da14531_ctrl_frame {
@@ -64,21 +65,9 @@ static void _ble_pairing_callback(bool ok, void* param)
     _ble_pairing_component = NULL;
 }
 #else
+#include <bootloader/bootloader.h>
 extern bool bootloader_pairing_request;
 extern uint8_t bootloader_pairing_code_bytes[16];
-
-static void _bootloader_pairing_code_confirm(void)
-{
-    bootloader_pairing_request = true;
-    uint32_t pairing_code_int = (*(uint32_t*)&bootloader_pairing_code_bytes[0]) % 1000000;
-    char code_str[7] = {0};
-    snprintf(code_str, sizeof(code_str), "%lu", (unsigned long)pairing_code_int);
-    UG_ClearBuffer();
-    UG_PutString(0, 0, "Deny", false);
-    UG_PutString(SCREEN_WIDTH - 50, 0, "Confirm", false);
-    UG_PutString(80, SCREEN_HEIGHT / 2 + 2, code_str, false);
-    UG_SendBuffer();
-}
 #endif
 
 static void _ctrl_handler(struct da14531_ctrl_frame* frame, struct ringbuffer* queue)
@@ -165,11 +154,15 @@ static void _ctrl_handler(struct da14531_ctrl_frame* frame, struct ringbuffer* q
             &bootloader_pairing_code_bytes[0],
             &frame->cmd_data[0],
             sizeof(bootloader_pairing_code_bytes));
-        _bootloader_pairing_code_confirm();
+        bootloader_render_ble_confirm_screen(false);
 #endif
     } break;
     case CTRL_CMD_BLE_STATUS:
         // util_log("da14531: BLE status update");
+#if defined(BOOTLOADER)
+        bootloader_pairing_request = false;
+        bootloader_render_default_screen();
+#endif
         switch (frame->cmd_data[0]) {
         case 0:
             util_log("da14531: adveritising");

src/sd.c

@@ -228,7 +228,7 @@ bool sd_list_subdir(sd_list_t* list_out, const char* subdir)
     }
     list_out->num_files = 0;
     size_t allocated_files = 16;
-    list_out->files = (char**)calloc(sizeof(char*), allocated_files);
+    list_out->files = (char**)calloc(allocated_files, sizeof(char*));
     if (list_out->files == NULL) {
         Abort("Error: alloc sd_list_subdir");
     }