fix braille keyboard mappings

This commit is contained in:
bunnie 2022-03-17 15:20:20 +08:00
parent 19b9b817a4
commit 6d98c5db3d

View file

@ -325,10 +325,11 @@ mod implementation {
*/ */
let was_idle = self.chord_active == 0; let was_idle = self.chord_active == 0;
for rc in krs.keydowns.iter() { for rc in krs.keydowns.iter() {
log::info!("keydown r: {} c: {}", rc.r, rc.c);
self.chord[rc.r as usize][rc.c as usize] = true; self.chord[rc.r as usize][rc.c as usize] = true;
self.chord_active += 1; self.chord_active += 1;
} }
log::trace!("self.chord: {:?}", self.chord); log::info!("self.chord: {:?}", self.chord);
let mut keystates: Vec<char> = Vec::new(); let mut keystates: Vec<char> = Vec::new();
let now = self.ticktimer.elapsed_ms(); let now = self.ticktimer.elapsed_ms();
@ -339,7 +340,7 @@ mod implementation {
if self.chord_active != 0 && ((now - self.chord_timestamp) >= self.chord_interval as u64) && !self.chord_captured { if self.chord_active != 0 && ((now - self.chord_timestamp) >= self.chord_interval as u64) && !self.chord_captured {
self.chord_captured = true; self.chord_captured = true;
log::trace!("interpreting chords"); log::info!("interpreting chords");
// extract chord state // extract chord state
/* /*
keyboard: keyboard:
@ -349,13 +350,20 @@ mod implementation {
1 4 1 4
2 5 2 5
*/ */
/*
7/5 0/1 1/2 5/7 4/8 8/6
2/3 2/3
8/0 6/4 3/9
8/3 5/2 3/6
8/2
*/
let keys: [bool; 6] = [ let keys: [bool; 6] = [
self.chord[5][7],
self.chord[4][8],
self.chord[3][9],
self.chord[1][2], self.chord[1][2],
self.chord[0][1], self.chord[0][1],
self.chord[8][0], self.chord[7][5],
self.chord[5][7],
self.chord[4][8],
self.chord[8][6],
]; ];
let mut keycode: usize = 0; let mut keycode: usize = 0;
for i in 0..keys.len() { for i in 0..keys.len() {
@ -363,7 +371,7 @@ mod implementation {
keycode |= 1 << i; keycode |= 1 << i;
} }
} }
log::trace!("keycode: 0x{:x}", keycode); log::info!("keycode: 0x{:x}", keycode);
let keychar = match keycode { let keychar = match keycode {
0b000_001 => Some('a'), 0b000_001 => Some('a'),
0b000_011 => Some('b'), 0b000_011 => Some('b'),
@ -418,15 +426,15 @@ mod implementation {
let space = self.chord[2][3]; let space = self.chord[2][3];
if space { keystates.push(' '); } if space { keystates.push(' '); }
let esc = self.chord[8][6]; let esc = self.chord[8][0];
let bs: char = 0x8_u8.into(); // back space let bs: char = 0x8_u8.into(); // back space
if esc { keystates.push(bs); } if esc { keystates.push(bs); }
let func = self.chord[7][5]; let func = self.chord[3][9];
let cr: char = 0xd_u8.into(); // carriage return let cr: char = 0xd_u8.into(); // carriage return
if func { keystates.push(cr); } if func { keystates.push(cr); }
log::trace!("up {}, left {}, right {}, down, {}, center, {}, space {}, esc {}, func {}", log::info!("up {}, left {}, right {}, down, {}, center, {}, space {}, esc {}, func {}",
up, left, right, down, center, space, esc, func); up, left, right, down, center, space, esc, func);
} }
for rc in krs.keyups.iter() { for rc in krs.keyups.iter() {