template fixes

Univa · Apr 11, 2024 · 7296ef4 · 7296ef4
1 parent 7c4331e
commit 7296ef4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/rumcake-basic-template/src/main.rs b/rumcake-basic-template/src/main.rs
@@ -22,7 +22,9 @@ use rumcake::keyboard::{build_layout, build_standard_matrix, remap_matrix};
         id = {{ keyboard-name }}Lighting,
         driver_setup_fn = setup_underglow
     ),
-    vial
+    vial(
+        id = {{ keyboard-name }}Via,
+    )
 )]
 pub struct {{ keyboard-name }};
 
@@ -101,10 +103,11 @@ impl USBKeyboard for {{ keyboard-name }}  {
 
 // Via configuration
 // Note: since the `storage` feature flag is not enabled, changes to your keyboard in the Vial app will not be saved. If you use `storage`, be sure to update memory.x.
+struct {{ keyboard-name }}Via;
 use rumcake::via::ViaKeyboard;
-impl ViaKeyboard for {{ keyboard-name }} {}
+impl ViaKeyboard for {{ keyboard-name }}Via {}
 use rumcake::vial::VialKeyboard;
-impl VialKeyboard for {{ keyboard-name }} {
+impl VialKeyboard for {{ keyboard-name }}Via {
     const VIAL_KEYBOARD_UID: [u8; 8] = [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]; // TODO: Change this
     const VIAL_UNLOCK_COMBO: &'static [(u8, u8)] = &[(0, 0)]; // TODO: Change this
     const KEYBOARD_DEFINITION: &'static [u8] = &GENERATED_KEYBOARD_DEFINITION;

diff --git a/rumcake-split-template/Cargo.toml b/rumcake-split-template/Cargo.toml
@@ -11,7 +11,7 @@ cortex-m = { version = "0.7.6" }
 cortex-m-rt = "0.7.0"
 embassy-executor = { git = "https://github.com/embassy-rs/embassy", rev = "b8be126" }
 
-rumcake = { git = "https://github.com/Univa/rumcake", rev = "d340eb9", features = ["nrf52840", "drivers", "nrf-ble"] }
+rumcake = { git = "https://github.com/Univa/rumcake", rev = "d340eb9", features = ["nrf52840", "nrf-ble"] }
 
 [profile.dev]
 debug = 2