From 7996be6db6e9cf5f76427ed7bbfbe142e3f5aee5 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Mon, 20 Feb 2023 00:59:46 +0000 Subject: Refactor more KC_MISSION_CONTROL/KC_LAUNCHPAD usages (#19891) --- keyboards/idobao/id61/keymaps/idobao/keymap.c | 26 +--------------------- keyboards/idobao/id63/keymaps/idobao/keymap.c | 26 +--------------------- keyboards/idobao/id67/keymaps/idobao/keymap.c | 26 +--------------------- .../idobao/id67/keymaps/vinorodrigues/keymap.c | 24 -------------------- .../idobao/id80/v3/ansi/keymaps/idobao/keymap.c | 26 +--------------------- keyboards/idobao/id87/v2/keymaps/idobao/keymap.c | 26 +--------------------- 6 files changed, 5 insertions(+), 149 deletions(-) (limited to 'keyboards') diff --git a/keyboards/idobao/id61/keymaps/idobao/keymap.c b/keyboards/idobao/id61/keymaps/idobao/keymap.c index e670ca7b3e..6cc41aac34 100644 --- a/keyboards/idobao/id61/keymaps/idobao/keymap.c +++ b/keyboards/idobao/id61/keymaps/idobao/keymap.c @@ -26,9 +26,7 @@ enum { }; enum { - KC_MCON = USER00, // macOS Open Mission Control - KC_LPAD, // macOS Open Launchpad - KB_ARRW, // toggle right modifiers are arrows feature + KB_ARRW = USER00, // toggle right modifiers are arrows feature KB_RSFT, // right shift or up arrow KB_RALT, // right alt or left arrow KB_RAPP, // menu or down arrow (Windows Menu) @@ -38,11 +36,6 @@ enum { KB_VRSN // debug, type version }; -enum macos_consumer_usages { - _AC_SHOW_ALL_WINDOWS = 0x29F, // mapped to KC_MCON - _AC_SHOW_ALL_APPS = 0x2A0 // mapped to KC_LPAD -}; - /* Special Keys */ #define SK_LT1C LT(_FN1, KC_CAPS) // Layer Tap 1, i.e., Tap = Caps Lock, Hold = Layer 1 #define SK_LT2A LT(_FN2, KC_APP) // Layer Tap 2, i.e., Tap = Menu, Hold = Layer 2 @@ -306,23 +299,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } return false; - // @see: https://github.com/qmk/qmk_firmware/issues/10111#issuecomment-752300353 - case KC_MCON: - if (record->event.pressed) { - host_consumer_send(_AC_SHOW_ALL_WINDOWS); - } else { - host_consumer_send(0); - } - return false; - - case KC_LPAD: - if (record->event.pressed) { - host_consumer_send(_AC_SHOW_ALL_APPS); - } else { - host_consumer_send(0); - } - return false; - // Shift + Backspace = Delete, see: https://docs.qmk.fm/#/feature_advanced_keycodes?id=shift-backspace-for-delete case KC_BSPC: return ID61_backspace_special(keycode, record); diff --git a/keyboards/idobao/id63/keymaps/idobao/keymap.c b/keyboards/idobao/id63/keymaps/idobao/keymap.c index 9fd4e1110b..9a290815b4 100644 --- a/keyboards/idobao/id63/keymaps/idobao/keymap.c +++ b/keyboards/idobao/id63/keymaps/idobao/keymap.c @@ -31,10 +31,8 @@ enum { }; enum { - KC_MCON = USER00, // macOS Open Mission Control - KC_LPAD, // macOS Open Launchpad #ifdef RGB_MATRIX_ENABLE - RGB_TPK, // Toggle Per-Key + RGB_TPK = USER00, // Toggle Per-Key #ifndef ID63_DISABLE_UNDERGLOW RGB_TUG, // Toggle Underglow #endif // ID63_DISABLE_UNDERGLOW @@ -51,11 +49,6 @@ enum { #endif // ID63_DISABLE_UNDERGLOW #endif // RGB_MATRIX_ENABLE -enum macos_consumer_usages { - _AC_SHOW_ALL_WINDOWS = 0x29F, // mapped to KC_MCON - _AC_SHOW_ALL_APPS = 0x2A0 // mapped to KC_LPAD -}; - /* Special Keys */ #define SK_LT1C LT(_FN1, KC_CAPS) // Layer Tap 1, i.e., Tap = Caps Lock, Hold = Layer 1 #define SK_LT2A LT(_FN2, KC_APP) // Layer Tap 2, i.e., Tap = Menu, Hold = Layer 2 @@ -318,23 +311,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } return false; - // @see: https://github.com/qmk/qmk_firmware/issues/10111#issuecomment-752300353 - case KC_MCON: - if (record->event.pressed) { - host_consumer_send(_AC_SHOW_ALL_WINDOWS); - } else { - host_consumer_send(0); - } - return false; - - case KC_LPAD: - if (record->event.pressed) { - host_consumer_send(_AC_SHOW_ALL_APPS); - } else { - host_consumer_send(0); - } - return false; - // Shift + Backspace = Delete, see: https://docs.qmk.fm/#/feature_advanced_keycodes?id=shift-backspace-for-delete case KC_BSPC: if (record->event.pressed) { diff --git a/keyboards/idobao/id67/keymaps/idobao/keymap.c b/keyboards/idobao/id67/keymaps/idobao/keymap.c index aadad80fb2..272c5326a3 100644 --- a/keyboards/idobao/id67/keymaps/idobao/keymap.c +++ b/keyboards/idobao/id67/keymaps/idobao/keymap.c @@ -24,10 +24,8 @@ typedef union { #endif // RGB_MATRIX_ENABLE enum { - KC_MCON = USER00, // macOS Open Mission Control - KC_LPAD, // macOS Open Launchpad #ifdef RGB_MATRIX_ENABLE - RGB_TPK, // Toggle Per-Key + RGB_TPK = USER00, // Toggle Per-Key #ifndef ID67_DISABLE_UNDERGLOW RGB_TUG, // Toggle Underglow #endif // ID67_DISABLE_UNDERGLOW @@ -44,11 +42,6 @@ enum { #endif // ID67_DISABLE_UNDERGLOW #endif // RGB_MATRIX_ENABLE -enum macos_consumer_usages { - _AC_SHOW_ALL_WINDOWS = 0x29F, // mapped to KC_MCON - _AC_SHOW_ALL_APPS = 0x2A0 // mapped to KC_LPAD -}; - /* Special Keys */ #define SK_LT1C LT(1, KC_CAPS) // Layer Tap 1, i.e., Tap = Caps Lock, Hold = Layer 1 #define SK_LT2A LT(2, KC_APP) // Layer Tap 2, i.e., Tap = Menu, Hold = Layer 2 @@ -319,23 +312,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } return false; - // @see: https://github.com/qmk/qmk_firmware/issues/10111#issuecomment-752300353 - case KC_MCON: - if (record->event.pressed) { - host_consumer_send(_AC_SHOW_ALL_WINDOWS); - } else { - host_consumer_send(0); - } - return false; - - case KC_LPAD: - if (record->event.pressed) { - host_consumer_send(_AC_SHOW_ALL_APPS); - } else { - host_consumer_send(0); - } - return false; - default: return true; /* Process all other keycodes normally */ } diff --git a/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c b/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c index 3b95f7c379..f2d48cdc5d 100644 --- a/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c +++ b/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c @@ -16,16 +16,9 @@ enum { }; enum { - KC_MCON = USER00, - KC_LPAD, KB_VRSN = SAFE_RANGE }; -enum macos_consumer_usages { - _AC_SHOW_ALL_WINDOWS = 0x29F, // mapped to KC_MCON - _AC_SHOW_ALL_APPS = 0x2A0 // mapped to KC_LPAD -}; - #define LT1_C_L LT(_FN1, KC_CAPS) #ifndef MIN @@ -273,23 +266,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } return false; - // @see: https://github.com/qmk/qmk_firmware/issues/10111#issuecomment-752300353 - case KC_MCON: - if (record->event.pressed) { - host_consumer_send(_AC_SHOW_ALL_WINDOWS); - } else { - host_consumer_send(0); - } - return false; - - case KC_LPAD: - if (record->event.pressed) { - host_consumer_send(_AC_SHOW_ALL_APPS); - } else { - host_consumer_send(0); - } - return false; - default: return true; /* Process all other keycodes normally */ } diff --git a/keyboards/idobao/id80/v3/ansi/keymaps/idobao/keymap.c b/keyboards/idobao/id80/v3/ansi/keymaps/idobao/keymap.c index faa483d88b..945484fbb0 100644 --- a/keyboards/idobao/id80/v3/ansi/keymaps/idobao/keymap.c +++ b/keyboards/idobao/id80/v3/ansi/keymaps/idobao/keymap.c @@ -29,10 +29,8 @@ enum { }; enum { - KC_MCON = USER00, // macOS Open Mission Control - KC_LPAD, // macOS Open Launchpad #ifdef RGB_MATRIX_ENABLE - RGB_TPK, // Toggle Per-Key + RGB_TPK = USER00, // Toggle Per-Key RGB_TUG, // Toggle Underglow #endif // RGB_MATRIX_ENABLE KB_VRSN = USER09 // debug, type version @@ -43,11 +41,6 @@ enum { #define RGB_TUG _______ #endif // RGB_MATRIX_ENABLE -enum macos_consumer_usages { - _AC_SHOW_ALL_WINDOWS = 0x29F, // mapped to KC_MCON - _AC_SHOW_ALL_APPS = 0x2A0 // mapped to KC_LPAD -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┐ @@ -293,23 +286,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } return false; - // @see: https://github.com/qmk/qmk_firmware/issues/10111#issuecomment-752300353 - case KC_MCON: - if (record->event.pressed) { - host_consumer_send(_AC_SHOW_ALL_WINDOWS); - } else { - host_consumer_send(0); - } - return false; - - case KC_LPAD: - if (record->event.pressed) { - host_consumer_send(_AC_SHOW_ALL_APPS); - } else { - host_consumer_send(0); - } - return false; - default: return true; /* Process all other keycodes normally */ } diff --git a/keyboards/idobao/id87/v2/keymaps/idobao/keymap.c b/keyboards/idobao/id87/v2/keymaps/idobao/keymap.c index 387ee85ca5..bfc626c88e 100644 --- a/keyboards/idobao/id87/v2/keymaps/idobao/keymap.c +++ b/keyboards/idobao/id87/v2/keymaps/idobao/keymap.c @@ -22,10 +22,8 @@ typedef union { #endif // RGB_MATRIX_ENABLE enum { - KC_MCON = USER00, // macOS Open Mission Control - KC_LPAD, // macOS Open Launchpad #ifdef RGB_MATRIX_ENABLE - RGB_TPK, // Toggle Per-Key + RGB_TPK = USER00, // Toggle Per-Key RGB_TUG, // Toggle Underglow #endif // RGB_MATRIX_ENABLE KB_VRSN = USER09 // debug, type version @@ -36,11 +34,6 @@ enum { #define RGB_TUG _______ #endif -enum macos_consumer_usages { - _AC_SHOW_ALL_WINDOWS = 0x29F, // mapped to KC_MCON - _AC_SHOW_ALL_APPS = 0x2A0 // mapped to KC_LPAD -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* * ┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐ @@ -277,23 +270,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } return false; - // @see: https://github.com/qmk/qmk_firmware/issues/10111#issuecomment-752300353 - case KC_MCON: - if (record->event.pressed) { - host_consumer_send(_AC_SHOW_ALL_WINDOWS); - } else { - host_consumer_send(0); - } - return false; - - case KC_LPAD: - if (record->event.pressed) { - host_consumer_send(_AC_SHOW_ALL_APPS); - } else { - host_consumer_send(0); - } - return false; - default: return true; /* Process all other keycodes normally */ } -- cgit v1.2.3