diff options
| -rw-r--r-- | lib/python/qmk/cli/generate/keycodes.py | 2 | ||||
| -rw-r--r-- | quantum/action.c | 10 | ||||
| -rw-r--r-- | quantum/keycode.h | 3 | ||||
| -rw-r--r-- | quantum/keycodes.h | 2 |
4 files changed, 8 insertions, 9 deletions
diff --git a/lib/python/qmk/cli/generate/keycodes.py b/lib/python/qmk/cli/generate/keycodes.py index f5c646e0ea..17503bac63 100644 --- a/lib/python/qmk/cli/generate/keycodes.py +++ b/lib/python/qmk/cli/generate/keycodes.py @@ -13,6 +13,8 @@ def _translate_group(group): """ if group == 'modifiers': return 'modifier' + if group == 'media': + return 'consumer' return group diff --git a/quantum/action.c b/quantum/action.c index 72f132eaa8..0f8219a3d1 100644 --- a/quantum/action.c +++ b/quantum/action.c @@ -323,7 +323,7 @@ void register_mouse(uint8_t mouse_keycode, bool pressed) { #elif defined(POINTING_DEVICE_ENABLE) // if mousekeys isn't enabled, and pointing device is enabled, then // let pointing device do all the heavy lifting, then - if IS_MOUSEKEY (mouse_keycode) { + if IS_MOUSE_KEYCODE (mouse_keycode) { pointing_device_keycode_handler(mouse_keycode, pressed); } #endif @@ -895,13 +895,13 @@ __attribute__((weak)) void register_code(uint8_t code) { send_keyboard_report(); #ifdef EXTRAKEY_ENABLE - } else if IS_SYSTEM (code) { + } else if IS_SYSTEM_KEYCODE (code) { host_system_send(KEYCODE2SYSTEM(code)); - } else if IS_CONSUMER (code) { + } else if IS_CONSUMER_KEYCODE (code) { host_consumer_send(KEYCODE2CONSUMER(code)); #endif - } else if IS_MOUSEKEY (code) { + } else if IS_MOUSE_KEYCODE (code) { register_mouse(code, true); } } @@ -958,7 +958,7 @@ __attribute__((weak)) void unregister_code(uint8_t code) { host_consumer_send(0); #endif - } else if IS_MOUSEKEY (code) { + } else if IS_MOUSE_KEYCODE (code) { register_mouse(code, false); } } diff --git a/quantum/keycode.h b/quantum/keycode.h index 03989ed8f6..701c078ad0 100644 --- a/quantum/keycode.h +++ b/quantum/keycode.h @@ -28,9 +28,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define IS_ANY(code) (KC_A <= (code) && (code) <= 0xFF) -#define IS_SYSTEM(code) IS_SYSTEM_KEYCODE(code) -#define IS_CONSUMER(code) IS_MEDIA_KEYCODE(code) - #define IS_MOUSEKEY(code) IS_MOUSE_KEYCODE(code) #define IS_MOUSEKEY_MOVE(code) (KC_MS_UP <= (code) && (code) <= KC_MS_RIGHT) #define IS_MOUSEKEY_BUTTON(code) (KC_MS_BTN1 <= (code) && (code) <= KC_MS_BTN8) diff --git a/quantum/keycodes.h b/quantum/keycodes.h index cb1499dede..73b86ce9b9 100644 --- a/quantum/keycodes.h +++ b/quantum/keycodes.h @@ -1323,7 +1323,7 @@ enum qk_keycode_defines { #define IS_INTERNAL_KEYCODE(code) ((code) >= KC_NO && (code) <= KC_TRANSPARENT) #define IS_BASIC_KEYCODE(code) ((code) >= KC_A && (code) <= KC_EXSEL) #define IS_SYSTEM_KEYCODE(code) ((code) >= KC_SYSTEM_POWER && (code) <= KC_SYSTEM_WAKE) -#define IS_MEDIA_KEYCODE(code) ((code) >= KC_AUDIO_MUTE && (code) <= KC_ASSISTANT) +#define IS_CONSUMER_KEYCODE(code) ((code) >= KC_AUDIO_MUTE && (code) <= KC_ASSISTANT) #define IS_MOUSE_KEYCODE(code) ((code) >= KC_MS_UP && (code) <= KC_MS_ACCEL2) #define IS_MODIFIER_KEYCODE(code) ((code) >= KC_LEFT_CTRL && (code) <= KC_RIGHT_GUI) #define IS_SWAP_HANDS_KEYCODE(code) ((code) >= QK_SWAP_HANDS_TOGGLE && (code) <= QK_SWAP_HANDS_ONE_SHOT) |