refactor(core): re-export usb crates in rmk

Signed-off-by: HaoboGu <[email protected]>
HaoboGu · Nov 28, 2023 · af6a778 · af6a778
1 parent 5917773
commit af6a778
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/boards/rp2040/Cargo.toml b/boards/rp2040/Cargo.toml
@@ -33,8 +33,6 @@ cortex-m-rt = "0.7.3"
 log = "0.4.19"
 rtic = { version = "2.0.0", features = ["thumbv6-backend"] }
 rtic-monotonics = { version = "1.0.0", features = ["cortex-m-systick"] }
-usb-device = "0.2.9"
-usbd-hid = "0.6.1"
 
 [features]
 # avoid having to use --allow-multiple-definition linker flag

diff --git a/boards/rp2040/src/main.rs b/boards/rp2040/src/main.rs
@@ -17,6 +17,7 @@ mod app {
     use rmk::{
         config::KEYBOARD_CONFIG, eeprom::EepromStorageConfig, flash::EmptyFlashWrapper,
         initialize_keyboard_and_usb_device, keyboard::Keyboard, usb::KeyboardUsbDevice,
+        usb_device::class_prelude::UsbBusAllocator,
     };
     use rp_pico::{
         hal::{
@@ -25,7 +26,6 @@ mod app {
         Pins, XOSC_CRYSTAL_FREQ,
     };
     use rtic_monotonics::systick::*;
-    use usb_device::class_prelude::UsbBusAllocator;
 
     // Static usb bus instance
     static mut USB_BUS: Option<UsbBusAllocator<UsbBus>> = None;

diff --git a/boards/stm32h7/Cargo.toml b/boards/stm32h7/Cargo.toml
@@ -32,8 +32,6 @@ rtt-target = "0.4.0"
 log = "0.4.19"
 rtic = { version = "2.0.1", features = ["thumbv7-backend"] }
 rtic-monotonics = { version = "1.0.0", features = ["cortex-m-systick"] }
-usb-device = "0.2.9"
-usbd-hid = "0.6.1"
 packed_struct = { version = "0.10.1", default-features = false }
 embedded-storage = { version = "0.3" }
 

diff --git a/boards/stm32h7/src/main.rs b/boards/stm32h7/src/main.rs
@@ -106,7 +106,7 @@ mod app {
             &ccdr.clocks,
         );
         let usb_allocator = cortex_m::singleton!(
-            : usb_device::class_prelude::UsbBusAllocator<UsbBus<USB1>> =
+            : rmk::usb_device::class_prelude::UsbBusAllocator<UsbBus<USB1>> =
                 UsbBus::new(usb, unsafe { &mut EP_MEMORY })
         )
         .unwrap();

diff --git a/rmk/src/lib.rs b/rmk/src/lib.rs
@@ -15,6 +15,9 @@ use keyboard::Keyboard;
 use usb::KeyboardUsbDevice;
 use usb_device::class_prelude::{UsbBus, UsbBusAllocator};
 
+pub use usb_device;
+pub use usbd_hid;
+
 pub mod action;
 pub mod config;
 pub mod debounce;