Merge branch 'async-orient'

Author: benma

src/CMakeLists.txt

@@ -35,8 +35,6 @@ set(DBB-FIRMWARE-SOURCES
   ${CMAKE_SOURCE_DIR}/src/touch/gestures.c
   ${CMAKE_SOURCE_DIR}/src/reset.c
   ${CMAKE_SOURCE_DIR}/src/cipher/cipher.c
-  ${CMAKE_SOURCE_DIR}/src/workflow/blocking.c
-  ${CMAKE_SOURCE_DIR}/src/workflow/idle_workflow.c
   ${CMAKE_SOURCE_DIR}/src/workflow/orientation_screen.c
   ${CMAKE_SOURCE_DIR}/src/queue.c
   ${CMAKE_SOURCE_DIR}/src/usb/usb_processing.c

src/firmware.c

@@ -22,8 +22,6 @@
 #include "qtouch.h"
 #include "screen.h"
 #include "ui/screen_stack.h"
-#include "workflow/idle_workflow.h"
-#include "workflow/orientation_screen.h"
 
 uint32_t __stack_chk_guard = 0;
 
@@ -38,8 +36,6 @@ int main(void)
     qtouch_init();
     common_main();
     bitbox02_smarteeprom_init();
-    orientation_screen_blocking();
-    idle_workflow_blocking();
     firmware_main_loop();
     return 0;
 }

src/firmware_main_loop.c

@@ -22,10 +22,14 @@
 #include "ui/screen_stack.h"
 #include "usb/usb.h"
 #include "usb/usb_processing.h"
+#include "workflow/orientation_screen.h"
 #include <rust/rust.h>
 
 void firmware_main_loop(void)
 {
+    // This starts the async orientation screen workflow, which is processed by the loop below.
+    orientation_screen();
+
     while (1) {
         screen_process();
         /* And finally, run the high-level event processing. */

src/workflow/blocking.c

@@ -1,4 +1,5 @@
 // Copyright 2019 Shift Cryptosecurity AG
+// Copyright 2025 Shift Crypto AG
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,25 +15,49 @@
 
 #include "orientation_screen.h"
 
-#include "blocking.h"
-
+#ifndef TESTING
+#include <hal_timer.h>
+#include <platform/driver_init.h>
+#endif
+#include <hww.h>
 #include <screen.h>
+#include <ui/components/lockscreen.h>
 #include <ui/components/orientation_arrows.h>
 #include <ui/screen_stack.h>
+#include <usb/usb.h>
 
-static void _select_orientation_done(bool upside_down, void* cb_param)
+#ifndef TESTING
+#define IDLE_PERIOD_MS 1300
+
+static struct timer_task _idle_timer_task = {0};
+
+static void _idle_timer_cb(const struct timer_task* const timer_task)
 {
-    *(bool*)cb_param = upside_down;
-    workflow_blocking_unblock();
+    (void)timer_task;
+    usb_start(hww_setup);
+    ui_screen_stack_push(lockscreen_create());
 }
+#endif
 
-void orientation_screen_blocking(void)
+static void _select_orientation_done(bool upside_down, void* cb_param)
 {
-    bool upside_down;
-    ui_screen_stack_push(orientation_arrows_create(_select_orientation_done, &upside_down));
-    workflow_blocking_block();
-    ui_screen_stack_pop_and_clean();
+    (void)cb_param;
     if (upside_down) {
         screen_rotate();
     }
+    ui_screen_stack_pop();
+
+#ifndef TESTING
+    // Added deliberately as a UX/visual improvement, to show the BB02 logo first before moving onto
+    // the lock screen and unlocking USB.
+    _idle_timer_task.interval = IDLE_PERIOD_MS;
+    _idle_timer_task.cb = _idle_timer_cb;
+    _idle_timer_task.mode = TIMER_TASK_ONE_SHOT;
+    timer_add_task(&TIMER_0, &_idle_timer_task);
+#endif
+}
+
+void orientation_screen(void)
+{
+    ui_screen_stack_push(orientation_arrows_create(_select_orientation_done, NULL));
 }

src/workflow/blocking.h

@@ -15,6 +15,6 @@
 #ifndef __ORIENTATION_SCREEN_H
 #define __ORIENTATION_SCREEN_H
 
-void orientation_screen_blocking(void);
+void orientation_screen(void);
 
 #endif // __ORIENTATION_SCREEN_H

src/workflow/idle_workflow.c

@@ -17,7 +17,6 @@
 #include "usb/usb_packet.c"
 #include "usb/usb_processing.c"
 #include "usb/usb_processing.h"
-#include "workflow/idle_workflow.h"
 #include <fcntl.h>
 #include <memory/memory.h>
 #include <mock_memory.h>
@@ -133,7 +132,6 @@ int main(int argc, char* argv[])
 
     smarteeprom_bb02_config();
     bitbox02_smarteeprom_init();
-    idle_workflow_blocking();
 
     // Establish socket connection with client
     sockfd = socket(AF_INET, SOCK_STREAM, 0);