Adds Macros
This commit is contained in:
parent
5777f09af0
commit
5aaa461f2d
|
|
@ -15,7 +15,8 @@
|
|||
//! ```
|
||||
|
||||
use crate::{
|
||||
keysend::send_keypress,
|
||||
kb_macro::{M_A2, M_A3, M_A4},
|
||||
keysend::{send_keypress, send_macro},
|
||||
layout::{A1, B1, C1},
|
||||
ChannelType,
|
||||
};
|
||||
|
|
@ -42,10 +43,12 @@ pub(crate) async fn keydispatch_press(pressed_key: &KeypadKey, sender: &ChannelT
|
|||
(_, _, _, &KeypadKey::B3) => Key { key: KeyCode::G }.launch(sender).await,
|
||||
(_, _, _, &KeypadKey::B4) => Key { key: KeyCode::H }.launch(sender).await,
|
||||
(_, _, _, &KeypadKey::C1) => Key { key: KeyCode::I }.launch(sender).await,
|
||||
(_, _, _, &KeypadKey::C2) => Key { key: KeyCode::J }.launch(sender).await,
|
||||
(_, _, _, &KeypadKey::C3) => Key { key: KeyCode::K }.launch(sender).await,
|
||||
(_, _, _, &KeypadKey::C4) => Key { key: KeyCode::L }.launch(sender).await,
|
||||
// (_, _, _, _) => Key { key: KeyCode::Z }.launch(sender).await,
|
||||
// (_, _, _, &KeypadKey::C2) => Key { key: KeyCode::J }.launch(sender).await,
|
||||
// (_, _, _, &KeypadKey::C3) => Key { key: KeyCode::K }.launch(sender).await,
|
||||
// (_, _, _, &KeypadKey::C4) => Key { key: KeyCode::L }.launch(sender).await,
|
||||
(_, _, _, &KeypadKey::C2) => send_macro(M_A4, sender).await,
|
||||
(_, _, _, &KeypadKey::C3) => send_macro(M_A3, sender).await,
|
||||
(_, _, _, &KeypadKey::C4) => send_macro(M_A2, sender).await,
|
||||
}
|
||||
// Return
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,24 @@
|
|||
use usbd_hid::descriptor::KeyboardReport;
|
||||
|
||||
use crate::layout;
|
||||
|
||||
pub struct KBMacro<'a> {
|
||||
pub keys: &'a [KeyboardReport],
|
||||
}
|
||||
|
||||
#[macro_export]
|
||||
macro_rules! KBM {
|
||||
( $( $a:ident ),* ) => {
|
||||
KBMacro { keys: &[ $( layout::translate(&layout::Layout::$a),)* ] }
|
||||
};
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
const M_A1: KBMacro = KBMacro {
|
||||
keys: &[layout::translate(&layout::Layout::a)],
|
||||
};
|
||||
pub(crate) const M_A2: KBMacro =
|
||||
KBM!(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z);
|
||||
pub(crate) const M_A3: KBMacro =
|
||||
KBM!(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z);
|
||||
pub(crate) const M_A4: KBMacro = KBM!(nb1, nb2, nb3, nb4, nb5, nb6, nb7, nb8, nb9, nb0);
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
use usbd_hid::descriptor::KeyboardReport;
|
||||
|
||||
use crate::{keyboard::KeyCode, ChannelType};
|
||||
use crate::{kb_macro::KBMacro, keyboard::KeyCode, ChannelType};
|
||||
|
||||
pub(crate) async fn send_keypress(list_key: &[KeyCode], sender: &ChannelType) {
|
||||
for key in list_key.iter() {
|
||||
|
|
@ -28,3 +28,9 @@ pub(crate) async fn send_keypress(list_key: &[KeyCode], sender: &ChannelType) {
|
|||
sender.send(report).await;
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) async fn send_macro(kb_mkro: KBMacro<'_>, sender: &ChannelType) {
|
||||
for kbr in kb_mkro.keys.iter() {
|
||||
sender.send(*kbr).await;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
202
src/layout.rs
202
src/layout.rs
|
|
@ -8,6 +8,10 @@
|
|||
// TODO: Add a macro to generate all this and most of the dispatch
|
||||
|
||||
use core::sync::atomic::AtomicBool;
|
||||
|
||||
use usbd_hid::descriptor::KeyboardReport;
|
||||
|
||||
use crate::keyboard::KeyCode;
|
||||
// #[derive(Debug)]
|
||||
pub(crate) static A1: AtomicBool = AtomicBool::new(false);
|
||||
pub(crate) static B1: AtomicBool = AtomicBool::new(false);
|
||||
|
|
@ -32,3 +36,201 @@ pub(crate) enum KeypadKey {
|
|||
C3,
|
||||
C4,
|
||||
}
|
||||
|
||||
#[macro_export]
|
||||
macro_rules! KR {
|
||||
($($a:expr ),* ; $m:expr) => {
|
||||
KeyboardReport {
|
||||
modifier: $m as u8,
|
||||
reserved: 0,
|
||||
leds: 0,
|
||||
keycodes: [$($a as u8, )*],
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
enum KeyMods {
|
||||
None,
|
||||
/// The Absence of modifier
|
||||
LCtrl,
|
||||
/// Left Shift.
|
||||
LShift,
|
||||
/// Left Alt.
|
||||
LAlt,
|
||||
/// Left GUI (the Windows key).
|
||||
LGui,
|
||||
/// Right Control.
|
||||
RCtrl,
|
||||
/// Right Shift.
|
||||
RShift,
|
||||
/// Right Alt (or Alt Gr).
|
||||
RAlt,
|
||||
/// Right GUI (the Windows key).
|
||||
RGui, // 0xE7
|
||||
}
|
||||
|
||||
pub(crate) const fn translate(symbol: &Layout) -> KeyboardReport {
|
||||
match symbol {
|
||||
Layout::a => KR!(KeyCode::Q,0,0,0,0,0;0),
|
||||
Layout::b => KR!(KeyCode::B,0,0,0,0,0;0),
|
||||
Layout::c => KR!(KeyCode::C,0,0,0,0,0;0),
|
||||
Layout::d => KR!(KeyCode::D,0,0,0,0,0;0),
|
||||
Layout::e => KR!(KeyCode::E,0,0,0,0,0;0),
|
||||
Layout::f => KR!(KeyCode::F,0,0,0,0,0;0),
|
||||
Layout::g => KR!(KeyCode::G,0,0,0,0,0;0),
|
||||
Layout::h => KR!(KeyCode::H,0,0,0,0,0;0),
|
||||
Layout::i => KR!(KeyCode::I,0,0,0,0,0;0),
|
||||
Layout::j => KR!(KeyCode::J,0,0,0,0,0;0),
|
||||
Layout::k => KR!(KeyCode::K,0,0,0,0,0;0),
|
||||
Layout::l => KR!(KeyCode::L,0,0,0,0,0;0),
|
||||
Layout::m => KR!(KeyCode::SColon, 0,0,0,0,0;0),
|
||||
Layout::n => KR!(KeyCode::N,0,0,0,0,0;0),
|
||||
Layout::o => KR!(KeyCode::O,0,0,0,0,0;0),
|
||||
Layout::p => KR!(KeyCode::P,0,0,0,0,0;0),
|
||||
Layout::q => KR!(KeyCode::A,0,0,0,0,0;0),
|
||||
Layout::r => KR!(KeyCode::R,0,0,0,0,0;0),
|
||||
Layout::s => KR!(KeyCode::S,0,0,0,0,0;0),
|
||||
Layout::t => KR!(KeyCode::T,0,0,0,0,0;0),
|
||||
Layout::u => KR!(KeyCode::U,0,0,0,0,0;0),
|
||||
Layout::v => KR!(KeyCode::V,0,0,0,0,0;0),
|
||||
Layout::w => KR!(KeyCode::Z,0,0,0,0,0;0),
|
||||
Layout::x => KR!(KeyCode::X,0,0,0,0,0;0),
|
||||
Layout::y => KR!(KeyCode::Y,0,0,0,0,0;0),
|
||||
Layout::z => KR!(KeyCode::W,0,0,0,0,0;0),
|
||||
Layout::A => KR!(KeyCode::Q,0,0,0,0,0;KeyMods::LShift),
|
||||
Layout::B => KR!(KeyCode::B,0,0,0,0,0;KeyMods::LShift),
|
||||
Layout::C => KR!(KeyCode::C,0,0,0,0,0;KeyMods::LShift),
|
||||
Layout::D => KR!(KeyCode::D,0,0,0,0,0;KeyMods::LShift),
|
||||
Layout::E => KR!(KeyCode::E,0,0,0,0,0;KeyMods::LShift),
|
||||
Layout::F => KR!(KeyCode::F,0,0,0,0,0;KeyMods::LShift),
|
||||
Layout::G => KR!(KeyCode::G,0,0,0,0,0;KeyMods::LShift),
|
||||
Layout::H => KR!(KeyCode::H,0,0,0,0,0;KeyMods::LShift),
|
||||
Layout::I => KR!(KeyCode::I,0,0,0,0,0;KeyMods::LShift),
|
||||
Layout::J => KR!(KeyCode::J,0,0,0,0,0;KeyMods::LShift),
|
||||
Layout::K => KR!(KeyCode::K,0,0,0,0,0;KeyMods::LShift),
|
||||
Layout::L => KR!(KeyCode::L,0,0,0,0,0;KeyMods::LShift),
|
||||
Layout::M => KR!(KeyCode::SColon,0,0,0,0,0;KeyMods::LShift),
|
||||
Layout::N => KR!(KeyCode::N,0,0,0,0,0;KeyMods::LShift),
|
||||
Layout::O => KR!(KeyCode::O,0,0,0,0,0;KeyMods::LShift),
|
||||
Layout::P => KR!(KeyCode::P,0,0,0,0,0;KeyMods::LShift),
|
||||
Layout::Q => KR!(KeyCode::A,0,0,0,0,0;KeyMods::LShift),
|
||||
Layout::R => KR!(KeyCode::R,0,0,0,0,0;KeyMods::LShift),
|
||||
Layout::S => KR!(KeyCode::S,0,0,0,0,0;KeyMods::LShift),
|
||||
Layout::T => KR!(KeyCode::T,0,0,0,0,0;KeyMods::LShift),
|
||||
Layout::U => KR!(KeyCode::U,0,0,0,0,0;KeyMods::LShift),
|
||||
Layout::V => KR!(KeyCode::V,0,0,0,0,0;KeyMods::LShift),
|
||||
Layout::W => KR!(KeyCode::Z,0,0,0,0,0;KeyMods::LShift),
|
||||
Layout::X => KR!(KeyCode::X,0,0,0,0,0;KeyMods::LShift),
|
||||
Layout::Y => KR!(KeyCode::Y,0,0,0,0,0;KeyMods::LShift),
|
||||
Layout::Z => KR!(KeyCode::W,0,0,0,0,0;KeyMods::LShift),
|
||||
Layout::nb1 => KR!(KeyCode::Kb1,0,0,0,0,0;KeyMods::LShift),
|
||||
Layout::nb2 => KR!(KeyCode::Kb2,0,0,0,0,0;KeyMods::LShift),
|
||||
Layout::nb3 => KR!(KeyCode::Kb3,0,0,0,0,0;KeyMods::LShift),
|
||||
Layout::nb4 => KR!(KeyCode::Kb4,0,0,0,0,0;KeyMods::LShift),
|
||||
Layout::nb5 => KR!(KeyCode::Kb5,0,0,0,0,0;KeyMods::LShift),
|
||||
Layout::nb6 => KR!(KeyCode::Kb6,0,0,0,0,0;KeyMods::LShift),
|
||||
Layout::nb7 => KR!(KeyCode::Kb7,0,0,0,0,0;KeyMods::LShift),
|
||||
Layout::nb8 => KR!(KeyCode::Kb8,0,0,0,0,0;KeyMods::LShift),
|
||||
Layout::nb9 => KR!(KeyCode::Kb9,0,0,0,0,0;KeyMods::LShift),
|
||||
Layout::nb0 => KR!(KeyCode::Kb0,0,0,0,0,0;KeyMods::LShift),
|
||||
Layout::amp => todo!(),
|
||||
Layout::eacute => todo!(),
|
||||
Layout::quote => todo!(),
|
||||
Layout::squote => todo!(),
|
||||
Layout::lparenth => todo!(),
|
||||
Layout::minus => todo!(),
|
||||
Layout::eagrave => todo!(),
|
||||
Layout::underscore => todo!(),
|
||||
Layout::cced => todo!(),
|
||||
Layout::agrave => todo!(),
|
||||
Layout::rparenth => todo!(),
|
||||
Layout::equals => todo!(),
|
||||
Layout::lessthan => todo!(),
|
||||
Layout::morethan => todo!(),
|
||||
Layout::pow => todo!(),
|
||||
Layout::star => todo!(),
|
||||
}
|
||||
}
|
||||
|
||||
#[allow(non_camel_case_types, dead_code)]
|
||||
pub(crate) enum Layout {
|
||||
a,
|
||||
b,
|
||||
c,
|
||||
d,
|
||||
e,
|
||||
f,
|
||||
g,
|
||||
h,
|
||||
i,
|
||||
j,
|
||||
k,
|
||||
l,
|
||||
m,
|
||||
n,
|
||||
o,
|
||||
p,
|
||||
q,
|
||||
r,
|
||||
s,
|
||||
t,
|
||||
u,
|
||||
v,
|
||||
w,
|
||||
x,
|
||||
y,
|
||||
z,
|
||||
A,
|
||||
B,
|
||||
C,
|
||||
D,
|
||||
E,
|
||||
F,
|
||||
G,
|
||||
H,
|
||||
I,
|
||||
J,
|
||||
K,
|
||||
L,
|
||||
M,
|
||||
N,
|
||||
O,
|
||||
P,
|
||||
Q,
|
||||
R,
|
||||
S,
|
||||
T,
|
||||
U,
|
||||
V,
|
||||
W,
|
||||
X,
|
||||
Y,
|
||||
Z,
|
||||
nb1,
|
||||
nb2,
|
||||
nb3,
|
||||
nb4,
|
||||
nb5,
|
||||
nb6,
|
||||
nb7,
|
||||
nb8,
|
||||
nb9,
|
||||
nb0,
|
||||
amp,
|
||||
eacute,
|
||||
quote,
|
||||
squote,
|
||||
lparenth,
|
||||
minus,
|
||||
eagrave,
|
||||
underscore,
|
||||
cced,
|
||||
agrave,
|
||||
rparenth,
|
||||
equals,
|
||||
lessthan,
|
||||
morethan,
|
||||
pow,
|
||||
star,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
#![no_std]
|
||||
#![no_main]
|
||||
mod dispatch;
|
||||
mod kb_macro;
|
||||
mod keyboard;
|
||||
mod keypress;
|
||||
mod keysend;
|
||||
|
|
|
|||
Reference in New Issue