diff --git a/src/constants/HIDmap.ts b/src/constants/HIDmap.ts index e2afd3e8..71395be0 100644 --- a/src/constants/HIDmap.ts +++ b/src/constants/HIDmap.ts @@ -798,7 +798,7 @@ export class Hid { } static get NUMDECIMAL(): HidInfo { return { - HIDcode: 99, + HIDcode: 133, category: HIDCategory.Numpad, displayString: 'Numpad Decimal', webKeyId: 'NumpadDecimal', diff --git a/wooting-macro-backend/src/hid_table.rs b/wooting-macro-backend/src/hid_table.rs index 6732a8b4..6e1eac82 100644 --- a/wooting-macro-backend/src/hid_table.rs +++ b/wooting-macro-backend/src/hid_table.rs @@ -176,7 +176,7 @@ pub static ref SCANCODE_TO_RDEV: HashMap = { scancode.insert(0x60, Key::Kp8); //NUMPAD8 scancode.insert(0x61, Key::Kp9); //NUMPAD9 scancode.insert(0x62, Key::Kp0); //NUMPAD0 - scancode.insert(0x63, Key::Dot); //NUMPAD_DECIMAL + scancode.insert(0x85, Key::KpDelete); //NUMPAD_COMMA (KP_DELETE) scancode.insert(0x64, Key::IntlBackslash); //INTL_BACKSLASH scancode.insert(0x65, Key::Function); //CONTEXT_MENU @@ -198,7 +198,7 @@ pub static ref SCANCODE_TO_RDEV: HashMap = { - // scancode.insert(0x85, Key::Key); //NUMPAD_COMMA + // scancode.insert(0x85, Key::Key); //NUMPAD_COMMA (KP_DELETE) // // scancode.insert(0x87, Key::Key); //INTL_RO // scancode.insert(0x88, Key::Key); //KANA_MODE @@ -382,7 +382,7 @@ pub static ref SCANCODE_TO_HID: HashMap = { scancode.insert(Key::Kp8, 0x60); //NUMPAD8 scancode.insert(Key::Kp9, 0x61); //NUMPAD9 scancode.insert(Key::Kp0, 0x62); //NUMPAD0 - scancode.insert(Key::Dot, 0x63); //NUMPAD_DECIMAL + scancode.insert(Key::KpDelete, 0x85); //NUMPAD_COMMA (KP_DELETE) scancode.insert(Key::IntlBackslash, 0x64); //INTL_BACKSLASH scancode.insert(Key::Function, 0x65); //CONTEXT_MENU diff --git a/wooting-macro-backend/src/lib.rs b/wooting-macro-backend/src/lib.rs index 10828600..c53a96e7 100644 --- a/wooting-macro-backend/src/lib.rs +++ b/wooting-macro-backend/src/lib.rs @@ -502,7 +502,6 @@ impl MacroBackend { let trigger_list = inner_triggers.blocking_read().clone(); - debug!("TRIGGER LIST: {:#?}", trigger_list); let check_these_macros = match trigger_list.get(&first_key) { None => {