Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor more KC_MISSION_CONTROL/KC_LAUNCHPAD usages #19891

Merged
merged 1 commit into from
Feb 20, 2023
Merged

Refactor more KC_MISSION_CONTROL/KC_LAUNCHPAD usages #19891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 1 addition & 25 deletions keyboards/idobao/id61/keymaps/idobao/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand Down Expand Up @@ -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);

Expand Down
26 changes: 1 addition & 25 deletions keyboards/idobao/id63/keymaps/idobao/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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) {
Expand Down
26 changes: 1 addition & 25 deletions keyboards/idobao/id67/keymaps/idobao/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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 */
}
Expand Down
24 changes: 0 additions & 24 deletions keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 */
}
Expand Down
26 changes: 1 addition & 25 deletions keyboards/idobao/id80/v3/ansi/keymaps/idobao/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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] = {
/*
* ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┐
Expand Down Expand Up @@ -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 */
}
Expand Down
26 changes: 1 addition & 25 deletions keyboards/idobao/id87/v2/keymaps/idobao/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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] = {
/*
* ┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
Expand Down Expand Up @@ -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 */
}
Expand Down