mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
cleanup warnings
This commit is contained in:
parent
44899d073e
commit
9cc94d05ec
3 changed files with 11 additions and 22 deletions
|
|
@ -1,7 +1,3 @@
|
||||||
use xous::{Message, ScalarMessage};
|
|
||||||
use xous_ipc::String;
|
|
||||||
use num_traits::{ToPrimitive, FromPrimitive};
|
|
||||||
|
|
||||||
pub const SERVER_NAME_KBD: &str = "_Matrix keyboard driver_";
|
pub const SERVER_NAME_KBD: &str = "_Matrix keyboard driver_";
|
||||||
|
|
||||||
#[derive(Debug, Default, Copy, Clone)]
|
#[derive(Debug, Default, Copy, Clone)]
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
#![cfg_attr(target_os = "none", no_std)]
|
#![cfg_attr(target_os = "none", no_std)]
|
||||||
|
|
||||||
use xous_ipc::String;
|
|
||||||
use num_traits::{ToPrimitive, FromPrimitive};
|
use num_traits::{ToPrimitive, FromPrimitive};
|
||||||
|
|
||||||
pub mod api;
|
pub mod api;
|
||||||
|
|
|
||||||
|
|
@ -7,12 +7,12 @@ use api::*;
|
||||||
use heapless::Vec;
|
use heapless::Vec;
|
||||||
use heapless::consts::*;
|
use heapless::consts::*;
|
||||||
|
|
||||||
use log::{error, info};
|
use log::info;
|
||||||
|
|
||||||
use num_traits::{FromPrimitive, ToPrimitive};
|
use num_traits::{FromPrimitive, ToPrimitive};
|
||||||
use xous_ipc::Buffer;
|
use xous_ipc::Buffer;
|
||||||
use api::{Opcode, KeyRawStates};
|
use api::{Opcode, KeyRawStates};
|
||||||
use xous::{CID, msg_scalar_unpack, msg_blocking_scalar_unpack};
|
use xous::{CID, msg_scalar_unpack};
|
||||||
|
|
||||||
/// Compute the dvorak key mapping of row/col to key tuples
|
/// Compute the dvorak key mapping of row/col to key tuples
|
||||||
#[allow(dead_code)]
|
#[allow(dead_code)]
|
||||||
|
|
@ -167,11 +167,9 @@ mod implementation {
|
||||||
use utralib::generated::*;
|
use utralib::generated::*;
|
||||||
use crate::api::*;
|
use crate::api::*;
|
||||||
use crate::{map_dvorak, map_qwerty};
|
use crate::{map_dvorak, map_qwerty};
|
||||||
use log::{error, info};
|
|
||||||
use ticktimer_server::Ticktimer;
|
use ticktimer_server::Ticktimer;
|
||||||
use xous::CID;
|
use xous::CID;
|
||||||
use xous_ipc::Buffer;
|
use num_traits::ToPrimitive;
|
||||||
use num_traits::{FromPrimitive, ToPrimitive};
|
|
||||||
|
|
||||||
use heapless::Vec;
|
use heapless::Vec;
|
||||||
use heapless::consts::*;
|
use heapless::consts::*;
|
||||||
|
|
@ -183,8 +181,6 @@ mod implementation {
|
||||||
pub struct Keyboard {
|
pub struct Keyboard {
|
||||||
conn: CID,
|
conn: CID,
|
||||||
csr: utralib::CSR<u32>,
|
csr: utralib::CSR<u32>,
|
||||||
/// last timestamp (in ms) since last call
|
|
||||||
timestamp: u64,
|
|
||||||
/// where the interrupt handler copies the new state
|
/// where the interrupt handler copies the new state
|
||||||
new_state: RowColVec,
|
new_state: RowColVec,
|
||||||
/// remember the last key states
|
/// remember the last key states
|
||||||
|
|
@ -242,7 +238,6 @@ mod implementation {
|
||||||
let mut kbd = Keyboard {
|
let mut kbd = Keyboard {
|
||||||
conn: xous::connect(sid).unwrap(),
|
conn: xous::connect(sid).unwrap(),
|
||||||
csr: CSR::new(csr.as_mut_ptr() as *mut u32),
|
csr: CSR::new(csr.as_mut_ptr() as *mut u32),
|
||||||
timestamp,
|
|
||||||
new_state: RowColVec::new(),
|
new_state: RowColVec::new(),
|
||||||
last_state: RowColVec::new(),
|
last_state: RowColVec::new(),
|
||||||
ticktimer,
|
ticktimer,
|
||||||
|
|
@ -350,7 +345,7 @@ mod implementation {
|
||||||
for i in 0..self.last_state.len() {
|
for i in 0..self.last_state.len() {
|
||||||
if let Some(lastcode) = self.last_state.get(i) {
|
if let Some(lastcode) = self.last_state.get(i) {
|
||||||
if !new_codes.contains(lastcode) {
|
if !new_codes.contains(lastcode) {
|
||||||
keyups.add_rc(lastcode);
|
keyups.add_rc(lastcode).unwrap();
|
||||||
self.last_state.set(i, None);
|
self.last_state.set(i, None);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -616,7 +611,7 @@ mod implementation {
|
||||||
hold = false;
|
hold = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
fn report_ok(k: char) -> Result<(), ()> { error!("ran out of space saving char: {}", k); Ok(()) }
|
fn report_ok(k: char) -> Result<(), ()> { log::error!("ran out of space saving char: {}", k); Ok(()) }
|
||||||
|
|
||||||
if let Some(kus) = &keyups_noshift {
|
if let Some(kus) = &keyups_noshift {
|
||||||
for &rc in kus.iter() {
|
for &rc in kus.iter() {
|
||||||
|
|
@ -713,7 +708,6 @@ mod implementation {
|
||||||
use heapless::consts::*;
|
use heapless::consts::*;
|
||||||
use crate::api::*;
|
use crate::api::*;
|
||||||
//use crate::{map_dvorak, map_qwerty};
|
//use crate::{map_dvorak, map_qwerty};
|
||||||
//use log::{error, info};
|
|
||||||
|
|
||||||
#[allow(dead_code)]
|
#[allow(dead_code)]
|
||||||
pub struct Keyboard {
|
pub struct Keyboard {
|
||||||
|
|
@ -813,7 +807,7 @@ fn xmain() -> ! {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if !found {
|
if !found {
|
||||||
error!("RegisterListener ran out of space registering callback");
|
log::error!("RegisterListener ran out of space registering callback");
|
||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
Some(Opcode::RegisterRawListener) => msg_scalar_unpack!(msg, sid0, sid1, sid2, sid3, {
|
Some(Opcode::RegisterRawListener) => msg_scalar_unpack!(msg, sid0, sid1, sid2, sid3, {
|
||||||
|
|
@ -828,7 +822,7 @@ fn xmain() -> ! {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if !found {
|
if !found {
|
||||||
error!("RegisterListener ran out of space registering callback");
|
log::error!("RegisterListener ran out of space registering callback");
|
||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
Some(Opcode::SelectKeyMap) => msg_scalar_unpack!(msg, km, _, _, _, {
|
Some(Opcode::SelectKeyMap) => msg_scalar_unpack!(msg, km, _, _, _, {
|
||||||
|
|
@ -840,10 +834,10 @@ fn xmain() -> ! {
|
||||||
Some(Opcode::SetChordInterval) => msg_scalar_unpack!(msg, delay, _, _, _, {
|
Some(Opcode::SetChordInterval) => msg_scalar_unpack!(msg, delay, _, _, _, {
|
||||||
kbd.set_chord_interval(delay as u32);
|
kbd.set_chord_interval(delay as u32);
|
||||||
}),
|
}),
|
||||||
Some(Opcode::HostModeInjectKey) => msg_scalar_unpack!(msg, k, _, _, _, {
|
Some(Opcode::HostModeInjectKey) => msg_scalar_unpack!(msg, _k, _, _, _, {
|
||||||
#[cfg(not(target_os = "none"))]
|
#[cfg(not(target_os = "none"))]
|
||||||
{
|
{
|
||||||
let key = if let Some(a) = core::char::from_u32(k as u32) {
|
let key = if let Some(a) = core::char::from_u32(_k as u32) {
|
||||||
a
|
a
|
||||||
} else {
|
} else {
|
||||||
'\u{0000}'
|
'\u{0000}'
|
||||||
|
|
@ -887,12 +881,12 @@ fn xmain() -> ! {
|
||||||
let mut keydowns_core: Vec<RowCol, U16> = Vec::new();
|
let mut keydowns_core: Vec<RowCol, U16> = Vec::new();
|
||||||
for i in 0..rawstates.keyups.len() {
|
for i in 0..rawstates.keyups.len() {
|
||||||
if let Some(rc) = rawstates.keyups.get(i) {
|
if let Some(rc) = rawstates.keyups.get(i) {
|
||||||
keyups_core.push(rc);
|
keyups_core.push(rc).unwrap();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for i in 0..rawstates.keydowns.len() {
|
for i in 0..rawstates.keydowns.len() {
|
||||||
if let Some(rc) = rawstates.keydowns.get(i) {
|
if let Some(rc) = rawstates.keydowns.get(i) {
|
||||||
keydowns_core.push(rc);
|
keydowns_core.push(rc).unwrap();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
let keyups = if keyups_core.len() > 0 {
|
let keyups = if keyups_core.len() > 0 {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue