diff --git a/.gitignore b/.gitignore index 23ec5a2..0f0eb54 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ rp2040_51/Cargo.lock *.FCBak rp2040/target rp2040/firmware.uf2 +eCAD/cmdr_keyboard/cmdr_keyboard-backups diff --git a/rp2040/src/main.rs b/rp2040/src/main.rs index a1e5b01..d3aadfc 100644 --- a/rp2040/src/main.rs +++ b/rp2040/src/main.rs @@ -4,17 +4,16 @@ //! Email: cm@cmtec.se //! License: Please refer to LICENSE in root directory -//! Firmware entry orchestrating the CMDR Keyboard runtime loop. #![no_std] #![no_main] use cmdr_keyboard::hardware::{self, timers}; -use cmdr_keyboard::{Board, BoardParts, KeyboardState, StatusMode, bootloader, KeyReport}; +use cmdr_keyboard::{bootloader, Board, BoardParts, KeyReport, KeyboardState, StatusMode}; use embedded_hal_0_2::timer::CountDown; use fugit::ExtU32; use panic_halt as _; -use usb_device::UsbError; use usb_device::prelude::*; +use usb_device::UsbError; use usbd_human_interface_device::device::keyboard::NKROBootKeyboardConfig; use usbd_human_interface_device::page::Keyboard; use usbd_human_interface_device::prelude::UsbHidError; @@ -102,7 +101,8 @@ fn main() -> ! { if bootloader::chord_requested(&pressed_keys) { if !keyboard_state.usb().suspended { for _ in 0..3 { - let clear_report: KeyReport = [Keyboard::NoEventIndicated; hardware::NUMBER_OF_KEYS]; + let clear_report: KeyReport = + [Keyboard::NoEventIndicated; hardware::NUMBER_OF_KEYS]; match keyboard.device().write_report(clear_report) { Ok(_) => break, Err(UsbHidError::WouldBlock) | Err(UsbHidError::Duplicate) => {