From 4ee9ca4e635faea04ca189c98a363aaab7eaac39 Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Mon, 24 Jul 2017 23:55:48 -0700 Subject: [PATCH] pressConsumer/releaseConsumer -> pressConsumerControl / releaseConsumerControl ditto for SystemControl --- src/key_events.cpp | 16 ++++++++-------- src/key_events.h | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/key_events.cpp b/src/key_events.cpp index 25db39dc..d178b17f 100644 --- a/src/key_events.cpp +++ b/src/key_events.cpp @@ -12,15 +12,15 @@ static bool handleSyntheticKeyswitchEvent(Key mappedKey, uint8_t keyState) { return false; } else if (mappedKey.flags & IS_CONSUMER) { if (keyIsPressed(keyState)) { - pressConsumer(mappedKey); + pressConsumerControl(mappedKey); } else if (keyWasPressed(keyState)) { - releaseConsumer(mappedKey); + releaseConsumerControl(mappedKey); } } else if (mappedKey.flags & IS_SYSCTL) { if (keyIsPressed(keyState)) { - pressSystem(mappedKey); + pressSystemControl(mappedKey); } else if (keyWasPressed(keyState)) { - releaseSystem(mappedKey); + releaseSystemControl(mappedKey); } } else if (mappedKey.flags & SWITCH_TO_KEYMAP) { // Should not happen, handled elsewhere. @@ -129,11 +129,11 @@ void initializeConsumerControl() { ConsumerControl.begin(); } -void pressConsumer(Key mappedKey) { +void pressConsumerControl(Key mappedKey) { ConsumerControl.press(mappedKey.keyCode); } -void releaseConsumer(Key mappedKey) { +void releaseConsumerControl(Key mappedKey) { ConsumerControl.release(mappedKey.keyCode); } @@ -142,11 +142,11 @@ void initializeSystemControl() { SystemControl.begin(); } -void pressSystem(Key mappedKey) { +void pressSystemControl(Key mappedKey) { SystemControl.press(mappedKey.keyCode); } -void releaseSystem(Key mappedKey) { +void releaseSystemControl(Key mappedKey) { SystemControl.release(); } diff --git a/src/key_events.h b/src/key_events.h index d0333fdc..a9207b0c 100644 --- a/src/key_events.h +++ b/src/key_events.h @@ -60,13 +60,13 @@ boolean isModifierKeyActive(Key mappedKey); void initializeConsumerControl(); -void pressConsumer(Key mappedKey); -void releaseConsumer(Key mappedKey); +void pressConsumerControl(Key mappedKey); +void releaseConsumerControl(Key mappedKey); void initializeSystemControl(); -void pressSystem(Key mappedKey); -void releaseSystem(Key mappedKey); +void pressSystemControl(Key mappedKey); +void releaseSystemControl(Key mappedKey); void initializeMouse();