cm/cmdr-keyboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code cleanaup

Browse Source
This commit is contained in:
Christoffer Martinsson 2025-09-21 21:40:17 +02:00
parent 4beeba0816
commit 7578b39af9
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -7,3 +7,4 @@ rp2040_51/Cargo.lock
*.FCBak *.FCBak
rp2040/target rp2040/target
rp2040/firmware.uf2 rp2040/firmware.uf2
eCAD/cmdr_keyboard/cmdr_keyboard-backups

8
rp2040/src/main.rs
View File

@ -4,17 +4,16 @@
//! Email: cm@cmtec.se //! Email: cm@cmtec.se
//! License: Please refer to LICENSE in root directory //! License: Please refer to LICENSE in root directory
//! Firmware entry orchestrating the CMDR Keyboard runtime loop.
#![no_std] #![no_std]
#![no_main] #![no_main]
use cmdr_keyboard::hardware::{self, timers}; 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 embedded_hal_0_2::timer::CountDown;
use fugit::ExtU32; use fugit::ExtU32;
use panic_halt as _; use panic_halt as _;
use usb_device::UsbError;
use usb_device::prelude::*; use usb_device::prelude::*;
use usb_device::UsbError;
use usbd_human_interface_device::device::keyboard::NKROBootKeyboardConfig; use usbd_human_interface_device::device::keyboard::NKROBootKeyboardConfig;
use usbd_human_interface_device::page::Keyboard; use usbd_human_interface_device::page::Keyboard;
use usbd_human_interface_device::prelude::UsbHidError; use usbd_human_interface_device::prelude::UsbHidError;
@ -102,7 +101,8 @@ fn main() -> ! {
if bootloader::chord_requested(&pressed_keys) { if bootloader::chord_requested(&pressed_keys) {
if !keyboard_state.usb().suspended { if !keyboard_state.usb().suspended {
for _ in 0..3 { 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) { match keyboard.device().write_report(clear_report) {
Ok(_) => break, Ok(_) => break,
Err(UsbHidError::WouldBlock) | Err(UsbHidError::Duplicate) => { Err(UsbHidError::WouldBlock) | Err(UsbHidError::Duplicate) => {