separate trait bounds needed to run via and vial tasks

Univa · Apr 11, 2024 · 3ef4990 · 3ef4990
1 parent 3582267
commit 3ef4990
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/rumcake-macros/src/keyboard.rs b/rumcake-macros/src/keyboard.rs
@@ -411,7 +411,7 @@ pub(crate) fn keyboard_main(
 
         spawning.extend(quote! {
             spawner
-                .spawn(::rumcake::via_process_task!(#id))
+                .spawn(::rumcake::via_process_task!(#id, #kb_name))
                 .unwrap();
         });
     } else if let Some(args) = keyboard.vial {
@@ -427,7 +427,7 @@ pub(crate) fn keyboard_main(
 
         spawning.extend(quote! {
             spawner
-                .spawn(::rumcake::vial_process_task!(#id))
+                .spawn(::rumcake::vial_process_task!(#id, #kb_name))
                 .unwrap();
         });
     }

diff --git a/rumcake/src/via/mod.rs b/rumcake/src/via/mod.rs
@@ -172,7 +172,7 @@ pub(crate) const VIA_REPORT_DESCRIPTOR: &[u8] = &[
 ];
 
 #[rumcake_macros::task]
-pub async fn via_process_task<K: ViaKeyboard + HIDDevice + 'static>(_k: K)
+pub async fn via_process_task<K: ViaKeyboard + 'static, T: HIDDevice + 'static>(_k: K, _t: T)
 where
     [(); <<K::StorageType as StorageDevice>::FlashStorageType as FlashStorage>::ERASE_SIZE]:,
     [(); K::DYNAMIC_KEYMAP_LAYER_COUNT * K::Layout::LAYOUT_COLS * K::Layout::LAYOUT_ROWS * 2]:,
@@ -204,8 +204,8 @@ where
     }
 
     let via_state: Mutex<RawMutex, protocol::ViaState<K>> = Mutex::new(Default::default());
-    let receive_channel = K::get_via_hid_receive_channel();
-    let send_channel = K::get_via_hid_send_channel();
+    let receive_channel = T::get_via_hid_receive_channel();
+    let send_channel = T::get_via_hid_send_channel();
 
     let report_fut = async {
         loop {

diff --git a/rumcake/src/vial/mod.rs b/rumcake/src/vial/mod.rs
@@ -68,7 +68,7 @@ pub trait VialKeyboard: ViaKeyboard {
 pub(crate) static VIAL_DIRECT_SET_CHANNEL: Channel<RawMutex, (u8, RGB8), 4> = Channel::new();
 
 #[rumcake_macros::task]
-pub async fn vial_process_task<K: VialKeyboard + HIDDevice + 'static>(_k: K)
+pub async fn vial_process_task<K: VialKeyboard + 'static, T: HIDDevice + 'static>(_k: K, _t: T)
 where
     [(); <<K::StorageType as StorageDevice>::FlashStorageType as FlashStorage>::ERASE_SIZE]:,
     [(); K::DYNAMIC_KEYMAP_LAYER_COUNT * K::Layout::LAYOUT_COLS * K::Layout::LAYOUT_ROWS * 2]:,
@@ -102,8 +102,8 @@ where
 
     let vial_state: Mutex<RawMutex, protocol::VialState> = Mutex::new(Default::default());
     let via_state: Mutex<RawMutex, protocol::via::ViaState<K>> = Mutex::new(Default::default());
-    let receive_channel = K::get_via_hid_receive_channel();
-    let send_channel = K::get_via_hid_send_channel();
+    let receive_channel = T::get_via_hid_receive_channel();
+    let send_channel = T::get_via_hid_send_channel();
 
     if K::VIAL_INSECURE {
         vial_state.lock().await.unlocked = true;