summaryrefslogtreecommitdiffstats
path: root/keyboards
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2023-02-19 07:59:50 +0000
committerGitHub <noreply@github.com>2023-02-19 18:59:50 +1100
commit0152dd811dad101d5764f66476fa842170b86695 (patch)
tree5999c92f9e56076febab5674cb77a823c0e1de2a /keyboards
parente837a32b2b4d6eb96ffacad0022699d67c0f8f1e (diff)
Move `KC_MISSION_CONTROL`/`KC_LAUNCHPAD` keycodes to core (#19884)
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/keymap.c21
-rw-r--r--keyboards/gmmk/pro/rev1/ansi/keymaps/macos/keymap.c21
-rw-r--r--keyboards/keebio/sinc/keymaps/lickel/keymap.c33
-rw-r--r--keyboards/keychron/common/keychron_common.c14
-rw-r--r--keyboards/keychron/common/keychron_common.h8
-rw-r--r--keyboards/keychron/q1/ansi/keymaps/gtg465x/keymap.c32
-rw-r--r--keyboards/keychron/q1/ansi/keymaps/mkillewald/keymap.c22
-rw-r--r--keyboards/keychron/q1/ansi/keymaps/teimor/keymap.c28
-rw-r--r--keyboards/keychron/q1/iso/keymaps/mkillewald_iso/keymap.c22
-rw-r--r--keyboards/keychron/q2/ansi/keymaps/ladduro/keymap.c28
-rw-r--r--keyboards/keychron/q2/ansi/keymaps/via/keymap.c4
-rw-r--r--keyboards/yandrstudio/wave75/wave75.c14
-rw-r--r--keyboards/yandrstudio/wave75/wave75.h6
-rw-r--r--keyboards/yandrstudio/yr6095/yr6095.c14
-rw-r--r--keyboards/yandrstudio/yr6095/yr6095.h6
-rw-r--r--keyboards/yandrstudio/yr80/yr80.c14
-rw-r--r--keyboards/yandrstudio/yr80/yr80.h6
17 files changed, 8 insertions, 285 deletions
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/keymap.c
index c7c183e33c..f803b44abb 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/keymap.c
@@ -24,15 +24,8 @@ enum layers {
MAC_FN
};
-enum custom_keycodes {
- KC_MISSION_CONTROL = SAFE_RANGE,
- KC_LAUNCHPAD
-};
-
#define KC_TASK LGUI(KC_TAB)
#define KC_FLXP LGUI(KC_E)
-#define KC_MCTL KC_MISSION_CONTROL
-#define KC_LPAD KC_LAUNCHPAD
#define TO_WINB TO(WIN_BASE)
#define TO_MACB TO(MAC_BASE)
#define MO_WINF MO(WIN_FN)
@@ -174,20 +167,6 @@ bool led_update_user(led_t led_state) {
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
- case KC_MISSION_CONTROL:
- if (record->event.pressed) {
- host_consumer_send(0x29F);
- } else {
- host_consumer_send(0);
- }
- return false; // Skip all further processing of this key
- case KC_LAUNCHPAD:
- if (record->event.pressed) {
- host_consumer_send(0x2A0);
- } else {
- host_consumer_send(0);
- }
- return false; // Skip all further processing of this key
#ifdef RGB_MATRIX_ENABLE
#ifdef NKRO_ENABLE
case NK_TOGG:
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/keymap.c
index 50a2ac6ca3..60bd53f407 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/keymap.c
@@ -23,9 +23,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include QMK_KEYBOARD_H
enum my_keycodes {
- KC_MSCTRL = SAFE_RANGE,
- KC_LNPD,
- LED_TLDE,
+ LED_TLDE = SAFE_RANGE,
LED_1,
LED_2,
LED_3,
@@ -209,23 +207,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
- // https://github.com/qmk/qmk_firmware/issues/10111
- case KC_MSCTRL:
- if (record->event.pressed) {
- host_consumer_send(0x29F);
- } else {
- host_consumer_send(0);
- }
- return false; /* Skip all further processing of this key */
-
- case KC_LNPD:
- if (record->event.pressed) {
- host_consumer_send(0x2A0);
- } else {
- host_consumer_send(0);
- }
- return false; /* Skip all further processing of this key */
-
#ifdef NKRO_ENABLE
#if RGB_CONFIRMATION_BLINKING_TIME > 0
case NK_TOGG:
diff --git a/keyboards/keebio/sinc/keymaps/lickel/keymap.c b/keyboards/keebio/sinc/keymaps/lickel/keymap.c
index 11656a755c..22636f7176 100644
--- a/keyboards/keebio/sinc/keymaps/lickel/keymap.c
+++ b/keyboards/keebio/sinc/keymaps/lickel/keymap.c
@@ -16,18 +16,6 @@
#include QMK_KEYBOARD_H
-enum custom_keycodes {
-#ifdef VIA_ENABLE
- KC_MISSION_CONTROL = USER00,
-#else
- KC_MISSION_CONTROL = SAFE_RANGE,
-#endif
- KC_LAUNCHPAD
-};
-
-#define KC_MCTL KC_MISSION_CONTROL
-#define KC_LPAD KC_LAUNCHPAD
-
// clang-format off
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -75,24 +63,3 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
[3] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
};
#endif
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- switch (keycode) {
- case KC_MISSION_CONTROL:
- if (record->event.pressed) {
- host_consumer_send(0x29F);
- } else {
- host_consumer_send(0);
- }
- return false;
- case KC_LAUNCHPAD:
- if (record->event.pressed) {
- host_consumer_send(0x2A0);
- } else {
- host_consumer_send(0);
- }
- return false;
- default:
- return true;
- }
-}
diff --git a/keyboards/keychron/common/keychron_common.c b/keyboards/keychron/common/keychron_common.c
index d3c1294fe9..a04f3b7264 100644
--- a/keyboards/keychron/common/keychron_common.c
+++ b/keyboards/keychron/common/keychron_common.c
@@ -41,20 +41,6 @@ void housekeeping_task_keychron(void) {
bool process_record_keychron(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
- case KC_MISSION_CONTROL:
- if (record->event.pressed) {
- host_consumer_send(0x29F);
- } else {
- host_consumer_send(0);
- }
- return false; // Skip all further processing of this key
- case KC_LAUNCHPAD:
- if (record->event.pressed) {
- host_consumer_send(0x2A0);
- } else {
- host_consumer_send(0);
- }
- return false; // Skip all further processing of this key
case KC_LOPTN:
case KC_ROPTN:
case KC_LCMMD:
diff --git a/keyboards/keychron/common/keychron_common.h b/keyboards/keychron/common/keychron_common.h
index 543baf9c94..9f943b8986 100644
--- a/keyboards/keychron/common/keychron_common.h
+++ b/keyboards/keychron/common/keychron_common.h
@@ -22,12 +22,10 @@
enum custom_keycodes {
#ifdef VIA_ENABLE
- KC_MISSION_CONTROL = USER00,
+ KC_LOPTN = USER00,
#else
- KC_MISSION_CONTROL = SAFE_RANGE,
+ KC_LOPTN = SAFE_RANGE,
#endif
- KC_LAUNCHPAD,
- KC_LOPTN,
KC_ROPTN,
KC_LCMMD,
KC_RCMMD,
@@ -38,8 +36,6 @@ enum custom_keycodes {
KC_CORTANA
};
-#define KC_MCTL KC_MISSION_CONTROL
-#define KC_LPAD KC_LAUNCHPAD
#define KC_TASK KC_TASK_VIEW
#define KC_FLXP KC_FILE_EXPLORER
#define KC_SNAP KC_SCREEN_SHOT
diff --git a/keyboards/keychron/q1/ansi/keymaps/gtg465x/keymap.c b/keyboards/keychron/q1/ansi/keymaps/gtg465x/keymap.c
index 7f806f6b45..8da475c3c6 100644
--- a/keyboards/keychron/q1/ansi/keymaps/gtg465x/keymap.c
+++ b/keyboards/keychron/q1/ansi/keymaps/gtg465x/keymap.c
@@ -22,17 +22,6 @@
// clang-format off
-enum custom_keycodes {
-#ifdef VIA_ENABLE
- KC_MISSION_CONTROL = USER00,
-#else
- KC_MISSION_CONTROL = SAFE_RANGE,
-#endif
- KC_LAUNCHPAD
-};
-
-#define KC_MCTL KC_MISSION_CONTROL
-#define KC_LPAD KC_LAUNCHPAD
#define KC_TASK LGUI(KC_TAB)
#define KC_FLXP LGUI(KC_E)
@@ -79,24 +68,3 @@ void matrix_init_user(void) {
rgb_matrix_init_user();
#endif
}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- switch (keycode) {
- case KC_MISSION_CONTROL:
- if (record->event.pressed) {
- host_consumer_send(0x29F);
- } else {
- host_consumer_send(0);
- }
- return false; // Skip all further processing of this key
- case KC_LAUNCHPAD:
- if (record->event.pressed) {
- host_consumer_send(0x2A0);
- } else {
- host_consumer_send(0);
- }
- return false; // Skip all further processing of this key
- default:
- return true; // Process all other keycodes normally
- }
-}
diff --git a/keyboards/keychron/q1/ansi/keymaps/mkillewald/keymap.c b/keyboards/keychron/q1/ansi/keymaps/mkillewald/keymap.c
index 937b20ee10..0c198180d4 100644
--- a/keyboards/keychron/q1/ansi/keymaps/mkillewald/keymap.c
+++ b/keyboards/keychron/q1/ansi/keymaps/mkillewald/keymap.c
@@ -36,19 +36,15 @@ user_config_t user_config;
enum custom_keycodes {
#ifdef VIA_ENABLE
- KC_MISSION_CONTROL = USER00,
+ KC_LIGHT_TAB_TOGGLE = USER00,
#else
- KC_MISSION_CONTROL = SAFE_RANGE,
+ KC_LIGHT_TAB_TOGGLE = SAFE_RANGE,
#endif
- KC_LAUNCHPAD,
- KC_LIGHT_TAB_TOGGLE,
KC_LIGHT_ALPHAS_TOGGLE,
KC_FN_LAYER_TRANSPARENT_KEYS_TOGGLE,
KC_FN_LAYER_COLOR_TOGGLE
};
-#define KC_MCTL KC_MISSION_CONTROL
-#define KC_LPAD KC_LAUNCHPAD
#define KC_LTTOG KC_LIGHT_TAB_TOGGLE
#define KC_LATOG KC_LIGHT_ALPHAS_TOGGLE
#define KC_TKTOG KC_FN_LAYER_TRANSPARENT_KEYS_TOGGLE
@@ -115,20 +111,6 @@ void eeconfig_init_user(void) {
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
- case KC_MISSION_CONTROL:
- if (record->event.pressed) {
- host_consumer_send(0x29F);
- } else {
- host_consumer_send(0);
- }
- return false; // Skip all further processing of this key
- case KC_LAUNCHPAD:
- if (record->event.pressed) {
- host_consumer_send(0x2A0);
- } else {
- host_consumer_send(0);
- }
- return false; // Skip all further processing of this key
case KC_LIGHT_TAB_TOGGLE:
if (record->event.pressed) {
user_config.caps_lock_light_tab ^= 1; // bitwise xor to toggle status bit
diff --git a/keyboards/keychron/q1/ansi/keymaps/teimor/keymap.c b/keyboards/keychron/q1/ansi/keymaps/teimor/keymap.c
index 3a0cddab7c..7bf1721514 100644
--- a/keyboards/keychron/q1/ansi/keymaps/teimor/keymap.c
+++ b/keyboards/keychron/q1/ansi/keymaps/teimor/keymap.c
@@ -22,13 +22,6 @@
// clang-format off
-enum custom_keycodes {
- KC_MISSION_CONTROL = USER00,
- KC_LAUNCHPAD,
-};
-
-#define KC_MCTL KC_MISSION_CONTROL
-#define KC_LPAD KC_LAUNCHPAD
#define TG_NKRO MAGIC_TOGGLE_NKRO
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -72,24 +65,3 @@ void matrix_init_user(void) {
rgb_matrix_init_user();
#endif
}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- switch (keycode) {
- case KC_MISSION_CONTROL:
- if (record->event.pressed) {
- host_consumer_send(0x29F);
- } else {
- host_consumer_send(0);
- }
- return false; // Skip all further processing of this key
- case KC_LAUNCHPAD:
- if (record->event.pressed) {
- host_consumer_send(0x2A0);
- } else {
- host_consumer_send(0);
- }
- return false; // Skip all further processing of this key
- default:
- return true; // Process all other keycodes normally
- }
-}
diff --git a/keyboards/keychron/q1/iso/keymaps/mkillewald_iso/keymap.c b/keyboards/keychron/q1/iso/keymaps/mkillewald_iso/keymap.c
index c62d065ef7..e6457b0208 100644
--- a/keyboards/keychron/q1/iso/keymaps/mkillewald_iso/keymap.c
+++ b/keyboards/keychron/q1/iso/keymaps/mkillewald_iso/keymap.c
@@ -36,19 +36,15 @@ user_config_t user_config;
enum custom_keycodes {
#ifdef VIA_ENABLE
- KC_MISSION_CONTROL = USER00,
+ KC_LIGHT_TAB_TOGGLE = USER00,
#else
- KC_MISSION_CONTROL = SAFE_RANGE,
+ KC_LIGHT_TAB_TOGGLE = SAFE_RANGE,
#endif
- KC_LAUNCHPAD,
- KC_LIGHT_TAB_TOGGLE,
KC_LIGHT_ALPHAS_TOGGLE,
KC_FN_LAYER_TRANSPARENT_KEYS_TOGGLE,
KC_FN_LAYER_COLOR_TOGGLE
};
-#define KC_MCTL KC_MISSION_CONTROL
-#define KC_LPAD KC_LAUNCHPAD
#define KC_LTTOG KC_LIGHT_TAB_TOGGLE
#define KC_LATOG KC_LIGHT_ALPHAS_TOGGLE
#define KC_TKTOG KC_FN_LAYER_TRANSPARENT_KEYS_TOGGLE
@@ -115,20 +111,6 @@ void eeconfig_init_user(void) {
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
- case KC_MISSION_CONTROL:
- if (record->event.pressed) {
- host_consumer_send(0x29F);
- } else {
- host_consumer_send(0);
- }
- return false; // Skip all further processing of this key
- case KC_LAUNCHPAD:
- if (record->event.pressed) {
- host_consumer_send(0x2A0);
- } else {
- host_consumer_send(0);
- }
- return false; // Skip all further processing of this key
case KC_LIGHT_TAB_TOGGLE:
if (record->event.pressed) {
user_config.caps_lock_light_tab ^= 1; // bitwise xor to toggle status bit
diff --git a/keyboards/keychron/q2/ansi/keymaps/ladduro/keymap.c b/keyboards/keychron/q2/ansi/keymaps/ladduro/keymap.c
index cc83640b39..55ee7a9732 100644
--- a/keyboards/keychron/q2/ansi/keymaps/ladduro/keymap.c
+++ b/keyboards/keychron/q2/ansi/keymaps/ladduro/keymap.c
@@ -20,16 +20,9 @@
# include "rgb_matrix_user.h"
#endif
-enum custom_keycodes {
- KC_MISSION_CONTROL = SAFE_RANGE,
- KC_LAUNCHPAD
-};
-
#define KC_WAVE S(KC_GRV)
#define KC_TASK LGUI(KC_TAB)
#define KC_FLXP LGUI(KC_E)
-#define KC_MCTL KC_MISSION_CONTROL
-#define KC_LPAD KC_LAUNCHPAD
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[MAC_BASE] = LAYOUT_ansi_67(
@@ -73,24 +66,3 @@ void matrix_init_user(void) {
rgb_matrix_init_user();
#endif
}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- switch (keycode) {
- case KC_MISSION_CONTROL:
- if (record->event.pressed) {
- host_consumer_send(0x29F);
- } else {
- host_consumer_send(0);
- }
- return false; // Skip all further processing of this key
- case KC_LAUNCHPAD:
- if (record->event.pressed) {
- host_consumer_send(0x2A0);
- } else {
- host_consumer_send(0);
- }
- return false; // Skip all further processing of this key
- default:
- return true; // Process all other keycodes normally
- }
-}
diff --git a/keyboards/keychron/q2/ansi/keymaps/via/keymap.c b/keyboards/keychron/q2/ansi/keymaps/via/keymap.c
index f1b6b66ff8..a80ca64630 100644
--- a/keyboards/keychron/q2/ansi/keymaps/via/keymap.c
+++ b/keyboards/keychron/q2/ansi/keymaps/via/keymap.c
@@ -25,9 +25,7 @@ enum layers{
};
enum custom_keycodes {
- KC_MISSION_CONTROL = USER00,
- KC_LAUNCHPAD,
- KC_TASK,
+ KC_TASK = USER00,
KC_FLXP
};
diff --git a/keyboards/yandrstudio/wave75/wave75.c b/keyboards/yandrstudio/wave75/wave75.c
index cc58a1d43e..4e0d748c23 100644
--- a/keyboards/yandrstudio/wave75/wave75.c
+++ b/keyboards/yandrstudio/wave75/wave75.c
@@ -28,20 +28,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
process_magic(CG_TOGG, record);
}
return false;
- case KC_MCTL:
- if (record->event.pressed) {
- host_consumer_send(0x29F);
- } else {
- host_consumer_send(0);
- }
- return false;
- case KC_LPAD:
- if (record->event.pressed) {
- host_consumer_send(0x2A0);
- } else {
- host_consumer_send(0);
- }
- return false;
default:
return true;
}
diff --git a/keyboards/yandrstudio/wave75/wave75.h b/keyboards/yandrstudio/wave75/wave75.h
index f0d041241a..209a044466 100644
--- a/keyboards/yandrstudio/wave75/wave75.h
+++ b/keyboards/yandrstudio/wave75/wave75.h
@@ -37,19 +37,13 @@ enum keyboard_keycodes {
#ifdef VIA_ENABLE
LOCK_GUI = USER00,
TOG_MACOS_KEYMAP,
- KC_MISSION_CONTROL,
- KC_LAUNCHPAD,
NEW_SAFE_RANGE = SAFE_RANGE // Important!
#else
LOCK_GUI = SAFE_RANGE,
TOG_MACOS_KEYMAP,
- KC_MISSION_CONTROL,
- KC_LAUNCHPAD,
NEW_SAFE_RANGE // Important!
#endif
};
#define KC_LG LOCK_GUI
#define KC_MACOS TOG_MACOS_KEYMAP
-#define KC_MCTL KC_MISSION_CONTROL
-#define KC_LPAD KC_LAUNCHPAD
diff --git a/keyboards/yandrstudio/yr6095/yr6095.c b/keyboards/yandrstudio/yr6095/yr6095.c
index c0a2c94cc2..3ce43eb297 100644
--- a/keyboards/yandrstudio/yr6095/yr6095.c
+++ b/keyboards/yandrstudio/yr6095/yr6095.c
@@ -57,20 +57,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
process_magic(CG_TOGG, record);
}
return false;
- case KC_MCTL:
- if (record->event.pressed) {
- host_consumer_send(0x29F);
- } else {
- host_consumer_send(0);
- }
- return false;
- case KC_LPAD:
- if (record->event.pressed) {
- host_consumer_send(0x2A0);
- } else {
- host_consumer_send(0);
- }
- return false;
default:
return true;
}
diff --git a/keyboards/yandrstudio/yr6095/yr6095.h b/keyboards/yandrstudio/yr6095/yr6095.h
index 37b4412aaa..f21ee93634 100644
--- a/keyboards/yandrstudio/yr6095/yr6095.h
+++ b/keyboards/yandrstudio/yr6095/yr6095.h
@@ -62,19 +62,13 @@ enum keyboard_keycodes {
#ifdef VIA_ENABLE
LOCK_GUI = USER00,
TOG_MACOS_KEYMAP,
- KC_MISSION_CONTROL,
- KC_LAUNCHPAD,
NEW_SAFE_RANGE = SAFE_RANGE // Important!
#else
LOCK_GUI = SAFE_RANGE,
TOG_MACOS_KEYMAP,
- KC_MISSION_CONTROL,
- KC_LAUNCHPAD,
NEW_SAFE_RANGE // Important!
#endif
};
#define KC_LG LOCK_GUI
#define KC_MACOS TOG_MACOS_KEYMAP
-#define KC_MCTL KC_MISSION_CONTROL
-#define KC_LPAD KC_LAUNCHPAD
diff --git a/keyboards/yandrstudio/yr80/yr80.c b/keyboards/yandrstudio/yr80/yr80.c
index 16415bf9ab..0228545e8c 100644
--- a/keyboards/yandrstudio/yr80/yr80.c
+++ b/keyboards/yandrstudio/yr80/yr80.c
@@ -52,20 +52,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
process_magic(CG_TOGG, record);
}
return false;
- case KC_MCTL:
- if (record->event.pressed) {
- host_consumer_send(0x29F);
- } else {
- host_consumer_send(0);
- }
- return false;
- case KC_LPAD:
- if (record->event.pressed) {
- host_consumer_send(0x2A0);
- } else {
- host_consumer_send(0);
- }
- return false;
default:
return true;
}
diff --git a/keyboards/yandrstudio/yr80/yr80.h b/keyboards/yandrstudio/yr80/yr80.h
index 11cec853c3..c5289696f8 100644
--- a/keyboards/yandrstudio/yr80/yr80.h
+++ b/keyboards/yandrstudio/yr80/yr80.h
@@ -38,19 +38,13 @@ enum keyboard_keycodes {
#ifdef VIA_ENABLE
LOCK_GUI = USER00,
TOG_MACOS_KEYMAP,
- KC_MISSION_CONTROL,
- KC_LAUNCHPAD,
NEW_SAFE_RANGE = SAFE_RANGE // Important!
#else
LOCK_GUI = SAFE_RANGE,
TOG_MACOS_KEYMAP,
- KC_MISSION_CONTROL,
- KC_LAUNCHPAD,
NEW_SAFE_RANGE // Important!
#endif
};
#define KC_LG LOCK_GUI
#define KC_MACOS TOG_MACOS_KEYMAP
-#define KC_MCTL KC_MISSION_CONTROL
-#define KC_LPAD KC_LAUNCHPAD