chore: Update to use espp IDF components from component registry, also update some deps

Author: finger563

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "components/espp"]
-	path = components/espp
-	url = [email protected]:esp-cpp/espp
 [submodule "components/jpegdec"]
 	path = components/jpegdec
 	url = https://github.com/esp-cpp/jpegdec

CMakeLists.txt

@@ -6,7 +6,7 @@ include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 
 # add the component directories that we want to use
 set(EXTRA_COMPONENT_DIRS
-  "components/espp/components"
+  # "components/espp/components"
 )
 
 # add compile definition ARDUINO_ARCH_ESP32, enabling jpegdec simd support

components/box-emu/CMakeLists.txt

@@ -10,6 +10,7 @@ idf_component_register(
   "hal"
   "usb"
   "esp_tinyusb"
+  "lvgl"
   "codec"
   "adc"
   "aw9523"

components/box-emu/idf_component.yml

@@ -1,4 +1,16 @@
 ## IDF Component Manager Manifest File
 dependencies:
-  espressif/esp_tinyusb: "^1.4.2"
-  idf: "^5.1"
+  idf: ">=5.5"
+  espressif/esp_tinyusb: ">=2.0"
+  lvgl/lvgl: '>=9.2.2'
+  espp/adc: ">=1.0"
+  espp/aw9523: ">=1.0"
+  espp/button: ">=1.0"
+  espp/drv2605: ">=1.0"
+  espp/esp-box: ">=1.0"
+  espp/event_manager: ">=1.0"
+  espp/max1704x: ">=1.0"
+  espp/mcp23x17: ">=1.0"
+  espp/task: ">=1.0"
+  espp/timer: ">=1.0"
+  espp/serialization: ">=1.0"

components/box-emu/include/box-emu.hpp

@@ -12,7 +12,9 @@
 
 #include <tinyusb.h>
 #include <class/msc/msc.h>
-#include <tusb_msc_storage.h>
+#include <tinyusb_msc.h>
+
+#include <tinyusb_default_config.h>
 
 #include "esp-box.hpp"
 #include "event_manager.hpp"
@@ -367,6 +369,7 @@ class BoxEmu : public espp::BaseComponent {
   // usb
   std::atomic<bool> usb_enabled_{false};
   usb_phy_handle_t jtag_phy_;
+  tinyusb_msc_storage_handle_t msc_storage_handle_{nullptr};
 };
 
 // for libfmt printing of the BoxEmu::Version enum

components/box-emu/src/box-emu.cpp

@@ -650,30 +650,47 @@ bool BoxEmu::initialize_usb() {
   usb_del_phy(jtag_phy_);
 
   fmt::print("USB MSC initialization\n");
-  // register the callback for the storage mount changed event.
-  tinyusb_msc_sdmmc_config_t config_sdmmc = {
-    .card = card,
-    .callback_mount_changed = nullptr,
-    .callback_premount_changed = nullptr,
-    .mount_config = {
-      .format_if_mount_failed = false,
-      .max_files = 5,
-      .allocation_unit_size = 2 * 1024, // sector size is 512 bytes, this should be between sector size and (128 * sector size). Larger means higher read/write performance and higher overhead for small files.
-      .disk_status_check_enable = false, // true if you see issues or are unmounted properly; slows down I/O
+  esp_vfs_fat_mount_config_t fat_mount_config = {
+    .format_if_mount_failed = false,
+    .max_files = 5,
+    .allocation_unit_size = 2 * 1024, // sector size is 512 bytes, this should be between sector size and (128 * sector size). Larger means higher read/write performance and higher overhead for small files.
+    .disk_status_check_enable = false, // true if you see issues or are unmounted properly; slows down I/O
+  };
+
+  tinyusb_msc_fatfs_config_t config_msc = {
+    .base_path = (char*)mount_point,
+    .config = fat_mount_config,
+    .do_not_format = true,
+    .format_flags = 0,
+  };
+
+  tinyusb_msc_storage_config_t msc_storage_config = {
+    .medium = {
+      .card = card,
     },
+    .fat_fs = config_msc,
+    .mount_point = TINYUSB_MSC_STORAGE_MOUNT_USB,
   };
-  ESP_ERROR_CHECK(tinyusb_msc_storage_init_sdmmc(&config_sdmmc));
+
+  ESP_ERROR_CHECK(tinyusb_msc_new_storage_sdmmc(&msc_storage_config, &msc_storage_handle_));
+  // register the callback for the storage mount changed event.
   // ESP_ERROR_CHECK(tinyusb_msc_register_callback(TINYUSB_MSC_EVENT_MOUNT_CHANGED, storage_mount_changed_cb));
 
   // initialize the tinyusb stack
   fmt::print("USB MSC initialization\n");
-  tinyusb_config_t tusb_cfg;
-  memset(&tusb_cfg, 0, sizeof(tusb_cfg));
-  tusb_cfg.device_descriptor = &descriptor_config;
-  tusb_cfg.string_descriptor = string_desc_arr;
-  tusb_cfg.string_descriptor_count = sizeof(string_desc_arr) / sizeof(string_desc_arr[0]);
-  tusb_cfg.external_phy = false;
-  tusb_cfg.configuration_descriptor = desc_configuration;
+  // no device_event_handler for tud_mount and tud_unmount callbacks
+  tinyusb_config_t tusb_cfg = TINYUSB_DEFAULT_CONFIG();
+  tusb_cfg.task = TINYUSB_TASK_CUSTOM(4096 /*size */, 4 /* priority */,
+                                      0 /* affinity: 0 - CPU0, 1 - CPU1 ... */);
+  tusb_cfg.descriptor.device = &descriptor_config;
+  tusb_cfg.descriptor.string = string_desc_arr;
+  tusb_cfg.descriptor.string_count =
+      sizeof(string_desc_arr) / sizeof(string_desc_arr[0]);
+  tusb_cfg.descriptor.full_speed_config = desc_configuration;
+  tusb_cfg.phy.skip_setup = false; // was external-phy = false
+  tusb_cfg.phy.self_powered = false;
+  tusb_cfg.phy.vbus_monitor_io = -1;
+
   ESP_ERROR_CHECK(tinyusb_driver_install(&tusb_cfg));
   fmt::print("USB MSC initialization DONE\n");
   usb_enabled_ = true;
@@ -686,8 +703,16 @@ bool BoxEmu::deinitialize_usb() {
     logger_.warn("USB MSC not initialized");
     return false;
   }
+  esp_err_t err;
   logger_.info("USB MSC deinitialization");
-  auto err = tinyusb_driver_uninstall();
+  // deinit + delete the msc storage handle
+  err = tinyusb_msc_delete_storage(msc_storage_handle_);
+  if (err != ESP_OK) {
+    logger_.error("tinyusb_msc_delete_storage failed: {}", esp_err_to_name(err));
+    return false;
+  }
+  logger_.info("USB deinitialization");
+  err = tinyusb_driver_uninstall();
   if (err != ESP_OK) {
     logger_.error("tinyusb_driver_uninstall failed: {}", esp_err_to_name(err));
     return false;

components/box-emu/src/make_color.cpp

@@ -1,6 +1,6 @@
 #include "make_color.h"
 
-#include <lvgl/lvgl.h>
+#include <lvgl.h>
 
 extern "C" uint16_t make_color(uint8_t r, uint8_t g, uint8_t b) {
     return lv_color_to_u16(lv_color_make(r, g, b));

components/espp

@@ -10,7 +10,7 @@
 extern "C" {
 #endif
 
-    #include "lvgl/lvgl.h"
+    #include "lvgl.h"
 
 #include "ui_helpers.h"
 #include "ui_events.h"