From 3bfdc238a060f18410ac1c31d478d6dd5afd828a Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 17 May 2022 16:41:08 +0800 Subject: [PATCH] add support for keymaps in HID remaps keys based on the assumed keymap based on the user's preference for the keyboard layout on the device. So far, only dvorak and QWERTY are supported. --- Cargo.lock | 2 + services/keyboard/src/main.rs | 5 +- services/shellchat/src/cmds/usb.rs | 23 ++- services/usb-device-xous/Cargo.toml | 2 + services/usb-device-xous/src/api.rs | 8 + services/usb-device-xous/src/lib.rs | 136 ++------------ services/usb-device-xous/src/main.rs | 43 ++++- services/usb-device-xous/src/mappings.rs | 224 +++++++++++++++++++++++ 8 files changed, 310 insertions(+), 133 deletions(-) create mode 100644 services/usb-device-xous/src/mappings.rs diff --git a/Cargo.lock b/Cargo.lock index c5d025a92..30bc7f980 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3502,6 +3502,7 @@ version = "0.1.0" dependencies = [ "bitfield", "embedded-time", + "keyboard", "llio", "log", "log-server", @@ -3520,6 +3521,7 @@ dependencies = [ "utralib", "vcell", "xous", + "xous-ipc 0.9.7", "xous-names", ] diff --git a/services/keyboard/src/main.rs b/services/keyboard/src/main.rs index 26620d01c..0eea2a3de 100644 --- a/services/keyboard/src/main.rs +++ b/services/keyboard/src/main.rs @@ -735,10 +735,11 @@ fn xmain() -> ! { // - graphics (if building for hosted mode) // - oqc (for factory test) // - status sub system (for setting the layout) + // - USB (for getting layout) #[cfg(any(target_os = "none", target_os = "xous"))] - let kbd_sid = xns.register_name(api::SERVER_NAME_KBD, Some(3)).expect("can't register server"); - #[cfg(not(any(target_os = "none", target_os = "xous")))] let kbd_sid = xns.register_name(api::SERVER_NAME_KBD, Some(4)).expect("can't register server"); + #[cfg(not(any(target_os = "none", target_os = "xous")))] + let kbd_sid = xns.register_name(api::SERVER_NAME_KBD, Some(5)).expect("can't register server"); log::trace!("registered with NS -- {:?}", kbd_sid); // Create a new kbd object diff --git a/services/shellchat/src/cmds/usb.rs b/services/shellchat/src/cmds/usb.rs index d613a7759..3e03eb8d8 100644 --- a/services/shellchat/src/cmds/usb.rs +++ b/services/shellchat/src/cmds/usb.rs @@ -14,13 +14,12 @@ impl Usb { } } - impl<'a> ShellCmdApi<'a> for Usb { cmd_api!(usb); // inserts boilerplate for command API fn process(&mut self, args: xous_ipc::String::<1024>, _env: &mut CommonEnv) -> Result>, xous::Error> { let mut ret = xous_ipc::String::<1024>::new(); - let helpstring = "usb [hid] [debug] [send ] [status] [leds] [lock] [unlock]"; + let helpstring = "usb [hid] [debug] [send ] [status] [leds] [lock] [unlock] [kbdtest]"; let mut tokens = args.as_str().unwrap().split(' '); @@ -50,6 +49,26 @@ impl<'a> ShellCmdApi<'a> for Usb { _ => write!(ret, "Invalid response checking status").unwrap(), } } + "kbdtest" => { + let mut test_str = String::new(); + for c in 0x20..0x7F { // includes a space as the first character + // safety - the bounds are checked above in the loop to be the printable ASCII character range. + test_str.push(unsafe{char::from_u32_unchecked(c as u32)}); + } + test_str.push('\n'); + match self.usb_dev.get_current_core() { + Ok(UsbDeviceType::Hid) => { + match self.usb_dev.send_str(&test_str) { + Ok(n) => write!(ret, "Sent {} test string", n).unwrap(), + Err(_e) => write!(ret, "Can't send: are we connected to a host?").unwrap(), + } + } + Ok(UsbDeviceType::Debug) => { + write!(ret, "HID core not connected: please issue 'usb hid' first").unwrap(); + } + _ => write!(ret, "Invalid response checking status").unwrap(), + } + } "status" => { match self.usb_dev.get_current_core() { Ok(UsbDeviceType::Debug) => write!(ret, "Debug core connected").unwrap(), diff --git a/services/usb-device-xous/Cargo.toml b/services/usb-device-xous/Cargo.toml index 5b4f2db09..33ea3f2da 100644 --- a/services/usb-device-xous/Cargo.toml +++ b/services/usb-device-xous/Cargo.toml @@ -8,6 +8,7 @@ description = "Xous USB device drivers" # Dependency policy: fully specify dependencies to the minor version number [dependencies] xous = { path = "../../xous-rs" } +xous-ipc = { path = "../../xous-ipc" } log-server = { path = "../log-server" } ticktimer-server = { path = "../ticktimer-server" } xous-names = { path = "../xous-names" } @@ -18,6 +19,7 @@ num-traits = {version = "0.2.14", default-features = false} rkyv = {version = "0.4.3", default-features = false, features = ["const_generics"]} susres = {path = "../susres"} modals = {path = "../modals"} +keyboard = {path = "../keyboard"} bitfield = "0.13.2" vcell = "0.1.3" diff --git a/services/usb-device-xous/src/api.rs b/services/usb-device-xous/src/api.rs index 52b7b85a7..cce91d82b 100644 --- a/services/usb-device-xous/src/api.rs +++ b/services/usb-device-xous/src/api.rs @@ -6,6 +6,8 @@ pub(crate) enum Opcode { LinkStatus, /// Send a keyboard code SendKeyCode, + /// Send a string + SendString, /// Get the current LED state GetLedState, /// Switch to a specified device core @@ -26,3 +28,9 @@ pub(crate) enum Opcode { /// Exits the server Quit, } + +#[derive(Debug, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize, Copy, Clone)] +pub struct UsbString { + pub s: xous_ipc::String::<4000>, + pub sent: Option, +} \ No newline at end of file diff --git a/services/usb-device-xous/src/lib.rs b/services/usb-device-xous/src/lib.rs index 3eb94d426..a725b8e81 100644 --- a/services/usb-device-xous/src/lib.rs +++ b/services/usb-device-xous/src/lib.rs @@ -1,13 +1,14 @@ #![cfg_attr(target_os = "none", no_std)] pub mod api; -use api::*; +pub use api::*; use xous::{CID, send_message, Message}; use num_traits::*; pub use usb_device::device::UsbDeviceState; pub use usbd_human_interface_device::device::keyboard::KeyboardLedsReport; pub use usbd_human_interface_device::page::Keyboard as UsbKeyCode; use packed_struct::PackedStruct; +use xous_ipc::Buffer; pub enum UsbDeviceType { Debug = 0, @@ -169,15 +170,18 @@ impl UsbHid { } } pub fn send_str(&self, s: &str) -> Result { - let mut sent = 0; - for ch in s.chars() { - self.send_keycode( - self.char_to_hid_code_us101(ch), - true - )?; - sent += 1; + let serializer = UsbString { + s: xous_ipc::String::<4000>::from_str(s), + sent: None + }; + let mut buf = Buffer::into_buf(serializer).or(Err(xous::Error::InternalError))?; + buf.lend_mut(self.conn, Opcode::SendString.to_u32().unwrap()).or(Err(xous::Error::InternalError))?; + let returned = buf.to_original::().or(Err(xous::Error::InternalError))?; + match returned.sent { + Some(sent) => Ok(sent as usize), + // indicate that probably the USB was not connected + None => Err(xous::Error::UseBeforeInit), } - Ok(sent) } pub fn get_led_state(&self) -> Result { match send_message( @@ -196,120 +200,6 @@ impl UsbHid { _ => panic!("Internal error: illegal return type"), } } - pub fn char_to_hid_code_us101(&self, key: char) -> Vec { - let mut code = vec![]; - match key { - 'a' => code.push(UsbKeyCode::A), - 'b' => code.push(UsbKeyCode::B), - 'c' => code.push(UsbKeyCode::C), - 'd' => code.push(UsbKeyCode::D), - 'e' => code.push(UsbKeyCode::E), - 'f' => code.push(UsbKeyCode::F), - 'g' => code.push(UsbKeyCode::G), - 'h' => code.push(UsbKeyCode::H), - 'i' => code.push(UsbKeyCode::I), - 'j' => code.push(UsbKeyCode::J), - 'k' => code.push(UsbKeyCode::K), - 'l' => code.push(UsbKeyCode::L), - 'm' => code.push(UsbKeyCode::M), - 'n' => code.push(UsbKeyCode::N), - 'o' => code.push(UsbKeyCode::O), - 'p' => code.push(UsbKeyCode::P), - 'q' => code.push(UsbKeyCode::Q), - 'r' => code.push(UsbKeyCode::R), - 's' => code.push(UsbKeyCode::S), - 't' => code.push(UsbKeyCode::T), - 'u' => code.push(UsbKeyCode::U), - 'v' => code.push(UsbKeyCode::V), - 'w' => code.push(UsbKeyCode::W), - 'x' => code.push(UsbKeyCode::X), - 'y' => code.push(UsbKeyCode::Y), - 'z' => code.push(UsbKeyCode::Z), - - 'A' => {code.push(UsbKeyCode::A); code.push(UsbKeyCode::LeftShift)}, - 'B' => {code.push(UsbKeyCode::B); code.push(UsbKeyCode::LeftShift)}, - 'C' => {code.push(UsbKeyCode::C); code.push(UsbKeyCode::LeftShift)}, - 'D' => {code.push(UsbKeyCode::D); code.push(UsbKeyCode::LeftShift)}, - 'E' => {code.push(UsbKeyCode::E); code.push(UsbKeyCode::LeftShift)}, - 'F' => {code.push(UsbKeyCode::F); code.push(UsbKeyCode::LeftShift)}, - 'G' => {code.push(UsbKeyCode::G); code.push(UsbKeyCode::LeftShift)}, - 'H' => {code.push(UsbKeyCode::H); code.push(UsbKeyCode::LeftShift)}, - 'I' => {code.push(UsbKeyCode::I); code.push(UsbKeyCode::LeftShift)}, - 'J' => {code.push(UsbKeyCode::J); code.push(UsbKeyCode::LeftShift)}, - 'K' => {code.push(UsbKeyCode::K); code.push(UsbKeyCode::LeftShift)}, - 'L' => {code.push(UsbKeyCode::L); code.push(UsbKeyCode::LeftShift)}, - 'M' => {code.push(UsbKeyCode::M); code.push(UsbKeyCode::LeftShift)}, - 'N' => {code.push(UsbKeyCode::N); code.push(UsbKeyCode::LeftShift)}, - 'O' => {code.push(UsbKeyCode::O); code.push(UsbKeyCode::LeftShift)}, - 'P' => {code.push(UsbKeyCode::P); code.push(UsbKeyCode::LeftShift)}, - 'Q' => {code.push(UsbKeyCode::Q); code.push(UsbKeyCode::LeftShift)}, - 'R' => {code.push(UsbKeyCode::R); code.push(UsbKeyCode::LeftShift)}, - 'S' => {code.push(UsbKeyCode::S); code.push(UsbKeyCode::LeftShift)}, - 'T' => {code.push(UsbKeyCode::T); code.push(UsbKeyCode::LeftShift)}, - 'U' => {code.push(UsbKeyCode::U); code.push(UsbKeyCode::LeftShift)}, - 'V' => {code.push(UsbKeyCode::V); code.push(UsbKeyCode::LeftShift)}, - 'W' => {code.push(UsbKeyCode::W); code.push(UsbKeyCode::LeftShift)}, - 'X' => {code.push(UsbKeyCode::X); code.push(UsbKeyCode::LeftShift)}, - 'Y' => {code.push(UsbKeyCode::Y); code.push(UsbKeyCode::LeftShift)}, - 'Z' => {code.push(UsbKeyCode::Z); code.push(UsbKeyCode::LeftShift)}, - - '0' => code.push(UsbKeyCode::Keyboard0), - '1' => code.push(UsbKeyCode::Keyboard1), - '2' => code.push(UsbKeyCode::Keyboard2), - '3' => code.push(UsbKeyCode::Keyboard3), - '4' => code.push(UsbKeyCode::Keyboard4), - '5' => code.push(UsbKeyCode::Keyboard5), - '6' => code.push(UsbKeyCode::Keyboard6), - '7' => code.push(UsbKeyCode::Keyboard7), - '8' => code.push(UsbKeyCode::Keyboard8), - '9' => code.push(UsbKeyCode::Keyboard9), - '!' => {code.push(UsbKeyCode::Keyboard1); code.push(UsbKeyCode::LeftShift)}, - '@' => {code.push(UsbKeyCode::Keyboard2); code.push(UsbKeyCode::LeftShift)}, - '#' => {code.push(UsbKeyCode::Keyboard3); code.push(UsbKeyCode::LeftShift)}, - '$' => {code.push(UsbKeyCode::Keyboard4); code.push(UsbKeyCode::LeftShift)}, - '%' => {code.push(UsbKeyCode::Keyboard5); code.push(UsbKeyCode::LeftShift)}, - '^' => {code.push(UsbKeyCode::Keyboard6); code.push(UsbKeyCode::LeftShift)}, - '&' => {code.push(UsbKeyCode::Keyboard7); code.push(UsbKeyCode::LeftShift)}, - '*' => {code.push(UsbKeyCode::Keyboard8); code.push(UsbKeyCode::LeftShift)}, - '(' => {code.push(UsbKeyCode::Keyboard9); code.push(UsbKeyCode::LeftShift)}, - ')' => {code.push(UsbKeyCode::Keyboard0); code.push(UsbKeyCode::LeftShift)}, - - '-' => code.push(UsbKeyCode::Minus), - '_' => {code.push(UsbKeyCode::Minus); code.push(UsbKeyCode::LeftShift)}, - '[' => code.push(UsbKeyCode::LeftBrace), - '{' => {code.push(UsbKeyCode::LeftBrace); code.push(UsbKeyCode::LeftShift)}, - ']' => code.push(UsbKeyCode::RightBrace), - '}' => {code.push(UsbKeyCode::RightBrace); code.push(UsbKeyCode::LeftShift)}, - '/' => code.push(UsbKeyCode::ForwardSlash), - '?' => {code.push(UsbKeyCode::ForwardSlash); code.push(UsbKeyCode::LeftShift)}, - '\\' => code.push(UsbKeyCode::Backslash), - '|' => {code.push(UsbKeyCode::Backslash); code.push(UsbKeyCode::LeftShift)}, - '=' => code.push(UsbKeyCode::Equal), - '+' => {code.push(UsbKeyCode::Equal); code.push(UsbKeyCode::LeftShift)}, - '\'' => code.push(UsbKeyCode::Apostrophe), - '"' => {code.push(UsbKeyCode::Apostrophe); code.push(UsbKeyCode::LeftShift)}, - ';' => {code.push(UsbKeyCode::Semicolon)}, - ':' => {code.push(UsbKeyCode::Semicolon); code.push(UsbKeyCode::LeftShift)}, - '`' => {code.push(UsbKeyCode::Grave)}, - '~' => {code.push(UsbKeyCode::Grave); code.push(UsbKeyCode::LeftShift)}, - - '←' => code.push(UsbKeyCode::LeftArrow), - '→' => code.push(UsbKeyCode::RightArrow), - '↑' => code.push(UsbKeyCode::UpArrow), - '↓' => code.push(UsbKeyCode::DownArrow), - - ',' => code.push(UsbKeyCode::Comma), - '<' => {code.push(UsbKeyCode::Comma); code.push(UsbKeyCode::LeftShift)}, - '.' => code.push(UsbKeyCode::Dot), - '>' => {code.push(UsbKeyCode::Dot); code.push(UsbKeyCode::LeftShift)}, - - '\u{000d}' => code.push(UsbKeyCode::ReturnEnter), - ' ' => code.push(UsbKeyCode::Space), - '\u{0008}' => code.push(UsbKeyCode::DeleteBackspace), - _ => log::warn!("Ignoring unhandled character: {}", key), - }; - code - } } use core::sync::atomic::{AtomicU32, Ordering}; diff --git a/services/usb-device-xous/src/main.rs b/services/usb-device-xous/src/main.rs index e2612935b..88b935c12 100644 --- a/services/usb-device-xous/src/main.rs +++ b/services/usb-device-xous/src/main.rs @@ -2,6 +2,7 @@ #![cfg_attr(target_os = "none", no_main)] mod api; +mod mappings; use api::*; #[cfg(any(target_os = "none", target_os = "xous"))] @@ -42,6 +43,8 @@ use num_enum::FromPrimitive as EnumFromPrimitive; use embedded_time::Clock; use std::convert::TryInto; +use keyboard::KeyMap; +use xous_ipc::Buffer; pub struct EmbeddedClock { start: std::time::Instant, @@ -73,13 +76,18 @@ fn xmain() -> ! { let usbdev_sid = xns.register_name(api::SERVER_NAME_USB_DEVICE, None).expect("can't register server"); log::trace!("registered with NS -- {:?}", usbdev_sid); let llio = llio::Llio::new(&xns); + let tt = ticktimer_server::Ticktimer::new().unwrap(); + let native_kbd = keyboard::Keyboard::new(&xns).unwrap(); + let native_map = native_kbd.get_keymap().unwrap(); + #[cfg(any(target_os = "none", target_os = "xous"))] let serial_number = format!("{:x}", llio.soc_dna().unwrap()); - let (maj, min, rev, extra, _gitrev) = llio.soc_gitrev().unwrap(); if maj == 0 && min <= 9 && rev <= 8 { - if extra < 20 { + if (min == 9 && rev == 8 && extra < 20) || + (min < 9) || (min == 9 && rev < 8) { if min != 0 { // don't show during hosted mode, which reports 0.0.0+0 + tt.sleep_ms(1500).ok(); // wait for some system boot to happen before popping up the modal let modals = modals::Modals::new(&xns).unwrap(); modals.show_notification( &format!("SoC version >= 0.9.8+20 required for USB HID. Detected rev: {}.{}.{}+{}. Refusing to start USB driver.", @@ -115,7 +123,6 @@ fn xmain() -> ! { let usbdev = SpinalUsbDevice::new(usbdev_sid); let mut usbmgmt = usbdev.get_iface(); - let tt = ticktimer_server::Ticktimer::new().unwrap(); // register a suspend/resume listener let cid = xous::connect(usbdev_sid).expect("couldn't create suspend callback connection"); @@ -147,7 +154,7 @@ fn xmain() -> ! { let mut led_state: KeyboardLedsReport = KeyboardLedsReport::default(); let mut lockstatus_force_update = true; // some state to track if we've been through a susupend/resume, to help out the status thread with its UX update after a restart-from-cold loop { - let msg = xous::receive_message(usbdev_sid).unwrap(); + let mut msg = xous::receive_message(usbdev_sid).unwrap(); match FromPrimitive::from_usize(msg.body.id()) { Some(Opcode::SuspendResume) => msg_scalar_unpack!(msg, token, _, _, _, { usbmgmt.xous_suspend(); @@ -251,11 +258,11 @@ fn xmain() -> ! { let auto_up = if autoup == 1 {true} else {false}; keyboard.interface().write_report(&codes).ok(); keyboard.interface().tick().unwrap(); - tt.sleep_ms(50).ok(); + tt.sleep_ms(30).ok(); if auto_up { keyboard.interface().write_report(&[]).ok(); // this is the key-up keyboard.interface().tick().unwrap(); - tt.sleep_ms(50).ok(); + tt.sleep_ms(30).ok(); } xous::return_scalar(msg.sender, 0).unwrap(); } else { @@ -266,6 +273,30 @@ fn xmain() -> ! { Some(Opcode::SendKeyCode) => { xous::return_scalar(msg.sender, 1).unwrap(); } + Some(Opcode::SendString) => { + let mut buffer = unsafe { Buffer::from_memory_message_mut(msg.body.memory_message_mut().unwrap()) }; + let mut usb_send = buffer.to_original::().unwrap(); + #[cfg(any(target_os = "none", target_os = "xous"))] + { + let mut sent = 0; + for ch in usb_send.s.as_str().unwrap().chars() { + // ASSUME: user's keyboard type matches the preference on their Precursor device. + let codes = match native_map { + KeyMap::Dvorak => mappings::char_to_hid_code_dvorak(ch), + _ => mappings::char_to_hid_code_us101(ch), + }; + keyboard.interface().write_report(&codes).ok(); + keyboard.interface().tick().unwrap(); + tt.sleep_ms(30).ok(); + keyboard.interface().write_report(&[]).ok(); // this is the key-up + keyboard.interface().tick().unwrap(); + tt.sleep_ms(30).ok(); + sent += 1; + } + usb_send.sent = Some(sent); + } + buffer.replace(usb_send).unwrap(); + } #[cfg(any(target_os = "none", target_os = "xous"))] Some(Opcode::GetLedState) => msg_blocking_scalar_unpack!(msg, _, _, _, _, { let mut code = [0u8; 1]; diff --git a/services/usb-device-xous/src/mappings.rs b/services/usb-device-xous/src/mappings.rs new file mode 100644 index 000000000..11ee7a37f --- /dev/null +++ b/services/usb-device-xous/src/mappings.rs @@ -0,0 +1,224 @@ +pub use usbd_human_interface_device::page::Keyboard as UsbKeyCode; + +pub fn char_to_hid_code_us101(key: char) -> Vec { + let mut code = vec![]; + match key { + 'a' => code.push(UsbKeyCode::A), + 'b' => code.push(UsbKeyCode::B), + 'c' => code.push(UsbKeyCode::C), + 'd' => code.push(UsbKeyCode::D), + 'e' => code.push(UsbKeyCode::E), + 'f' => code.push(UsbKeyCode::F), + 'g' => code.push(UsbKeyCode::G), + 'h' => code.push(UsbKeyCode::H), + 'i' => code.push(UsbKeyCode::I), + 'j' => code.push(UsbKeyCode::J), + 'k' => code.push(UsbKeyCode::K), + 'l' => code.push(UsbKeyCode::L), + 'm' => code.push(UsbKeyCode::M), + 'n' => code.push(UsbKeyCode::N), + 'o' => code.push(UsbKeyCode::O), + 'p' => code.push(UsbKeyCode::P), + 'q' => code.push(UsbKeyCode::Q), + 'r' => code.push(UsbKeyCode::R), + 's' => code.push(UsbKeyCode::S), + 't' => code.push(UsbKeyCode::T), + 'u' => code.push(UsbKeyCode::U), + 'v' => code.push(UsbKeyCode::V), + 'w' => code.push(UsbKeyCode::W), + 'x' => code.push(UsbKeyCode::X), + 'y' => code.push(UsbKeyCode::Y), + 'z' => code.push(UsbKeyCode::Z), + + 'A' => {code.push(UsbKeyCode::A); code.push(UsbKeyCode::LeftShift)}, + 'B' => {code.push(UsbKeyCode::B); code.push(UsbKeyCode::LeftShift)}, + 'C' => {code.push(UsbKeyCode::C); code.push(UsbKeyCode::LeftShift)}, + 'D' => {code.push(UsbKeyCode::D); code.push(UsbKeyCode::LeftShift)}, + 'E' => {code.push(UsbKeyCode::E); code.push(UsbKeyCode::LeftShift)}, + 'F' => {code.push(UsbKeyCode::F); code.push(UsbKeyCode::LeftShift)}, + 'G' => {code.push(UsbKeyCode::G); code.push(UsbKeyCode::LeftShift)}, + 'H' => {code.push(UsbKeyCode::H); code.push(UsbKeyCode::LeftShift)}, + 'I' => {code.push(UsbKeyCode::I); code.push(UsbKeyCode::LeftShift)}, + 'J' => {code.push(UsbKeyCode::J); code.push(UsbKeyCode::LeftShift)}, + 'K' => {code.push(UsbKeyCode::K); code.push(UsbKeyCode::LeftShift)}, + 'L' => {code.push(UsbKeyCode::L); code.push(UsbKeyCode::LeftShift)}, + 'M' => {code.push(UsbKeyCode::M); code.push(UsbKeyCode::LeftShift)}, + 'N' => {code.push(UsbKeyCode::N); code.push(UsbKeyCode::LeftShift)}, + 'O' => {code.push(UsbKeyCode::O); code.push(UsbKeyCode::LeftShift)}, + 'P' => {code.push(UsbKeyCode::P); code.push(UsbKeyCode::LeftShift)}, + 'Q' => {code.push(UsbKeyCode::Q); code.push(UsbKeyCode::LeftShift)}, + 'R' => {code.push(UsbKeyCode::R); code.push(UsbKeyCode::LeftShift)}, + 'S' => {code.push(UsbKeyCode::S); code.push(UsbKeyCode::LeftShift)}, + 'T' => {code.push(UsbKeyCode::T); code.push(UsbKeyCode::LeftShift)}, + 'U' => {code.push(UsbKeyCode::U); code.push(UsbKeyCode::LeftShift)}, + 'V' => {code.push(UsbKeyCode::V); code.push(UsbKeyCode::LeftShift)}, + 'W' => {code.push(UsbKeyCode::W); code.push(UsbKeyCode::LeftShift)}, + 'X' => {code.push(UsbKeyCode::X); code.push(UsbKeyCode::LeftShift)}, + 'Y' => {code.push(UsbKeyCode::Y); code.push(UsbKeyCode::LeftShift)}, + 'Z' => {code.push(UsbKeyCode::Z); code.push(UsbKeyCode::LeftShift)}, + + '0' => code.push(UsbKeyCode::Keyboard0), + '1' => code.push(UsbKeyCode::Keyboard1), + '2' => code.push(UsbKeyCode::Keyboard2), + '3' => code.push(UsbKeyCode::Keyboard3), + '4' => code.push(UsbKeyCode::Keyboard4), + '5' => code.push(UsbKeyCode::Keyboard5), + '6' => code.push(UsbKeyCode::Keyboard6), + '7' => code.push(UsbKeyCode::Keyboard7), + '8' => code.push(UsbKeyCode::Keyboard8), + '9' => code.push(UsbKeyCode::Keyboard9), + '!' => {code.push(UsbKeyCode::Keyboard1); code.push(UsbKeyCode::LeftShift)}, + '@' => {code.push(UsbKeyCode::Keyboard2); code.push(UsbKeyCode::LeftShift)}, + '#' => {code.push(UsbKeyCode::Keyboard3); code.push(UsbKeyCode::LeftShift)}, + '$' => {code.push(UsbKeyCode::Keyboard4); code.push(UsbKeyCode::LeftShift)}, + '%' => {code.push(UsbKeyCode::Keyboard5); code.push(UsbKeyCode::LeftShift)}, + '^' => {code.push(UsbKeyCode::Keyboard6); code.push(UsbKeyCode::LeftShift)}, + '&' => {code.push(UsbKeyCode::Keyboard7); code.push(UsbKeyCode::LeftShift)}, + '*' => {code.push(UsbKeyCode::Keyboard8); code.push(UsbKeyCode::LeftShift)}, + '(' => {code.push(UsbKeyCode::Keyboard9); code.push(UsbKeyCode::LeftShift)}, + ')' => {code.push(UsbKeyCode::Keyboard0); code.push(UsbKeyCode::LeftShift)}, + + '-' => code.push(UsbKeyCode::Minus), + '_' => {code.push(UsbKeyCode::Minus); code.push(UsbKeyCode::LeftShift)}, + '[' => code.push(UsbKeyCode::LeftBrace), + '{' => {code.push(UsbKeyCode::LeftBrace); code.push(UsbKeyCode::LeftShift)}, + ']' => code.push(UsbKeyCode::RightBrace), + '}' => {code.push(UsbKeyCode::RightBrace); code.push(UsbKeyCode::LeftShift)}, + '/' => code.push(UsbKeyCode::ForwardSlash), + '?' => {code.push(UsbKeyCode::ForwardSlash); code.push(UsbKeyCode::LeftShift)}, + '\\' => code.push(UsbKeyCode::Backslash), + '|' => {code.push(UsbKeyCode::Backslash); code.push(UsbKeyCode::LeftShift)}, + '=' => code.push(UsbKeyCode::Equal), + '+' => {code.push(UsbKeyCode::Equal); code.push(UsbKeyCode::LeftShift)}, + '\'' => code.push(UsbKeyCode::Apostrophe), + '"' => {code.push(UsbKeyCode::Apostrophe); code.push(UsbKeyCode::LeftShift)}, + ';' => {code.push(UsbKeyCode::Semicolon)}, + ':' => {code.push(UsbKeyCode::Semicolon); code.push(UsbKeyCode::LeftShift)}, + '`' => {code.push(UsbKeyCode::Grave)}, + '~' => {code.push(UsbKeyCode::Grave); code.push(UsbKeyCode::LeftShift)}, + + '←' => code.push(UsbKeyCode::LeftArrow), + '→' => code.push(UsbKeyCode::RightArrow), + '↑' => code.push(UsbKeyCode::UpArrow), + '↓' => code.push(UsbKeyCode::DownArrow), + + ',' => code.push(UsbKeyCode::Comma), + '<' => {code.push(UsbKeyCode::Comma); code.push(UsbKeyCode::LeftShift)}, + '.' => code.push(UsbKeyCode::Dot), + '>' => {code.push(UsbKeyCode::Dot); code.push(UsbKeyCode::LeftShift)}, + + '\u{000d}' => {}, // ignore CR + '\u{000a}' => code.push(UsbKeyCode::ReturnEnter), // turn LF ('\n') into enter + ' ' => {code.push(UsbKeyCode::Space); }, + '\u{0008}' => code.push(UsbKeyCode::DeleteBackspace), + _ => log::warn!("Ignoring unhandled character: {}", key), + }; + code +} + +/// auto-generated using tools/kbd_layout.py + `usb kbdtest` on device for dvorak layout on US101 +pub fn char_to_hid_code_dvorak(key: char) -> Vec { + let mut code = vec![]; + match key { + ' ' => {code.push(UsbKeyCode::Space); }, + '!' => {code.push(UsbKeyCode::Keyboard1); code.push(UsbKeyCode::LeftShift); }, + '"' => {code.push(UsbKeyCode::Q); code.push(UsbKeyCode::LeftShift); }, + '#' => {code.push(UsbKeyCode::Keyboard3); code.push(UsbKeyCode::LeftShift); }, + '$' => {code.push(UsbKeyCode::Keyboard4); code.push(UsbKeyCode::LeftShift); }, + '%' => {code.push(UsbKeyCode::Keyboard5); code.push(UsbKeyCode::LeftShift); }, + '&' => {code.push(UsbKeyCode::Keyboard7); code.push(UsbKeyCode::LeftShift); }, + '\'' => {code.push(UsbKeyCode::Q); }, + '(' => {code.push(UsbKeyCode::Keyboard9); code.push(UsbKeyCode::LeftShift); }, + ')' => {code.push(UsbKeyCode::Keyboard0); code.push(UsbKeyCode::LeftShift); }, + '*' => {code.push(UsbKeyCode::Keyboard8); code.push(UsbKeyCode::LeftShift); }, + '+' => {code.push(UsbKeyCode::RightBrace); code.push(UsbKeyCode::LeftShift); }, + ',' => {code.push(UsbKeyCode::W); }, + '-' => {code.push(UsbKeyCode::Apostrophe); }, + '.' => {code.push(UsbKeyCode::E); }, + '/' => {code.push(UsbKeyCode::LeftBrace); }, + '0' => {code.push(UsbKeyCode::Keyboard0); }, + '1' => {code.push(UsbKeyCode::Keyboard1); }, + '2' => {code.push(UsbKeyCode::Keyboard2); }, + '3' => {code.push(UsbKeyCode::Keyboard3); }, + '4' => {code.push(UsbKeyCode::Keyboard4); }, + '5' => {code.push(UsbKeyCode::Keyboard5); }, + '6' => {code.push(UsbKeyCode::Keyboard6); }, + '7' => {code.push(UsbKeyCode::Keyboard7); }, + '8' => {code.push(UsbKeyCode::Keyboard8); }, + '9' => {code.push(UsbKeyCode::Keyboard9); }, + ':' => {code.push(UsbKeyCode::Z); code.push(UsbKeyCode::LeftShift); }, + ';' => {code.push(UsbKeyCode::Z); }, + '<' => {code.push(UsbKeyCode::W); code.push(UsbKeyCode::LeftShift); }, + '=' => {code.push(UsbKeyCode::RightBrace); }, + '>' => {code.push(UsbKeyCode::E); code.push(UsbKeyCode::LeftShift); }, + '?' => {code.push(UsbKeyCode::LeftBrace); code.push(UsbKeyCode::LeftShift); }, + '@' => {code.push(UsbKeyCode::Keyboard2); code.push(UsbKeyCode::LeftShift); }, + 'A' => {code.push(UsbKeyCode::A); code.push(UsbKeyCode::LeftShift); }, + 'B' => {code.push(UsbKeyCode::N); code.push(UsbKeyCode::LeftShift); }, + 'C' => {code.push(UsbKeyCode::I); code.push(UsbKeyCode::LeftShift); }, + 'D' => {code.push(UsbKeyCode::H); code.push(UsbKeyCode::LeftShift); }, + 'E' => {code.push(UsbKeyCode::D); code.push(UsbKeyCode::LeftShift); }, + 'F' => {code.push(UsbKeyCode::Y); code.push(UsbKeyCode::LeftShift); }, + 'G' => {code.push(UsbKeyCode::U); code.push(UsbKeyCode::LeftShift); }, + 'H' => {code.push(UsbKeyCode::J); code.push(UsbKeyCode::LeftShift); }, + 'I' => {code.push(UsbKeyCode::G); code.push(UsbKeyCode::LeftShift); }, + 'J' => {code.push(UsbKeyCode::C); code.push(UsbKeyCode::LeftShift); }, + 'K' => {code.push(UsbKeyCode::V); code.push(UsbKeyCode::LeftShift); }, + 'L' => {code.push(UsbKeyCode::P); code.push(UsbKeyCode::LeftShift); }, + 'M' => {code.push(UsbKeyCode::M); code.push(UsbKeyCode::LeftShift); }, + 'N' => {code.push(UsbKeyCode::L); code.push(UsbKeyCode::LeftShift); }, + 'O' => {code.push(UsbKeyCode::S); code.push(UsbKeyCode::LeftShift); }, + 'P' => {code.push(UsbKeyCode::R); code.push(UsbKeyCode::LeftShift); }, + 'Q' => {code.push(UsbKeyCode::X); code.push(UsbKeyCode::LeftShift); }, + 'R' => {code.push(UsbKeyCode::O); code.push(UsbKeyCode::LeftShift); }, + 'S' => {code.push(UsbKeyCode::Semicolon); code.push(UsbKeyCode::LeftShift); }, + 'T' => {code.push(UsbKeyCode::K); code.push(UsbKeyCode::LeftShift); }, + 'U' => {code.push(UsbKeyCode::F); code.push(UsbKeyCode::LeftShift); }, + 'V' => {code.push(UsbKeyCode::Dot); code.push(UsbKeyCode::LeftShift); }, + 'W' => {code.push(UsbKeyCode::Comma); code.push(UsbKeyCode::LeftShift); }, + 'X' => {code.push(UsbKeyCode::B); code.push(UsbKeyCode::LeftShift); }, + 'Y' => {code.push(UsbKeyCode::T); code.push(UsbKeyCode::LeftShift); }, + 'Z' => {code.push(UsbKeyCode::ForwardSlash); code.push(UsbKeyCode::LeftShift); }, + '[' => {code.push(UsbKeyCode::Minus); }, + '\\' => {code.push(UsbKeyCode::Backslash); }, + ']' => {code.push(UsbKeyCode::Equal); }, + '^' => {code.push(UsbKeyCode::Keyboard6); code.push(UsbKeyCode::LeftShift); }, + '_' => {code.push(UsbKeyCode::Apostrophe); code.push(UsbKeyCode::LeftShift); }, + '`' => {code.push(UsbKeyCode::Grave); }, + 'a' => {code.push(UsbKeyCode::A); }, + 'b' => {code.push(UsbKeyCode::N); }, + 'c' => {code.push(UsbKeyCode::I); }, + 'd' => {code.push(UsbKeyCode::H); }, + 'e' => {code.push(UsbKeyCode::D); }, + 'f' => {code.push(UsbKeyCode::Y); }, + 'g' => {code.push(UsbKeyCode::U); }, + 'h' => {code.push(UsbKeyCode::J); }, + 'i' => {code.push(UsbKeyCode::G); }, + 'j' => {code.push(UsbKeyCode::C); }, + 'k' => {code.push(UsbKeyCode::V); }, + 'l' => {code.push(UsbKeyCode::P); }, + 'm' => {code.push(UsbKeyCode::M); }, + 'n' => {code.push(UsbKeyCode::L); }, + 'o' => {code.push(UsbKeyCode::S); }, + 'p' => {code.push(UsbKeyCode::R); }, + 'q' => {code.push(UsbKeyCode::X); }, + 'r' => {code.push(UsbKeyCode::O); }, + 's' => {code.push(UsbKeyCode::Semicolon); }, + 't' => {code.push(UsbKeyCode::K); }, + 'u' => {code.push(UsbKeyCode::F); }, + 'v' => {code.push(UsbKeyCode::Dot); }, + 'w' => {code.push(UsbKeyCode::Comma); }, + 'x' => {code.push(UsbKeyCode::B); }, + 'y' => {code.push(UsbKeyCode::T); }, + 'z' => {code.push(UsbKeyCode::ForwardSlash); }, + '{' => {code.push(UsbKeyCode::Minus); code.push(UsbKeyCode::LeftShift); }, + '|' => {code.push(UsbKeyCode::Backslash); code.push(UsbKeyCode::LeftShift); }, + '}' => {code.push(UsbKeyCode::Equal); code.push(UsbKeyCode::LeftShift); }, + '~' => {code.push(UsbKeyCode::Grave); code.push(UsbKeyCode::LeftShift); }, + '\u{000d}' => {}, // ignore CR + '\u{000a}' => code.push(UsbKeyCode::ReturnEnter), // turn LF ('\n') into enter + '\u{0008}' => code.push(UsbKeyCode::DeleteBackspace), + _ => log::warn!("Ignoring unhandled character: {}", key), + }; + code +} \ No newline at end of file