From 2582441523b1cc6f7ca00aa19b4e2e5e06b82b32 Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Mon, 24 Jul 2017 14:12:26 -0700 Subject: [PATCH] CamelCase of KeyIsPressed and KeyWasPressed --- examples/AppSwitcher/Macros.cpp | 2 +- src/key_events.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/AppSwitcher/Macros.cpp b/examples/AppSwitcher/Macros.cpp index 0e134fa8..8229c3fc 100644 --- a/examples/AppSwitcher/Macros.cpp +++ b/examples/AppSwitcher/Macros.cpp @@ -34,7 +34,7 @@ const macro_t *macroAppSwitch(uint8_t keyState) { mod = Key_LeftGui; // Key was just pressed, or is being held - if (key_is_pressed(keyState)) { + if (keyIsPressed(keyState)) { return MACRO(Dr(mod), D(Tab), END); } // Key was just released diff --git a/src/key_events.cpp b/src/key_events.cpp index b15317a8..d8383f9b 100644 --- a/src/key_events.cpp +++ b/src/key_events.cpp @@ -10,14 +10,14 @@ static bool handle_synthetic_keyswitch_event(Key mappedKey, uint8_t keyState) { if (mappedKey.flags & IS_INTERNAL) { return false; } else if (mappedKey.flags & IS_CONSUMER) { - if (key_is_pressed(keyState)) + if (keyIsPressed(keyState)) ConsumerControl.press(mappedKey.keyCode); - else if (key_was_pressed(keyState)) + else if (keyWasPressed(keyState)) ConsumerControl.release(mappedKey.keyCode); } else if (mappedKey.flags & IS_SYSCTL) { - if (key_is_pressed(keyState)) + if (keyIsPressed(keyState)) SystemControl.press(mappedKey.keyCode); - else if (key_was_pressed(keyState)) + else if (keyWasPressed(keyState)) SystemControl.release(); } else if (mappedKey.flags & SWITCH_TO_KEYMAP) { // Should not happen, handled elsewhere. @@ -32,7 +32,7 @@ static bool handle_keyswitch_event_default(Key mappedKey, byte row, byte col, ui if (mappedKey.flags & SYNTHETIC) { handle_synthetic_keyswitch_event(mappedKey, keyState); - } else if (key_is_pressed(keyState)) { + } else if (keyIsPressed(keyState)) { press_key(mappedKey); } else if (keyToggledOff(keyState) && (keyState & INJECTED)) { release_key(mappedKey);