From 73dec54ee1d44fa5a45711c9641c83c422f52b43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= Date: Sun, 26 Feb 2017 00:35:26 +0100 Subject: [PATCH] Remove keyMasks because they made the right keyboard half crash when pressing a layer switcher key. --- right/src/action.c | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/right/src/action.c b/right/src/action.c index d13c55e..51ff3df 100644 --- a/right/src/action.c +++ b/right/src/action.c @@ -5,32 +5,15 @@ #include "usb_interface_mouse.h" #include "current_keymap.h" -static uint8_t keyMasks[SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE]; - static uint8_t ActiveLayer = LAYER_ID_BASE; static key_action_t keyToAction(uint8_t slotId, uint8_t keyId) { - if (keyMasks[slotId][keyId]!=0 && keyMasks[slotId][keyId]!=ActiveLayer) { - // Mask out key presses after releasing modifier keys - return (key_action_t){.type = KEY_ACTION_NONE}; - } - key_action_t key = CurrentKeymap[ActiveLayer][slotId][keyId]; - keyMasks[slotId][keyId] = ActiveLayer; return key; } -static void clearKeymask(const uint8_t *keyStates) -{ - for (uint8_t i=0; i < MAX_KEY_COUNT_PER_MODULE; i++) { - if (keyStates[i]==0) { - keyMasks[SLOT_ID_LEFT_KEYBOARD_HALF][i] = 0; - } - } -} - static bool pressKey(key_action_t key, int scancodeIdx, usb_keyboard_report_t *report) { if (key.type != KEY_ACTION_KEYSTROKE) { @@ -51,21 +34,11 @@ static bool pressKey(key_action_t key, int scancodeIdx, usb_keyboard_report_t *r return true; } -static bool hasKeyPressed(const uint8_t *prevKeyStates, const uint8_t *currKeyStates, uint8_t keyId) -{ - return (!prevKeyStates[keyId]) && currKeyStates[keyId]; -} - static bool isKeyPressed(const uint8_t *currKeyStates, uint8_t keyId) { return currKeyStates[keyId]; } -static bool hasKeyReleased(const uint8_t *prevKeyStates, const uint8_t *currKeyStates, uint8_t keyId) -{ - return (!currKeyStates[keyId]) && prevKeyStates[keyId]; -} - static bool handleKey(key_action_t key, int scancodeIdx, usb_keyboard_report_t *report, const uint8_t *prevKeyStates, const uint8_t *currKeyStates, uint8_t keyId) { switch (key.type) { case KEY_ACTION_KEYSTROKE: @@ -159,7 +132,6 @@ void HandleKeyboardEvents(usb_keyboard_report_t *keyboardReport, usb_mouse_repor } for (uint8_t slotId=0; slotId= USB_KEYBOARD_MAX_KEYS) { break;