USB mass storage driver (#146)

Tactility/Source/Tactility.cpp

@@ -54,6 +54,7 @@ namespace app {
     namespace settings { extern const AppManifest manifest; }
     namespace systeminfo { extern const AppManifest manifest; }
     namespace textviewer { extern const AppManifest manifest; }
+    namespace usbsettings { extern const AppManifest manifest; }
     namespace wifiapsettings { extern const AppManifest manifest; }
     namespace wificonnect { extern const AppManifest manifest; }
     namespace wifimanage { extern const AppManifest manifest; }
@@ -86,6 +87,7 @@ static const std::vector<const app::AppManifest*> system_apps = {
     &app::selectiondialog::manifest,
     &app::systeminfo::manifest,
     &app::textviewer::manifest,
+    &app::usbsettings::manifest,
     &app::wifiapsettings::manifest,
     &app::wificonnect::manifest,
     &app::wifimanage::manifest,

Tactility/Source/app/boot/Boot.cpp

@@ -9,6 +9,7 @@
 
 #include "lvgl.h"
 #include "Tactility.h"
+#include "hal/usb/Usb.h"
 
 #ifdef ESP_PLATFORM
 #include "kernel/PanicHandler.h"
@@ -31,29 +32,33 @@ struct Data {
 };
 
 static int32_t bootThreadCallback(TT_UNUSED void* context) {
-    TickType_t start_time = tt::kernel::getTicks();
+    TickType_t start_time = kernel::getTicks();
 
     auto* lvgl_display = lv_display_get_default();
     tt_assert(lvgl_display != nullptr);
-    auto* hal_display = (tt::hal::Display*)lv_display_get_user_data(lvgl_display);
+    auto* hal_display = (hal::Display*)lv_display_get_user_data(lvgl_display);
     tt_assert(hal_display != nullptr);
     if (hal_display->supportsBacklightDuty()) {
         int32_t backlight_duty = app::display::getBacklightDuty();
         hal_display->setBacklightDuty(backlight_duty);
     }
 
-    TickType_t end_time = tt::kernel::getTicks();
-    TickType_t ticks_passed = end_time - start_time;
-    TickType_t minimum_ticks = (CONFIG_TT_SPLASH_DURATION / portTICK_PERIOD_MS);
-    if (minimum_ticks > ticks_passed) {
-        tt::kernel::delayTicks(minimum_ticks - ticks_passed);
+    if (hal::usb::isUsbBootMode()) {
+        TT_LOG_I(TAG, "Rebooting into mass storage device mode");
+        hal::usb::resetUsbBootMode();
+        hal::usb::startMassStorageWithSdmmc();
+    } else {
+        TickType_t end_time = tt::kernel::getTicks();
+        TickType_t ticks_passed = end_time - start_time;
+        TickType_t minimum_ticks = (CONFIG_TT_SPLASH_DURATION / portTICK_PERIOD_MS);
+        if (minimum_ticks > ticks_passed) {
+            kernel::delayTicks(minimum_ticks - ticks_passed);
+        }
+
+        tt::service::loader::stopApp();
+        startNextApp();
     }
 
-    tt::service::loader::stopApp();
-
-
-    startNextApp();
-
     return 0;
 }
 
@@ -84,7 +89,13 @@ static void onShow(TT_UNUSED AppContext& app, lv_obj_t* parent) {
 
     lv_obj_t* image = lv_image_create(parent);
     lv_obj_set_size(image, LV_PCT(100), LV_PCT(100));
-    lv_image_set_src(image, TT_ASSETS_BOOT_LOGO);
+
+    if (hal::usb::isUsbBootMode()) {
+        lv_image_set_src(image, TT_ASSETS_BOOT_LOGO_USB);
+    } else {
+        lv_image_set_src(image, TT_ASSETS_BOOT_LOGO);
+    }
+
     lvgl::obj_set_style_bg_blacken(parent);
 
     data->thread.start();

Tactility/Source/app/usbsettings/UsbSettings.cpp

@@ -0,0 +1,45 @@
+#include "lvgl.h"
+#include "lvgl/Toolbar.h"
+#include "hal/usb/Usb.h"
+
+#define TAG "usb_settings"
+
+namespace tt::app::usbsettings {
+
+static void onRebootMassStorage(TT_UNUSED lv_event_t* event) {
+    hal::usb::rebootIntoMassStorageSdmmc();
+}
+
+static void onShow(AppContext& app, lv_obj_t* parent) {
+    auto* toolbar = lvgl::toolbar_create(parent, app);
+    lv_obj_align(toolbar, LV_ALIGN_TOP_MID, 0, 0);
+
+    if (hal::usb::canRebootIntoMassStorageSdmmc()) {
+        auto* button = lv_button_create(parent);
+        auto* label = lv_label_create(button);
+        lv_label_set_text(label, "Reboot as USB storage");
+        lv_obj_align(button, LV_ALIGN_CENTER, 0, 0);
+        lv_obj_add_event_cb(button, onRebootMassStorage, LV_EVENT_SHORT_CLICKED, nullptr);
+    } else {
+        bool supported = hal::usb::isSupported();
+        const char* first = supported ? "USB storage not available:" : "USB driver not supported";
+        const char* second = supported ? "SD card not mounted" : "on this hardware";
+        auto* label_a = lv_label_create(parent);
+        lv_label_set_text(label_a, first);
+        lv_obj_align(label_a, LV_ALIGN_CENTER, 0, 0);
+        auto* label_b = lv_label_create(parent);
+        lv_label_set_text(label_b, second);
+        lv_obj_align_to(label_b, label_a, LV_ALIGN_OUT_BOTTOM_MID, 0, 4);
+    }
+
+}
+
+extern const AppManifest manifest = {
+    .id = "UsbSettings",
+    .name = "USB",
+    .icon = LV_SYMBOL_USB,
+    .type = TypeSettings,
+    .onShow = onShow
+};
+
+} // namespace