From 0018f96f3f7d69d6c56c7eaacc192510e55dd66e Mon Sep 17 00:00:00 2001 From: Fang-Pen Lin Date: Thu, 2 Jan 2025 01:14:05 -0800 Subject: [PATCH] Try out new approach --- Cargo.toml | 8 ++++++-- src/include/tinyusb_bindings.h | 3 --- src/main.rs | 13 ++++++++++--- 3 files changed, 16 insertions(+), 8 deletions(-) delete mode 100644 src/include/tinyusb_bindings.h diff --git a/Cargo.toml b/Cargo.toml index 521fe8f..daaba76 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,5 +31,9 @@ esp_idf_version = "v5.2.2" [[package.metadata.esp-idf-sys.extra_components]] remote_component = { name = "espressif/esp_tinyusb", version = "1.5.0" } -bindings_header = "src/include/tinyusb_bindings.h" -bindings_module = "esp_tinyusb" + +[patch.crates-io] +embuild = { git = "https://github.com/esp-rs/embuild" } +esp-idf-svc = { git = "https://github.com/esp-rs/esp-idf-svc" } +esp-idf-hal = { git = "https://github.com/esp-rs/esp-idf-hal" } +esp-idf-sys = { git = "https://github.com/esp-rs/esp-idf-sys", rev = "ecf45d1b7f8c9acc8c55dbdd9b105c7ac51d8525" } diff --git a/src/include/tinyusb_bindings.h b/src/include/tinyusb_bindings.h deleted file mode 100644 index a96e0c4..0000000 --- a/src/include/tinyusb_bindings.h +++ /dev/null @@ -1,3 +0,0 @@ -#if defined(ESP_IDF_COMP_ESPRESSIF__ESP_TINYUSB_ENABLED) -#include "tinyusb.h" -#endif diff --git a/src/main.rs b/src/main.rs index b34b285..955cc10 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,7 +1,14 @@ -use esp_idf_sys::esp_tinyusb::{tinyusb_config_t, tinyusb_driver_install}; - +use esp_idf_sys::esp_tinyusb::{ + tinyusb_config_t, tinyusb_driver_install, tinyusb_msc_storage_mount, +}; +use std::ffi::CString; fn main() { let tusb_cfg = tinyusb_config_t::default(); - unsafe { tinyusb_driver_install(&tusb_cfg); } + unsafe { + tinyusb_driver_install(&tusb_cfg); + } + + let s = CString::new(""); + unsafe { tinyusb_msc_storage_mount(s.unwrap().as_ptr()) }; }