uhk/firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename key_toggled_on() to hasKeyPressed(), key_is_pressed() to isKeyPressed(), and key_toggled_off() to hasKeyReleased()

Browse Source
This commit is contained in:
László Monda
2017-01-02 18:04:44 +01:00
parent 3331192cfa
commit 844a3609fc
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
right/src/action.c
View File

@@ -57,30 +57,30 @@ static bool pressKey(uhk_key_t key, int scancodeIdx, usb_keyboard_report_t *repo
return true; return true;
} }
static bool key_toggled_on(const uint8_t *prevKeyStates, const uint8_t *currKeyStates, uint8_t keyId) { static bool hasKeyPressed(const uint8_t *prevKeyStates, const uint8_t *currKeyStates, uint8_t keyId) {
return (!prevKeyStates[keyId]) && currKeyStates[keyId]; return (!prevKeyStates[keyId]) && currKeyStates[keyId];
} }
static bool key_is_pressed(const uint8_t *prevKeyStates, const uint8_t *currKeyStates, uint8_t keyId) { static bool isKeyPressed(const uint8_t *prevKeyStates, const uint8_t *currKeyStates, uint8_t keyId) {
return currKeyStates[keyId]; return currKeyStates[keyId];
} }
static bool key_toggled_off(const uint8_t *prevKeyStates, const uint8_t *currKeyStates, uint8_t keyId) { static bool hasKeyReleased(const uint8_t *prevKeyStates, const uint8_t *currKeyStates, uint8_t keyId) {
return (!currKeyStates[keyId]) && prevKeyStates[keyId]; return (!currKeyStates[keyId]) && prevKeyStates[keyId];
} }
static bool handleKey(uhk_key_t key, int scancodeIdx, usb_keyboard_report_t *report, const uint8_t *prevKeyStates, const uint8_t *currKeyStates, uint8_t keyId) { static bool handleKey(uhk_key_t key, int scancodeIdx, usb_keyboard_report_t *report, const uint8_t *prevKeyStates, const uint8_t *currKeyStates, uint8_t keyId) {
switch (key.type) { switch (key.type) {
case UHK_KEY_SIMPLE: case UHK_KEY_SIMPLE:
if (key_is_pressed(prevKeyStates, currKeyStates, keyId)) { if (isKeyPressed(prevKeyStates, currKeyStates, keyId)) {
return pressKey(key, scancodeIdx, report); return pressKey(key, scancodeIdx, report);
} }
break; break;
case UHK_KEY_LAYER: case UHK_KEY_LAYER:
if (key_toggled_on(prevKeyStates, currKeyStates, keyId)) { if (hasKeyPressed(prevKeyStates, currKeyStates, keyId)) {
ActiveLayer = key.layer.target; ActiveLayer = key.layer.target;
} }
if (key_toggled_off(prevKeyStates, currKeyStates, keyId)) { if (hasKeyReleased(prevKeyStates, currKeyStates, keyId)) {
ActiveLayer = LAYER_ID_BASE; ActiveLayer = LAYER_ID_BASE;
} }
LedDisplay_SetLayerLed(ActiveLayer); LedDisplay_SetLayerLed(ActiveLayer);
@@ -99,7 +99,7 @@ static bool wasPreviousMouseActionWheelAction = false;
static void handleMouseKey(usb_mouse_report_t *report, uhk_key_t key, const uint8_t *prevKeyStates, const uint8_t *currKeyStates, uint8_t keyId) static void handleMouseKey(usb_mouse_report_t *report, uhk_key_t key, const uint8_t *prevKeyStates, const uint8_t *currKeyStates, uint8_t keyId)
{ {
if (!key_is_pressed(prevKeyStates, currKeyStates, keyId)) { if (!isKeyPressed(prevKeyStates, currKeyStates, keyId)) {
return; return;
} }