Skip to content

Commit c8aaeaf

Browse files
committed
keyboard: Update hid to 0.4.5
Signed-off-by: Daniel Schaefer <dhs@frame.work>
1 parent 5a5cc03 commit c8aaeaf

File tree

3 files changed

+58
-32
lines changed

3 files changed

+58
-32
lines changed

Cargo.lock

Lines changed: 52 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

keyboard/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ usbd-serial.workspace = true
3434
usbd-hid.workspace = true
3535
fugit.workspace = true
3636

37-
usbd-human-interface-device = "0.3.1"
37+
usbd-human-interface-device = "0.4.5"
3838
is31fl3743a.workspace = true
3939

4040
cfg-if = "1.0.0"

keyboard/src/main.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ use embedded_hal::adc::OneShot;
3030
use embedded_hal::digital::v2::{InputPin, OutputPin, StatefulOutputPin};
3131
use rp2040_hal::gpio::bank0::Gpio28;
3232
use rp2040_hal::gpio::{self, Input, PullUp};
33-
use usbd_human_interface_device::device::keyboard::BootKeyboardInterface;
3433
use usbd_human_interface_device::page::Keyboard;
3534
use usbd_human_interface_device::prelude::UsbHidClassBuilder;
35+
use usbd_human_interface_device::prelude::*;
3636
use usbd_human_interface_device::UsbHidError;
3737

3838
mod rgb_matrix;
@@ -274,7 +274,7 @@ fn main() -> ! {
274274
// Set up the USB Communications Class Device driver
275275
//let mut serial = SerialPort::new(&usb_bus);
276276
let mut keyboard_hid = UsbHidClassBuilder::new()
277-
.add_interface(BootKeyboardInterface::default_config())
277+
.add_device(usbd_human_interface_device::device::keyboard::BootKeyboardConfig::default())
278278
.build(&usb_bus);
279279

280280
#[cfg(feature = "macropad")]
@@ -502,19 +502,19 @@ fn main() -> ! {
502502
}
503503

504504
if !usb_suspended {
505-
let _ = keyboard_hid.interface().read_report();
505+
let _ = keyboard_hid.device().read_report();
506506

507507
// Setup the report for the control channel
508508
let keycodes = if let Some(keycode) = keycode {
509509
[keycode]
510510
} else {
511511
[Keyboard::NoEventIndicated]
512512
};
513-
match keyboard_hid.interface().write_report(keycodes) {
513+
match keyboard_hid.device().write_report(keycodes) {
514514
Err(UsbHidError::WouldBlock) | Err(UsbHidError::Duplicate) | Ok(_) => {}
515515
Err(e) => panic!("Failed to write keyboard report: {:?}", e),
516516
}
517-
match keyboard_hid.interface().tick() {
517+
match keyboard_hid.tick() {
518518
Err(UsbHidError::WouldBlock) | Ok(_) => {}
519519
Err(e) => panic!("Failed to process keyboard tick: {:?}", e),
520520
}

0 commit comments

Comments
 (0)