diff --git a/services/cram-console/Cargo.toml b/services/cram-console/Cargo.toml index 0e135bf9a..918424761 100644 --- a/services/cram-console/Cargo.toml +++ b/services/cram-console/Cargo.toml @@ -19,9 +19,10 @@ xous-pio = { path = "../../libs/xous-pio", optional = true } xous-pl230 = { path = "../../libs/xous-pl230", optional = true } # this is temporary, until we get GAM/modals pulled in graphics-server = { path = "../graphics-server" } -modals = { path = "../modals" } +modals = { path = "../modals", features = ["cramium-soc"] } gam = { path = "../gam" } locales = { path = "../../locales" } +usb-device-xous = { path = "../usb-device-xous" } [features] "cramium-fpga" = ["utralib/cramium-fpga", "xous-pl230/cramium-fpga"] diff --git a/services/cram-console/src/main.rs b/services/cram-console/src/main.rs index 67874fab3..9e28d2c59 100644 --- a/services/cram-console/src/main.rs +++ b/services/cram-console/src/main.rs @@ -45,8 +45,18 @@ fn main() { } }); + let tt = xous_api_ticktimer::Ticktimer::new().unwrap(); let xns = xous_api_names::XousNames::new().unwrap(); + let usb = usb_device_xous::UsbHid::new(); + + tt.sleep_ms(15_000).ok(); + log::info!("sending hello world"); + usb.send_str("hello world"); + loop { + tt.sleep_ms(1000).ok(); + } + let status_gam_getter = xns.register_name(SERVER_NAME_STATUS_GID, Some(1)).expect("can't register server"); let mut canvas_gid: [u32; 4] = [0; 4]; diff --git a/services/cram-hal-service/src/hw/keyboard.rs b/services/cram-hal-service/src/hw/keyboard.rs index 21b694745..713badbff 100644 --- a/services/cram-hal-service/src/hw/keyboard.rs +++ b/services/cram-hal-service/src/hw/keyboard.rs @@ -95,7 +95,8 @@ fn keyboard_service() { todo!(); } Some(KeyboardOpcode::GetKeyMap) => msg_blocking_scalar_unpack!(msg, _, _, _, _, { - todo!(); + log::warn!("Defaulting to DVORAK map"); + xous::return_scalar(msg.sender, KeyMap::Dvorak.into()).expect("can't retrieve keymap"); }), Some(KeyboardOpcode::SetRepeat) => msg_scalar_unpack!(msg, _rate, _delay, _, _, { todo!();