diff --git a/data/constants/keycodes/keycodes_0.0.2_kb.hjson b/data/constants/keycodes/keycodes_0.0.2_kb.hjson
new file mode 100644
index 00000000000..f9ffc7432d3
--- /dev/null
+++ b/data/constants/keycodes/keycodes_0.0.2_kb.hjson
@@ -0,0 +1,132 @@
+{
+ "keycodes": {
+ "0x7E00": {
+ "group": "kb",
+ "key": "QK_KB_0",
+ },
+ "0x7E01": {
+ "group": "kb",
+ "key": "QK_KB_1",
+ },
+ "0x7E02": {
+ "group": "kb",
+ "key": "QK_KB_2",
+ },
+ "0x7E03": {
+ "group": "kb",
+ "key": "QK_KB_3",
+ },
+ "0x7E04": {
+ "group": "kb",
+ "key": "QK_KB_4",
+ },
+ "0x7E05": {
+ "group": "kb",
+ "key": "QK_KB_5",
+ },
+ "0x7E06": {
+ "group": "kb",
+ "key": "QK_KB_6",
+ },
+ "0x7E07": {
+ "group": "kb",
+ "key": "QK_KB_7",
+ },
+ "0x7E08": {
+ "group": "kb",
+ "key": "QK_KB_8",
+ },
+ "0x7E09": {
+ "group": "kb",
+ "key": "QK_KB_9",
+ },
+ "0x7E0A": {
+ "group": "kb",
+ "key": "QK_KB_10",
+ },
+ "0x7E0B": {
+ "group": "kb",
+ "key": "QK_KB_11",
+ },
+ "0x7E0C": {
+ "group": "kb",
+ "key": "QK_KB_12",
+ },
+ "0x7E0D": {
+ "group": "kb",
+ "key": "QK_KB_13",
+ },
+ "0x7E0E": {
+ "group": "kb",
+ "key": "QK_KB_14",
+ },
+ "0x7E0F": {
+ "group": "kb",
+ "key": "QK_KB_15",
+ },
+ "0x7E10": {
+ "group": "kb",
+ "key": "QK_KB_16",
+ },
+ "0x7E11": {
+ "group": "kb",
+ "key": "QK_KB_17",
+ },
+ "0x7E12": {
+ "group": "kb",
+ "key": "QK_KB_18",
+ },
+ "0x7E13": {
+ "group": "kb",
+ "key": "QK_KB_19",
+ },
+ "0x7E14": {
+ "group": "kb",
+ "key": "QK_KB_20",
+ },
+ "0x7E15": {
+ "group": "kb",
+ "key": "QK_KB_21",
+ },
+ "0x7E16": {
+ "group": "kb",
+ "key": "QK_KB_22",
+ },
+ "0x7E17": {
+ "group": "kb",
+ "key": "QK_KB_23",
+ },
+ "0x7E18": {
+ "group": "kb",
+ "key": "QK_KB_24",
+ },
+ "0x7E19": {
+ "group": "kb",
+ "key": "QK_KB_25",
+ },
+ "0x7E1A": {
+ "group": "kb",
+ "key": "QK_KB_26",
+ },
+ "0x7E1B": {
+ "group": "kb",
+ "key": "QK_KB_27",
+ },
+ "0x7E1C": {
+ "group": "kb",
+ "key": "QK_KB_28",
+ },
+ "0x7E1D": {
+ "group": "kb",
+ "key": "QK_KB_29",
+ },
+ "0x7E1E": {
+ "group": "kb",
+ "key": "QK_KB_30",
+ },
+ "0x7E1F": {
+ "group": "kb",
+ "key": "QK_KB_31",
+ },
+ }
+}
diff --git a/data/constants/keycodes/keycodes_0.0.2_user.hjson b/data/constants/keycodes/keycodes_0.0.2_user.hjson
new file mode 100644
index 00000000000..b41731b1be4
--- /dev/null
+++ b/data/constants/keycodes/keycodes_0.0.2_user.hjson
@@ -0,0 +1,132 @@
+{
+ "keycodes": {
+ "0x7F00": {
+ "group": "user",
+ "key": "QK_USER_0",
+ },
+ "0x7F01": {
+ "group": "user",
+ "key": "QK_USER_1",
+ },
+ "0x7F02": {
+ "group": "user",
+ "key": "QK_USER_2",
+ },
+ "0x7F03": {
+ "group": "user",
+ "key": "QK_USER_3",
+ },
+ "0x7F04": {
+ "group": "user",
+ "key": "QK_USER_4",
+ },
+ "0x7F05": {
+ "group": "user",
+ "key": "QK_USER_5",
+ },
+ "0x7F06": {
+ "group": "user",
+ "key": "QK_USER_6",
+ },
+ "0x7F07": {
+ "group": "user",
+ "key": "QK_USER_7",
+ },
+ "0x7F08": {
+ "group": "user",
+ "key": "QK_USER_8",
+ },
+ "0x7F09": {
+ "group": "user",
+ "key": "QK_USER_9",
+ },
+ "0x7F0A": {
+ "group": "user",
+ "key": "QK_USER_10",
+ },
+ "0x7F0B": {
+ "group": "user",
+ "key": "QK_USER_11",
+ },
+ "0x7F0C": {
+ "group": "user",
+ "key": "QK_USER_12",
+ },
+ "0x7F0D": {
+ "group": "user",
+ "key": "QK_USER_13",
+ },
+ "0x7F0E": {
+ "group": "user",
+ "key": "QK_USER_14",
+ },
+ "0x7F0F": {
+ "group": "user",
+ "key": "QK_USER_15",
+ },
+ "0x7F10": {
+ "group": "user",
+ "key": "QK_USER_16",
+ },
+ "0x7F11": {
+ "group": "user",
+ "key": "QK_USER_17",
+ },
+ "0x7F12": {
+ "group": "user",
+ "key": "QK_USER_18",
+ },
+ "0x7F13": {
+ "group": "user",
+ "key": "QK_USER_19",
+ },
+ "0x7F14": {
+ "group": "user",
+ "key": "QK_USER_20",
+ },
+ "0x7F15": {
+ "group": "user",
+ "key": "QK_USER_21",
+ },
+ "0x7F16": {
+ "group": "user",
+ "key": "QK_USER_22",
+ },
+ "0x7F17": {
+ "group": "user",
+ "key": "QK_USER_23",
+ },
+ "0x7F18": {
+ "group": "user",
+ "key": "QK_USER_24",
+ },
+ "0x7F19": {
+ "group": "user",
+ "key": "QK_USER_25",
+ },
+ "0x7F1A": {
+ "group": "user",
+ "key": "QK_USER_26",
+ },
+ "0x7F1B": {
+ "group": "user",
+ "key": "QK_USER_27",
+ },
+ "0x7F1C": {
+ "group": "user",
+ "key": "QK_USER_28",
+ },
+ "0x7F1D": {
+ "group": "user",
+ "key": "QK_USER_29",
+ },
+ "0x7F1E": {
+ "group": "user",
+ "key": "QK_USER_30",
+ },
+ "0x7F1F": {
+ "group": "user",
+ "key": "QK_USER_31",
+ },
+ }
+}
diff --git a/keyboards/acheron/shark/alpha/keymaps/via/keymap.c b/keyboards/acheron/shark/alpha/keymaps/via/keymap.c
index 046e5468486..2d3123cccf8 100644
--- a/keyboards/acheron/shark/alpha/keymaps/via/keymap.c
+++ b/keyboards/acheron/shark/alpha/keymaps/via/keymap.c
@@ -22,8 +22,8 @@ enum layers {
_ADJUST,
};
-#define LOWER FN_MO13
-#define RAISE FN_MO23
+#define LOWER TL_LOWR
+#define RAISE TL_UPPR
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Qwerty
diff --git a/keyboards/bandominedoni/keymaps/via/keymap.c b/keyboards/bandominedoni/keymaps/via/keymap.c
index b600cb0be47..a546373b8c9 100644
--- a/keyboards/bandominedoni/keymaps/via/keymap.c
+++ b/keyboards/bandominedoni/keymaps/via/keymap.c
@@ -30,7 +30,7 @@ enum layer_names {
};
enum custom_keycodes {
- VERSION = USER00
+ VERSION = QK_KB_0
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/bastardkb/charybdis/charybdis.h b/keyboards/bastardkb/charybdis/charybdis.h
index f624c554f48..2e311a4aaf3 100644
--- a/keyboards/bastardkb/charybdis/charybdis.h
+++ b/keyboards/bastardkb/charybdis/charybdis.h
@@ -35,11 +35,7 @@
#ifdef POINTING_DEVICE_ENABLE
# ifndef NO_CHARYBDIS_KEYCODES
enum charybdis_keycodes {
-# ifdef VIA_ENABLE
- POINTER_DEFAULT_DPI_FORWARD = USER00,
-# else
- POINTER_DEFAULT_DPI_FORWARD = SAFE_RANGE,
-# endif // VIA_ENABLE
+ POINTER_DEFAULT_DPI_FORWARD = QK_KB_0,
POINTER_DEFAULT_DPI_REVERSE,
POINTER_SNIPING_DPI_FORWARD,
POINTER_SNIPING_DPI_REVERSE,
diff --git a/keyboards/bastardkb/dilemma/dilemma.h b/keyboards/bastardkb/dilemma/dilemma.h
index 68d86b03ce9..469986839d5 100644
--- a/keyboards/bastardkb/dilemma/dilemma.h
+++ b/keyboards/bastardkb/dilemma/dilemma.h
@@ -32,11 +32,7 @@
#ifdef POINTING_DEVICE_ENABLE
# ifndef NO_DILEMMA_KEYCODES
enum dilemma_keycodes {
-# ifdef VIA_ENABLE
- POINTER_DEFAULT_DPI_FORWARD = USER00,
-# else
- POINTER_DEFAULT_DPI_FORWARD = SAFE_RANGE,
-# endif // VIA_ENABLE
+ POINTER_DEFAULT_DPI_FORWARD = QK_KB_0,
POINTER_DEFAULT_DPI_REVERSE,
POINTER_SNIPING_DPI_FORWARD,
POINTER_SNIPING_DPI_REVERSE,
diff --git a/keyboards/cannonkeys/satisfaction75/satisfaction75.h b/keyboards/cannonkeys/satisfaction75/satisfaction75.h
index ec852eef6c9..9e28bb32a13 100644
--- a/keyboards/cannonkeys/satisfaction75/satisfaction75.h
+++ b/keyboards/cannonkeys/satisfaction75/satisfaction75.h
@@ -25,7 +25,7 @@ typedef union {
// Start these at the USER code range in VIA
enum my_keycodes {
- ENC_PRESS = USER00,
+ ENC_PRESS = QK_KB_0,
CLOCK_SET,
OLED_TOGG
};
diff --git a/keyboards/chromatonemini/keymaps/via/keymap.c b/keyboards/chromatonemini/keymaps/via/keymap.c
index 185e4a37a7d..2ac1412eff5 100644
--- a/keyboards/chromatonemini/keymaps/via/keymap.c
+++ b/keyboards/chromatonemini/keymaps/via/keymap.c
@@ -41,7 +41,7 @@ static bool led_indicator_enable = true;
// Defines the keycodes used by our macros in process_record_user
enum custom_keycodes {
- SHIFT_L = USER00,
+ SHIFT_L = QK_KB_0,
SHIFT_R,
TGLINDI, // ToGgLe INDIcator
TGLINTR, // ToGgLe INdicator location {(_KEY01, _KEY13, _KEY25, _KEY37) or (_KEY02, _KEY14, _KEY26) / (_KEY12, _KEY24, _KEY36)}in TRans mode
diff --git a/keyboards/crkbd/keymaps/mb_via/keymap.c b/keyboards/crkbd/keymaps/mb_via/keymap.c
index 30a67de5c9f..027e1449ccf 100644
--- a/keyboards/crkbd/keymaps/mb_via/keymap.c
+++ b/keyboards/crkbd/keymaps/mb_via/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ESC,
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
- KC_LGUI, FN_MO13, KC_SPC, KC_ENT, FN_MO23, KC_RALT
+ KC_LGUI, TL_LOWR, KC_SPC, KC_ENT, TL_UPPR, KC_RALT
//`--------------------------' `--------------------------'
),
diff --git a/keyboards/crkbd/keymaps/via/keymap.c b/keyboards/crkbd/keymaps/via/keymap.c
index 33ca8026f8b..3e93d5bbcfd 100644
--- a/keyboards/crkbd/keymaps/via/keymap.c
+++ b/keyboards/crkbd/keymaps/via/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ESC,
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
- KC_LGUI, FN_MO13, KC_SPC, KC_ENT, FN_MO23, KC_RALT
+ KC_LGUI, TL_LOWR, KC_SPC, KC_ENT, TL_UPPR, KC_RALT
//`--------------------------' `--------------------------'
),
diff --git a/keyboards/delikeeb/flatbread60/keymaps/via/keymap.c b/keyboards/delikeeb/flatbread60/keymaps/via/keymap.c
index b551b4e24fa..0fa0a000e95 100644
--- a/keyboards/delikeeb/flatbread60/keymaps/via/keymap.c
+++ b/keyboards/delikeeb/flatbread60/keymaps/via/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL,
KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT,
- KC_NO, KC_LCTL, KC_LALT, KC_LGUI, FN_MO13, KC_SPC, KC_SPC, FN_MO23, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
+ KC_NO, KC_LCTL, KC_LALT, KC_LGUI, TL_LOWR, KC_SPC, KC_SPC, TL_UPPR, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
),
/* Lower
diff --git a/keyboards/delikeeb/vaneela/keymaps/via/keymap.c b/keyboards/delikeeb/vaneela/keymaps/via/keymap.c
index 808cc9d1efe..065f79efbae 100644
--- a/keyboards/delikeeb/vaneela/keymaps/via/keymap.c
+++ b/keyboards/delikeeb/vaneela/keymaps/via/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_QUOT,
- KC_LCTL, KC_LCTL, KC_LALT, KC_LGUI, FN_MO13, KC_SPC, KC_SPC, FN_MO23, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
+ KC_LCTL, KC_LCTL, KC_LALT, KC_LGUI, TL_LOWR, KC_SPC, KC_SPC, TL_UPPR, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
),
/* Lower
diff --git a/keyboards/delikeeb/vaneelaex/keymaps/via/keymap.c b/keyboards/delikeeb/vaneelaex/keymaps/via/keymap.c
index 1e41c777a82..a126bc65b72 100644
--- a/keyboards/delikeeb/vaneelaex/keymaps/via/keymap.c
+++ b/keyboards/delikeeb/vaneelaex/keymaps/via/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_KP_EQUAL, KC_7, KC_8, KC_9, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
KC_KP_MINUS, KC_4, KC_5, KC_6, KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
KC_KP_PLUS, KC_1, KC_2, KC_3, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_QUOT,
-KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_DOT, KC_0, KC_LCTL, KC_LCTL, KC_LALT, KC_LGUI, FN_MO13, KC_SPC, KC_SPC, FN_MO23, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
+KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_DOT, KC_0, KC_LCTL, KC_LCTL, KC_LALT, KC_LGUI, TL_LOWR, KC_SPC, KC_SPC, TL_UPPR, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
),
/* Lower
diff --git a/keyboards/dm9records/lain/keymaps/via/keymap.c b/keyboards/dm9records/lain/keymaps/via/keymap.c
index f6d49cc5538..d900ffb3a26 100644
--- a/keyboards/dm9records/lain/keymaps/via/keymap.c
+++ b/keyboards/dm9records/lain/keymaps/via/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_RBRC, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_INS, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
- KC_LCTL, KC_LALT, KC_LGUI, FN_MO13, KC_SPC, KC_ENT, FN_MO23, KC_RALT, KC_MENU, KC_RCTL, KC_RSFT
+ KC_LCTL, KC_LALT, KC_LGUI, TL_LOWR, KC_SPC, KC_ENT, TL_UPPR, KC_RALT, KC_MENU, KC_RCTL, KC_RSFT
),
[NUM] = LAYOUT(
KC_DEL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL,
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[CONF] = LAYOUT(
QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
- USER00, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+ QK_USER_0, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
),
@@ -50,8 +50,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
- case USER00:
- // via user keycode USER00 : toggle leds enable
+ case QK_USER_0:
+ // via user keycode QK_USER : toggle leds enable
if (record->event.pressed) {
lain_enable_leds_toggle();
}
diff --git a/keyboards/dm9records/lain/keymaps/via/readme.md b/keyboards/dm9records/lain/keymaps/via/readme.md
index efde27cb474..d2192ae4d13 100644
--- a/keyboards/dm9records/lain/keymaps/via/readme.md
+++ b/keyboards/dm9records/lain/keymaps/via/readme.md
@@ -5,4 +5,4 @@
2-3: Layor indicator
## Via user keycode
-USER00 : toggle leds enable
+USER(0) : toggle leds enable
diff --git a/keyboards/dm9records/plaid/keymaps/via/keymap.c b/keyboards/dm9records/plaid/keymaps/via/keymap.c
index d326bac8ed0..f54c5b9008b 100644
--- a/keyboards/dm9records/plaid/keymaps/via/keymap.c
+++ b/keyboards/dm9records/plaid/keymaps/via/keymap.c
@@ -16,8 +16,8 @@
#include QMK_KEYBOARD_H
-#define LOWER FN_MO13
-#define RAISE FN_MO23
+#define LOWER TL_LOWR
+#define RAISE TL_UPPR
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/durgod/dgk6x/dgk6x.h b/keyboards/durgod/dgk6x/dgk6x.h
index 676240fb313..5a303b461ef 100644
--- a/keyboards/durgod/dgk6x/dgk6x.h
+++ b/keyboards/durgod/dgk6x/dgk6x.h
@@ -1,4 +1,4 @@
-/* Copyright 2021 Jessica Sullivan and Don Kjer
+/* Copyright 2021 Jessica Sullivan and Don Kjer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/keyboards/dztech/dz65rgb/keymaps/yuannan/keymap.c b/keyboards/dztech/dz65rgb/keymaps/yuannan/keymap.c
index db88a2132f1..87ea995a9a9 100644
--- a/keyboards/dztech/dz65rgb/keymaps/yuannan/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/yuannan/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,KC_RBRC, KC_BSLS, KC_PGUP,
KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOTE, KC_ENTER, KC_PGDN,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_RSFT, KC_UP, KC_END,
- KC_CAPS,KC_LGUI,FN_MO13, KC_SPACE, FN_MO23, KC_LALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
+ KC_CAPS,KC_LGUI,TL_LOWR, KC_SPACE, TL_UPPR, KC_LALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
),
[_VIM_EDITING_LAYER] = LAYOUT_65_ansi(
KC_GRAVE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DELETE, KC_INSERT,
diff --git a/keyboards/flygone60/rev3/keymaps/via/keymap.c b/keyboards/flygone60/rev3/keymaps/via/keymap.c
index 0f00248839d..54b0e4f673f 100644
--- a/keyboards/flygone60/rev3/keymaps/via/keymap.c
+++ b/keyboards/flygone60/rev3/keymaps/via/keymap.c
@@ -25,7 +25,7 @@ enum layer_names {
// Defines the keycodes used by our macros in process_record_user
enum custom_keycodes {
- SHILL = USER00,
+ SHILL = QK_KB_0,
NUT,
FRACNO
};
diff --git a/keyboards/foostan/cornelius/keymaps/via/keymap.c b/keyboards/foostan/cornelius/keymaps/via/keymap.c
index f1b7f7fcdf0..ac6bac292e0 100644
--- a/keyboards/foostan/cornelius/keymaps/via/keymap.c
+++ b/keyboards/foostan/cornelius/keymaps/via/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
- XXXXXXX, KC_LCTL, KC_LGUI, KC_LALT, FN_MO13, KC_SPC, KC_ENT, FN_MO23, KC_RALT, KC_RGUI, KC_RCTL, XXXXXXX
+ XXXXXXX, KC_LCTL, KC_LGUI, KC_LALT, TL_LOWR, KC_SPC, KC_ENT, TL_UPPR, KC_RALT, KC_RGUI, KC_RCTL, XXXXXXX
),
[1] = LAYOUT(
diff --git a/keyboards/fortitude60/keymaps/via/keymap.c b/keyboards/fortitude60/keymaps/via/keymap.c
index feda619041f..77cc709dc8b 100644
--- a/keyboards/fortitude60/keymaps/via/keymap.c
+++ b/keyboards/fortitude60/keymaps/via/keymap.c
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LBRC, KC_RBRC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT ,
- KC_LGUI, KC_LALT, FN_MO13, KC_SPC, KC_LCTL, KC_ENT, KC_SPC,FN_MO23, KC_RALT, KC_RGUI
+ KC_LGUI, KC_LALT, TL_LOWR, KC_SPC, KC_LCTL, KC_ENT, KC_SPC,TL_UPPR, KC_RALT, KC_RGUI
),
/* Lower
diff --git a/keyboards/geekboards/macropad_v2/keymaps/via/keymap.c b/keyboards/geekboards/macropad_v2/keymaps/via/keymap.c
index b0e5b9327d1..4e6655c23c6 100644
--- a/keyboards/geekboards/macropad_v2/keymaps/via/keymap.c
+++ b/keyboards/geekboards/macropad_v2/keymaps/via/keymap.c
@@ -20,12 +20,12 @@ bool is_alt_tab_active = false;
uint16_t alt_tab_timer = 0;
enum custom_keycodes {
- ALT_TAB = USER00,
+ ALT_TAB = QK_KB_0,
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_ortho_2x4(
- LT(1, KC_MUTE), KC_VOLD, KC_VOLU, MACRO00,
+ LT(1, KC_MUTE), KC_VOLD, KC_VOLU, MC_0,
ALT_TAB, KC_MPRV, KC_MNXT, KC_MPLY
),
[1] = LAYOUT_ortho_2x4(
diff --git a/keyboards/giabalanai/keymaps/via/keymap.c b/keyboards/giabalanai/keymaps/via/keymap.c
index 06fa10d67ca..812f4967c8d 100644
--- a/keyboards/giabalanai/keymaps/via/keymap.c
+++ b/keyboards/giabalanai/keymaps/via/keymap.c
@@ -141,7 +141,7 @@ enum custom_keycodes {
MY_CHORD_MAX = MI_CH_BDim7,
- VERSION = USER00
+ VERSION = QK_KB_0
};
#define MY_CHORD_COUNT (MY_CHORD_MAX - MY_CHORD_MIN + 1)
diff --git a/keyboards/giabalanai/keymaps/via_giabarinaix2/keymap.c b/keyboards/giabalanai/keymaps/via_giabarinaix2/keymap.c
index 512084f1dd5..88b032209f8 100644
--- a/keyboards/giabalanai/keymaps/via_giabarinaix2/keymap.c
+++ b/keyboards/giabalanai/keymaps/via_giabarinaix2/keymap.c
@@ -141,7 +141,7 @@ enum custom_keycodes {
MY_CHORD_MAX = MI_CH_BDim7,
- VERSION = USER00
+ VERSION = QK_KB_0
};
#define MY_CHORD_COUNT (MY_CHORD_MAX - MY_CHORD_MIN + 1)
diff --git a/keyboards/halfcliff/keymaps/via/keymap.c b/keyboards/halfcliff/keymaps/via/keymap.c
index 3c0090ffecb..ee7e29d4c7f 100644
--- a/keyboards/halfcliff/keymaps/via/keymap.c
+++ b/keyboards/halfcliff/keymaps/via/keymap.c
@@ -16,8 +16,8 @@
#include QMK_KEYBOARD_H
#include "keymap_japanese.h"
-#define RAISE FN_MO13
-#define LOWER FN_MO23
+#define RAISE TL_LOWR
+#define LOWER TL_UPPR
// Defines names for use in layer keycodes and the keymap
enum layer_names {
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, _______, KC_Y, KC_U, KC_I, KC_O, KC_P, JP_AT , JP_LBRC, KC_BSPC,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, _______, KC_H, KC_J, KC_K, KC_L, KC_SCLN, JP_COLN, JP_RBRC, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, _______, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, JP_BSLS, KC_UP, KC_RSFT,
- KC_LCTL, KC_LGUI, KC_LALT, JP_MHEN, KC_SPC, KC_SPC, FN_MO23, FN_MO13, KC_SPC, JP_HENK, JP_KANA, KC_APP, KC_LEFT, KC_DOWN, KC_RGHT
+ KC_LCTL, KC_LGUI, KC_LALT, JP_MHEN, KC_SPC, KC_SPC, TL_UPPR, TL_LOWR, KC_SPC, JP_HENK, JP_KANA, KC_APP, KC_LEFT, KC_DOWN, KC_RGHT
),
/* RAISE
* ,--------------------------------------------------------------------------------------------------------------------------------------.
diff --git a/keyboards/handwired/tractyl_manuform/tractyl_manuform.h b/keyboards/handwired/tractyl_manuform/tractyl_manuform.h
index b62b6f7553e..8ec9bceaf43 100644
--- a/keyboards/handwired/tractyl_manuform/tractyl_manuform.h
+++ b/keyboards/handwired/tractyl_manuform/tractyl_manuform.h
@@ -25,11 +25,7 @@
#endif
enum charybdis_keycodes {
-# ifdef VIA_ENABLE
- POINTER_DEFAULT_DPI_FORWARD = USER00,
-# else
- POINTER_DEFAULT_DPI_FORWARD = SAFE_RANGE,
-# endif // VIA_ENABLE
+ POINTER_DEFAULT_DPI_FORWARD = QK_KB_0,
POINTER_DEFAULT_DPI_REVERSE,
POINTER_SNIPING_DPI_FORWARD,
POINTER_SNIPING_DPI_REVERSE,
diff --git a/keyboards/hardwareabstraction/handwire/handwire.c b/keyboards/hardwareabstraction/handwire/handwire.c
index 61a233d1209..c61e4c76268 100644
--- a/keyboards/hardwareabstraction/handwire/handwire.c
+++ b/keyboards/hardwareabstraction/handwire/handwire.c
@@ -11,11 +11,7 @@ static bool buzzer_active = false;
static bool initial_keypress = false;
enum custom_keycodes{
- #ifdef VIA_ENABLE
- KC_HPTON = USER00,
- #else
- KC_HPTON = SAFE_RANGE,
- #endif
+ KC_HPTON = QK_KB_0,
KC_HPTOFF,
KC_HPTTOG,
KC_HPTRST,
diff --git a/keyboards/hardwareabstraction/handwire/keymaps/via/keymap.c b/keyboards/hardwareabstraction/handwire/keymaps/via/keymap.c
index b5fcd913a9f..0ae30fb8b65 100644
--- a/keyboards/hardwareabstraction/handwire/keymaps/via/keymap.c
+++ b/keyboards/hardwareabstraction/handwire/keymaps/via/keymap.c
@@ -4,7 +4,7 @@
#include QMK_KEYBOARD_H
enum custom_keycodes{
- KC_HPTON = USER00,
+ KC_HPTON = QK_KB_0,
KC_HPTOFF,
KC_HPTTOG,
KC_HPTRST,
diff --git a/keyboards/helix/rev3_4rows/keymaps/via/keymap.c b/keyboards/helix/rev3_4rows/keymaps/via/keymap.c
index 18d0ed9993e..45729991e93 100644
--- a/keyboards/helix/rev3_4rows/keymaps/via/keymap.c
+++ b/keyboards/helix/rev3_4rows/keymaps/via/keymap.c
@@ -32,8 +32,8 @@ enum custom_keycodes {
RGBRST
};
-#define LOWER FN_MO13
-#define RAISE FN_MO23
+#define LOWER TL_LOWR
+#define RAISE TL_UPPR
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/helix/rev3_5rows/keymaps/via/keymap.c b/keyboards/helix/rev3_5rows/keymaps/via/keymap.c
index 2f37426ee58..cc66b90a0df 100644
--- a/keyboards/helix/rev3_5rows/keymaps/via/keymap.c
+++ b/keyboards/helix/rev3_5rows/keymaps/via/keymap.c
@@ -32,8 +32,8 @@ enum custom_keycodes {
RGBRST
};
-#define LOWER FN_MO13
-#define RAISE FN_MO23
+#define LOWER TL_LOWR
+#define RAISE TL_UPPR
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Qwerty
diff --git a/keyboards/idobao/id42/keymaps/default/keymap.c b/keyboards/idobao/id42/keymaps/default/keymap.c
index efef7d71838..ffcef7a7ed9 100644
--- a/keyboards/idobao/id42/keymaps/default/keymap.c
+++ b/keyboards/idobao/id42/keymaps/default/keymap.c
@@ -3,11 +3,6 @@
#include QMK_KEYBOARD_H
-enum custom_keycodes {
- FN_MO13 = SAFE_RANGE,
- FN_MO23,
-};
-
// more Layer Tap stuff
#define SPC_FN1 LT(1, KC_SPC)
#define SPC_FN2 LT(2, KC_SPC)
@@ -29,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
QK_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_RSFT, KC_UP, KC_DEL,
- KC_LCTL, KC_LGUI, KC_LALT, SPC_FN2, FN_MO13, KC_LEFT, KC_DOWN, KC_RIGHT
+ KC_LCTL, KC_LGUI, KC_LALT, SPC_FN2, TL_LOWR, KC_LEFT, KC_DOWN, KC_RIGHT
),
/* Layer 2
@@ -86,29 +81,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI
),
};
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
- switch (keycode) {
- case FN_MO13:
- if (record->event.pressed) {
- layer_on(1);
- update_tri_layer(1, 2, 3);
- } else {
- layer_off(1);
- update_tri_layer(1, 2, 3);
- }
- return false;
- break;
- case FN_MO23:
- if (record->event.pressed) {
- layer_on(2);
- update_tri_layer(1, 2, 3);
- } else {
- layer_off(2);
- update_tri_layer(1, 2, 3);
- }
- return false;
- break;
- }
- return true;
-}
diff --git a/keyboards/idobao/id42/keymaps/default/rules.mk b/keyboards/idobao/id42/keymaps/default/rules.mk
new file mode 100644
index 00000000000..7c9bf212a6f
--- /dev/null
+++ b/keyboards/idobao/id42/keymaps/default/rules.mk
@@ -0,0 +1 @@
+TRI_LAYER_ENABLE = yes
diff --git a/keyboards/idobao/id42/keymaps/idobao/keymap.c b/keyboards/idobao/id42/keymaps/idobao/keymap.c
index e4dd411df22..bc7a5b97e1a 100644
--- a/keyboards/idobao/id42/keymaps/idobao/keymap.c
+++ b/keyboards/idobao/id42/keymaps/idobao/keymap.c
@@ -9,7 +9,7 @@
#include "version.h"
enum {
- KB_VRSN = USER09 // debug, type version
+ KB_VRSN = QK_KB_9 // debug, type version
};
#define SPC_FN1 LT(1, KC_SPC)
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
QK_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_RSFT, KC_UP, KC_DEL,
- KC_LCTL, KC_LGUI, KC_LALT, SPC_FN2, FN_MO13, KC_LEFT, KC_DOWN, KC_RIGHT
+ KC_LCTL, KC_LGUI, KC_LALT, SPC_FN2, TL_LOWR, KC_LEFT, KC_DOWN, KC_RIGHT
),
/* Layer 1
diff --git a/keyboards/idobao/id42/keymaps/via/keymap.c b/keyboards/idobao/id42/keymaps/via/keymap.c
index 6f0e8534b5e..953227bc20f 100644
--- a/keyboards/idobao/id42/keymaps/via/keymap.c
+++ b/keyboards/idobao/id42/keymaps/via/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
QK_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_RSFT, KC_UP, KC_DEL,
- KC_LCTL, KC_LGUI, KC_LALT, SPC_FN2, FN_MO13, KC_LEFT, KC_DOWN, KC_RIGHT
+ KC_LCTL, KC_LGUI, KC_LALT, SPC_FN2, TL_LOWR, KC_LEFT, KC_DOWN, KC_RIGHT
),
/*
diff --git a/keyboards/idobao/id61/keymaps/idobao/keymap.c b/keyboards/idobao/id61/keymaps/idobao/keymap.c
index 6cc41aac34b..bd0b500615e 100644
--- a/keyboards/idobao/id61/keymaps/idobao/keymap.c
+++ b/keyboards/idobao/id61/keymaps/idobao/keymap.c
@@ -26,7 +26,7 @@ enum {
};
enum {
- KB_ARRW = USER00, // toggle right modifiers are arrows feature
+ KB_ARRW = QK_KB_0, // 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)
diff --git a/keyboards/idobao/id61/keymaps/idobao/specialk.c b/keyboards/idobao/id61/keymaps/idobao/specialk.c
index 358d0cb7642..03a31e68049 100644
--- a/keyboards/idobao/id61/keymaps/idobao/specialk.c
+++ b/keyboards/idobao/id61/keymaps/idobao/specialk.c
@@ -22,7 +22,7 @@ bool ID61_process_special_k(uint16_t keycode, keyrecord_t *record, bool arrow_mo
bool is_raised = get_highest_layer(layer_state|default_layer_state) != 0;
if (record->event.pressed) {
- set_keycode_raised(keycode - USER00, is_raised); // save for key release event
+ set_keycode_raised(keycode - QK_KB_0, is_raised); // save for key release event
if (is_raised) {
// *** Fn keyed ***
if (arrow_mode) {
@@ -43,7 +43,7 @@ bool ID61_process_special_k(uint16_t keycode, keyrecord_t *record, bool arrow_mo
}
}
} else {
- if (get_keycode_raised(keycode - USER00)) {
+ if (get_keycode_raised(keycode - QK_KB_0)) {
// *** Fn keyed ***
if (arrow_mode) {
// alternate key
diff --git a/keyboards/idobao/id63/keymaps/idobao/keymap.c b/keyboards/idobao/id63/keymaps/idobao/keymap.c
index 9a290815b49..9213e4ffcf1 100644
--- a/keyboards/idobao/id63/keymaps/idobao/keymap.c
+++ b/keyboards/idobao/id63/keymaps/idobao/keymap.c
@@ -32,12 +32,12 @@ enum {
enum {
#ifdef RGB_MATRIX_ENABLE
- RGB_TPK = USER00, // Toggle Per-Key
+ RGB_TPK = QK_KB_0, // Toggle Per-Key
#ifndef ID63_DISABLE_UNDERGLOW
RGB_TUG, // Toggle Underglow
#endif // ID63_DISABLE_UNDERGLOW
#endif // RGB_MATRIX_ENABLE
- KB_VRSN = USER09 // debug, type version
+ KB_VRSN = QK_KB_9 // debug, type version
};
#ifndef RGB_MATRIX_ENABLE
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
SK_LT1C, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, KC_UP, KC_SLSH,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, FN_MO13, SK_LT2A, KC_LEFT, KC_DOWN, KC_RGHT
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, TL_LOWR, SK_LT2A, KC_LEFT, KC_DOWN, KC_RGHT
),
/*
diff --git a/keyboards/idobao/id67/keymaps/idobao/keymap.c b/keyboards/idobao/id67/keymaps/idobao/keymap.c
index 272c5326a3c..7ebb8be5dc3 100644
--- a/keyboards/idobao/id67/keymaps/idobao/keymap.c
+++ b/keyboards/idobao/id67/keymaps/idobao/keymap.c
@@ -25,12 +25,12 @@ typedef union {
enum {
#ifdef RGB_MATRIX_ENABLE
- RGB_TPK = USER00, // Toggle Per-Key
+ RGB_TPK = QK_KB_0, // Toggle Per-Key
#ifndef ID67_DISABLE_UNDERGLOW
RGB_TUG, // Toggle Underglow
#endif // ID67_DISABLE_UNDERGLOW
#endif //RGB_MATRIX_ENABLE
- KB_VRSN = USER09 // debug, type version
+ KB_VRSN = QK_KB_9 // debug, type version
};
#ifndef RGB_MATRIX_ENABLE
diff --git a/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c b/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
index f2d48cdc5d7..d34c70fa633 100644
--- a/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
+++ b/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
@@ -100,11 +100,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
*/
[_FN3] = LAYOUT_65_ansi_blocker(
- QK_BOOT, MACRO01, MACRO02, MACRO03, MACRO04, MACRO05, MACRO06, MACRO07, MACRO08, MACRO09, MACRO10, MACRO11, MACRO12, KC_PWR, KC_F15,
+ QK_BOOT, MC_1, MC_2, MC_3, MC_4, MC_5, MC_6, MC_7, MC_8, MC_9, MC_10, MC_11, MC_12, KC_PWR, KC_F15,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_SLEP, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DB_TOGG, XXXXXXX,
- XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KB_VRSN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MACRO00, XXXXXXX,
- XXXXXXX, XXXXXXX, XXXXXXX, KC_WAKE, XXXXXXX, XXXXXXX, MACRO13, MACRO14, MACRO15)
+ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KB_VRSN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MC_0, XXXXXXX,
+ XXXXXXX, XXXXXXX, XXXXXXX, KC_WAKE, XXXXXXX, XXXXXXX, MC_13, MC_14, MC_15)
};
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/idobao/id80/v3/ansi/keymaps/idobao/keymap.c b/keyboards/idobao/id80/v3/ansi/keymaps/idobao/keymap.c
index 945484fbb01..710bb8c0892 100644
--- a/keyboards/idobao/id80/v3/ansi/keymaps/idobao/keymap.c
+++ b/keyboards/idobao/id80/v3/ansi/keymaps/idobao/keymap.c
@@ -30,10 +30,10 @@ enum {
enum {
#ifdef RGB_MATRIX_ENABLE
- RGB_TPK = USER00, // Toggle Per-Key
+ RGB_TPK = QK_KB_0, // Toggle Per-Key
RGB_TUG, // Toggle Underglow
#endif // RGB_MATRIX_ENABLE
- KB_VRSN = USER09 // debug, type version
+ KB_VRSN = QK_KB_9 // debug, type version
};
#ifndef RGB_MATRIX_ENABLE
diff --git a/keyboards/idobao/id87/v2/keymaps/idobao/keymap.c b/keyboards/idobao/id87/v2/keymaps/idobao/keymap.c
index bfc626c88e0..53871f9161c 100644
--- a/keyboards/idobao/id87/v2/keymaps/idobao/keymap.c
+++ b/keyboards/idobao/id87/v2/keymaps/idobao/keymap.c
@@ -23,10 +23,10 @@ typedef union {
enum {
#ifdef RGB_MATRIX_ENABLE
- RGB_TPK = USER00, // Toggle Per-Key
+ RGB_TPK = QK_KB_0, // Toggle Per-Key
RGB_TUG, // Toggle Underglow
#endif // RGB_MATRIX_ENABLE
- KB_VRSN = USER09 // debug, type version
+ KB_VRSN = QK_KB_9 // debug, type version
};
#ifndef RGB_MATRIX_ENABLE
@@ -103,8 +103,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[2] = LAYOUT_tkl_ansi(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- MACRO00, MACRO01, MACRO02, MACRO03, MACRO04, MACRO05, MACRO06, MACRO07, MACRO08, MACRO09, MACRO10, _______, _______, _______, _______, _______, _______,
- _______, MACRO11, MACRO12, MACRO13, MACRO14, MACRO15, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ MC_0, MC_1, MC_2, MC_3, MC_4, MC_5, MC_6, MC_7, MC_8, MC_9, MC_10, _______, _______, _______, _______, _______, _______,
+ _______, MC_11, MC_12, MC_13, MC_14, MC_15, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/idobao/id87/v2/keymaps/via/keymap.c b/keyboards/idobao/id87/v2/keymaps/via/keymap.c
index 2d4ea973f89..cfdf65ae6f3 100644
--- a/keyboards/idobao/id87/v2/keymaps/via/keymap.c
+++ b/keyboards/idobao/id87/v2/keymaps/via/keymap.c
@@ -72,8 +72,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[2] = LAYOUT_tkl_ansi(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- MACRO00, MACRO01, MACRO02, MACRO03, MACRO04, MACRO05, MACRO06, MACRO07, MACRO08, MACRO09, MACRO10, _______, _______, _______, _______, _______, _______,
- _______, MACRO11, MACRO12, MACRO13, MACRO14, MACRO15, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ MC_0, MC_1, MC_2, MC_3, MC_4, MC_5, MC_6, MC_7, MC_8, MC_9, MC_10, _______, _______, _______, _______, _______, _______,
+ _______, MC_11, MC_12, MC_13, MC_14, MC_15, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/kbdfans/niu_mini/keymaps/via/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/via/keymap.c
index 663b710814d..18e98b55afd 100644
--- a/keyboards/kbdfans/niu_mini/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/niu_mini/keymaps/via/keymap.c
@@ -1,7 +1,7 @@
#include QMK_KEYBOARD_H
-#define LOWER FN_MO13
-#define RAISE FN_MO23
+#define LOWER TL_LOWR
+#define RAISE TL_UPPR
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/keebio/bamfk1/keymaps/via/keymap.c b/keyboards/keebio/bamfk1/keymaps/via/keymap.c
index e7cde2d7ee5..80ada5d8aa3 100644
--- a/keyboards/keebio/bamfk1/keymaps/via/keymap.c
+++ b/keyboards/keebio/bamfk1/keymaps/via/keymap.c
@@ -14,7 +14,7 @@ enum layer_names {
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_MAIN] = LAYOUT(
RGB_MOD, // Big Switch
- FN_MO13, KC_MUTE, // Encoder presses
+ TL_LOWR, KC_MUTE, // Encoder presses
KC_DOWN, KC_UP, // Left encoder turns
KC_VOLD, KC_VOLU // Right encoder turns
),
diff --git a/keyboards/keebio/iris/keymaps/via/keymap.c b/keyboards/keebio/iris/keymaps/via/keymap.c
index cfd274cd9a2..65d3ac434e8 100644
--- a/keyboards/keebio/iris/keymaps/via/keymap.c
+++ b/keyboards/keebio/iris/keymaps/via/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_HOME, KC_END, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
//└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
- KC_LGUI, FN_MO13, KC_ENT, KC_SPC, FN_MO23, KC_RALT
+ KC_LGUI, TL_LOWR, KC_ENT, KC_SPC, TL_UPPR, KC_RALT
// └────────┴────────┴────────┘ └────────┴────────┴────────┘
),
diff --git a/keyboards/keebio/levinson/keymaps/via/keymap.c b/keyboards/keebio/levinson/keymaps/via/keymap.c
index da90c73a4a4..d640e1bf234 100644
--- a/keyboards/keebio/levinson/keymaps/via/keymap.c
+++ b/keyboards/keebio/levinson/keymaps/via/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT ,
- KC_GRV, KC_LCTL, KC_LALT, KC_LGUI, FN_MO13, KC_SPC, KC_SPC, FN_MO23, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
+ KC_GRV, KC_LCTL, KC_LALT, KC_LGUI, TL_LOWR, KC_SPC, KC_SPC, TL_UPPR, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
),
[1] = LAYOUT_ortho_4x12(
diff --git a/keyboards/keebio/nyquist/keymaps/via/keymap.c b/keyboards/keebio/nyquist/keymaps/via/keymap.c
index f5bf204c2a1..5d986e69a0a 100644
--- a/keyboards/keebio/nyquist/keymaps/via/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/via/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL,
KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT ,
- MO(3), KC_LCTL, KC_LALT, KC_LGUI, FN_MO13, KC_SPC, KC_SPC, FN_MO23, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
+ MO(3), KC_LCTL, KC_LALT, KC_LGUI, TL_LOWR, KC_SPC, KC_SPC, TL_UPPR, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
),
[1] = LAYOUT_ortho_5x12(
KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
diff --git a/keyboards/keychron/common/keychron_common.h b/keyboards/keychron/common/keychron_common.h
index b492cda88fe..5e56a828c82 100644
--- a/keyboards/keychron/common/keychron_common.h
+++ b/keyboards/keychron/common/keychron_common.h
@@ -23,11 +23,7 @@
#include "quantum_keycodes.h"
enum custom_keycodes {
-#ifdef VIA_ENABLE
- KC_LOPTN = USER00,
-#else
- KC_LOPTN = SAFE_RANGE,
-#endif
+ KC_LOPTN = QK_KB_2, // TECH DEBT: Starts at QK_KB_2 to maintain ordering with VIA definitions. See #19884. Revert to QK_KB_0 when VIA catches up with QMK.
KC_ROPTN,
KC_LCMMD,
KC_RCMMD,
diff --git a/keyboards/keychron/q1/ansi/keymaps/mkillewald/keymap.c b/keyboards/keychron/q1/ansi/keymaps/mkillewald/keymap.c
index 0c198180d47..4fc8ad58e54 100644
--- a/keyboards/keychron/q1/ansi/keymaps/mkillewald/keymap.c
+++ b/keyboards/keychron/q1/ansi/keymaps/mkillewald/keymap.c
@@ -35,11 +35,7 @@ typedef union {
user_config_t user_config;
enum custom_keycodes {
-#ifdef VIA_ENABLE
- KC_LIGHT_TAB_TOGGLE = USER00,
-#else
- KC_LIGHT_TAB_TOGGLE = SAFE_RANGE,
-#endif
+ KC_LIGHT_TAB_TOGGLE = QK_KB_2, // TECH DEBT: Starts at QK_KB_2 to maintain ordering with VIA definitions. See #19884. Revert to QK_KB_0 when VIA catches up with QMK.
KC_LIGHT_ALPHAS_TOGGLE,
KC_FN_LAYER_TRANSPARENT_KEYS_TOGGLE,
KC_FN_LAYER_COLOR_TOGGLE
@@ -115,7 +111,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if (record->event.pressed) {
user_config.caps_lock_light_tab ^= 1; // bitwise xor to toggle status bit
eeconfig_update_user(user_config.raw);
- }
+ }
return false; // Skip all further processing of this key
case KC_LIGHT_ALPHAS_TOGGLE:
if (record->event.pressed) {
@@ -154,4 +150,4 @@ bool get_fn_layer_transparent_keys_off(void) {
bool get_fn_layer_color_enable(void) {
return user_config.fn_layer_color_enable;
-}
\ No newline at end of file
+}
diff --git a/keyboards/keychron/q1/ansi/keymaps/mkillewald/readme.md b/keyboards/keychron/q1/ansi/keymaps/mkillewald/readme.md
index f8d5de012f6..8ff2dbcc2cb 100644
--- a/keyboards/keychron/q1/ansi/keymaps/mkillewald/readme.md
+++ b/keyboards/keychron/q1/ansi/keymaps/mkillewald/readme.md
@@ -18,16 +18,16 @@ This keymap builds on the keymap by Grayson Carr (gtg465x) but adds a couple opt
- Fn+V will toggle lighting the defined Fn layer keys with the static color set with FN_LAYER_COLOR (default: static color off)
- All custom keycodes can be moved to different keys in VIA by using the ANY key with the following keycodes:
- - USER00 (default: F3) macOS Mission Control
- - USER01 (default: F4) macOS Launchpad
- - USER02 (default: Fn+Z) Caps Lock light Tab toggle
- - USER03 (default: Fn+X) Caps Lock light alphas toggle
- - USER04 (default: Fn+C) Fn layer non-defined keys RGB toggle
- - USER05 (default: Fn+V) Fn layer defined keys static color toggle
+ - USER(0) (default: F3) macOS Mission Control
+ - USER(1) (default: F4) macOS Launchpad
+ - USER(2) (default: Fn+Z) Caps Lock light Tab toggle
+ - USER(3) (default: Fn+X) Caps Lock light alphas toggle
+ - USER(4) (default: Fn+C) Fn layer non-defined keys RGB toggle
+ - USER(5) (default: Fn+V) Fn layer defined keys static color toggle
RGB must be toggled on for all indicators to function. If you do not want an RGB mode active but still want the indicators, toggle RGB on and turn the brightness all the way off. The indicators will remain at full brightness.
-Please make sure to save any customizations you have made in VIA to a .json file before flashing the firmware. Sometimes it has been necessary to re-apply those changes in VIA after flashing the firmware. If that is the case, you will most likely need to manually add the USER00 through USER05 custom keycodes after loading your customizations from the saved .json file. Then re-save a new .json file which will have your previous customizations and the custom keycodes for future use as needed.
+Please make sure to save any customizations you have made in VIA to a .json file before flashing the firmware. Sometimes it has been necessary to re-apply those changes in VIA after flashing the firmware. If that is the case, you will most likely need to manually add the USER(0) through USER(5) custom keycodes after loading your customizations from the saved .json file. Then re-save a new .json file which will have your previous customizations and the custom keycodes for future use as needed.
#### USE AT YOUR OWN RISK
diff --git a/keyboards/keychron/q1/ansi/keymaps/teimor/keymap.c b/keyboards/keychron/q1/ansi/keymaps/teimor/keymap.c
index 7bf1721514e..77af30c5b6a 100644
--- a/keyboards/keychron/q1/ansi/keymaps/teimor/keymap.c
+++ b/keyboards/keychron/q1/ansi/keymaps/teimor/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LGMAC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_MACFN, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
-
+
[MAC_FN] = LAYOUT_ansi_82(
_______, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_MACPS, KC_INS,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/keychron/q1/iso/keymaps/mkillewald_iso/keymap.c b/keyboards/keychron/q1/iso/keymaps/mkillewald_iso/keymap.c
index e6457b0208f..f86a84e468d 100644
--- a/keyboards/keychron/q1/iso/keymaps/mkillewald_iso/keymap.c
+++ b/keyboards/keychron/q1/iso/keymaps/mkillewald_iso/keymap.c
@@ -35,11 +35,7 @@ typedef union {
user_config_t user_config;
enum custom_keycodes {
-#ifdef VIA_ENABLE
- KC_LIGHT_TAB_TOGGLE = USER00,
-#else
- KC_LIGHT_TAB_TOGGLE = SAFE_RANGE,
-#endif
+ KC_LIGHT_TAB_TOGGLE = QK_KB_2, // TECH DEBT: Starts at QK_KB_2 to maintain ordering with VIA definitions. See #19884. Revert to QK_KB_0 when VIA catches up with QMK.
KC_LIGHT_ALPHAS_TOGGLE,
KC_FN_LAYER_TRANSPARENT_KEYS_TOGGLE,
KC_FN_LAYER_COLOR_TOGGLE
@@ -54,7 +50,7 @@ enum custom_keycodes {
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[MAC_BASE] = LAYOUT_iso_83(
+[MAC_BASE] = LAYOUT_iso_83(
KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, KC_INS,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN,
@@ -62,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
-[MAC_FN] = LAYOUT_iso_83(
+[MAC_FN] = LAYOUT_iso_83(
KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
@@ -70,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_TRNS, KC_LTTOG, KC_LATOG, KC_TKTOG, KC_FCTOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-[WIN_BASE] = LAYOUT_iso_83(
+[WIN_BASE] = LAYOUT_iso_83(
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_INS,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN,
@@ -78,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
-[WIN_FN] = LAYOUT_iso_83(
+[WIN_FN] = LAYOUT_iso_83(
KC_TRNS, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
@@ -115,7 +111,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if (record->event.pressed) {
user_config.caps_lock_light_tab ^= 1; // bitwise xor to toggle status bit
eeconfig_update_user(user_config.raw);
- }
+ }
return false; // Skip all further processing of this key
case KC_LIGHT_ALPHAS_TOGGLE:
if (record->event.pressed) {
@@ -154,4 +150,4 @@ bool get_fn_layer_transparent_keys_off(void) {
bool get_fn_layer_color_enable(void) {
return user_config.fn_layer_color_enable;
-}
\ No newline at end of file
+}
diff --git a/keyboards/keychron/q1/iso/keymaps/mkillewald_iso/readme.md b/keyboards/keychron/q1/iso/keymaps/mkillewald_iso/readme.md
index a6da9b34605..25d835b1c02 100644
--- a/keyboards/keychron/q1/iso/keymaps/mkillewald_iso/readme.md
+++ b/keyboards/keychron/q1/iso/keymaps/mkillewald_iso/readme.md
@@ -18,16 +18,16 @@ This keymap builds on the keymap by Grayson Carr (gtg465x) but adds a couple opt
- Fn+V will toggle lighting the defined Fn layer keys with the static color set with FN_LAYER_COLOR (default: static color off)
- All custom keycodes can be moved to different keys in VIA by using the ANY key with the following keycodes:
- - USER00 (default: F3) macOS Mission Control
- - USER01 (default: F4) macOS Launchpad
- - USER02 (default: Fn+Z) Caps Lock light Tab toggle
- - USER03 (default: Fn+X) Caps Lock light alphas toggle
- - USER04 (default: Fn+C) Fn layer non-defined keys RGB toggle
- - USER05 (default: Fn+V) Fn layer defined keys static color toggle
+ - USER(0) (default: F3) macOS Mission Control
+ - USER(1) (default: F4) macOS Launchpad
+ - USER(2) (default: Fn+Z) Caps Lock light Tab toggle
+ - USER(3) (default: Fn+X) Caps Lock light alphas toggle
+ - USER(4) (default: Fn+C) Fn layer non-defined keys RGB toggle
+ - USER(5) (default: Fn+V) Fn layer defined keys static color toggle
RGB must be toggled on for all indicators to function. If you do not want an RGB mode active but still want the indicators, toggle RGB on and turn the brightness all the way off. The indicators will remain at full brightness.
-Please make sure to save any customizations you have made in VIA to a .json file before flashing the firmware. Sometimes it has been necessary to re-apply those changes in VIA after flashing the firmware. If that is the case, you will most likely need to manually add the USER00 through USER05 custom keycodes after loading your customizations from the saved .json file. Then re-save a new .json file which will have your previous customizations and the custom keycodes for future use as needed.
+Please make sure to save any customizations you have made in VIA to a .json file before flashing the firmware. Sometimes it has been necessary to re-apply those changes in VIA after flashing the firmware. If that is the case, you will most likely need to manually add the USER(0) through USER(5) custom keycodes after loading your customizations from the saved .json file. Then re-save a new .json file which will have your previous customizations and the custom keycodes for future use as needed.
#### USE AT YOUR OWN RISK
diff --git a/keyboards/keychron/q10/ansi_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q10/ansi_encoder/keymaps/keychron/keymap.c
index 0693820029e..538f13d7866 100644
--- a/keyboards/keychron/q10/ansi_encoder/keymaps/keychron/keymap.c
+++ b/keyboards/keychron/q10/ansi_encoder/keymaps/keychron/keymap.c
@@ -29,11 +29,11 @@ enum layers{
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[MAC_BASE] = LAYOUT_ansi_89(
KC_MUTE, KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_INS, KC_DEL,
- MACRO01, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP,
- MACRO02, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN,
- MACRO03, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME,
- MACRO04, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
- MACRO05, KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, MO(MAC_FN), KC_SPC, KC_RCMMD, KC_LEFT, KC_DOWN, KC_RGHT),
+ MC_1, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP,
+ MC_2, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN,
+ MC_3, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME,
+ MC_4, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
+ MC_5, KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, MO(MAC_FN), KC_SPC, KC_RCMMD, KC_LEFT, KC_DOWN, KC_RGHT),
[MAC_FN] = LAYOUT_ansi_89(
RGB_TOG, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______,
@@ -45,11 +45,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[WIN_BASE] = LAYOUT_ansi_89(
KC_MUTE, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
- MACRO01, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP,
- MACRO02, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN,
- MACRO03, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME,
- MACRO04, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
- MACRO05, KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, MO(WIN_FN), KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT),
+ MC_1, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP,
+ MC_2, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN,
+ MC_3, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME,
+ MC_4, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
+ MC_5, KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, MO(WIN_FN), KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT),
[WIN_FN] = LAYOUT_ansi_89(
RGB_TOG, _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
diff --git a/keyboards/keychron/q10/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/q10/ansi_encoder/keymaps/via/keymap.c
index da55586f86c..eead42e5a9e 100644
--- a/keyboards/keychron/q10/ansi_encoder/keymaps/via/keymap.c
+++ b/keyboards/keychron/q10/ansi_encoder/keymaps/via/keymap.c
@@ -31,11 +31,11 @@ enum layers{
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[MAC_BASE] = LAYOUT_ansi_89(
KC_MUTE, KC_ESC, KC_BRID, KC_BRIU, KC_NO, KC_NO, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_INS, KC_DEL,
- MACRO01, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP,
- MACRO02, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN,
- MACRO03, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME,
- MACRO04, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
- MACRO05, KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, MO(MAC_FN), KC_SPC, KC_RCMD, KC_LEFT, KC_DOWN, KC_RGHT),
+ MC_1, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP,
+ MC_2, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN,
+ MC_3, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME,
+ MC_4, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
+ MC_5, KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, MO(MAC_FN), KC_SPC, KC_RCMD, KC_LEFT, KC_DOWN, KC_RGHT),
[MAC_FN] = LAYOUT_ansi_89(
RGB_TOG, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______,
@@ -47,11 +47,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[WIN_BASE] = LAYOUT_ansi_89(
KC_MUTE, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
- MACRO01, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP,
- MACRO02, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN,
- MACRO03, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME,
- MACRO04, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
- MACRO05, KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, MO(WIN_FN), KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT),
+ MC_1, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP,
+ MC_2, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN,
+ MC_3, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME,
+ MC_4, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
+ MC_5, KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, MO(WIN_FN), KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT),
[WIN_FN] = LAYOUT_ansi_89(
RGB_TOG, _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
diff --git a/keyboards/keychron/q10/iso_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q10/iso_encoder/keymaps/keychron/keymap.c
index 9d19e8b09ff..a62d8803708 100644
--- a/keyboards/keychron/q10/iso_encoder/keymaps/keychron/keymap.c
+++ b/keyboards/keychron/q10/iso_encoder/keymaps/keychron/keymap.c
@@ -29,11 +29,11 @@ enum layers{
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[MAC_BASE] = LAYOUT_iso_90(
KC_MUTE, KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_INS, KC_DEL,
- MACRO01, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP,
- MACRO02, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN,
- MACRO03, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME,
- MACRO04, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
- MACRO05, KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, MO(MAC_FN), KC_SPC, KC_RCMMD, KC_LEFT, KC_DOWN, KC_RGHT),
+ MC_1, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP,
+ MC_2, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN,
+ MC_3, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME,
+ MC_4, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
+ MC_5, KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, MO(MAC_FN), KC_SPC, KC_RCMMD, KC_LEFT, KC_DOWN, KC_RGHT),
[MAC_FN] = LAYOUT_iso_90(
RGB_TOG, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______,
@@ -45,11 +45,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[WIN_BASE] = LAYOUT_iso_90(
KC_MUTE, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
- MACRO01, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP,
- MACRO02, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN,
- MACRO03, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME,
- MACRO04, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
- MACRO05, KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, MO(WIN_FN), KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT),
+ MC_1, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP,
+ MC_2, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN,
+ MC_3, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME,
+ MC_4, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
+ MC_5, KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, MO(WIN_FN), KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT),
[WIN_FN] = LAYOUT_iso_90(
RGB_TOG, _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
diff --git a/keyboards/keychron/q10/iso_encoder/keymaps/via/keymap.c b/keyboards/keychron/q10/iso_encoder/keymaps/via/keymap.c
index 7d61df46b94..24c39fee4e9 100644
--- a/keyboards/keychron/q10/iso_encoder/keymaps/via/keymap.c
+++ b/keyboards/keychron/q10/iso_encoder/keymaps/via/keymap.c
@@ -31,11 +31,11 @@ enum layers{
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[MAC_BASE] = LAYOUT_iso_90(
KC_MUTE, KC_ESC, KC_BRID, KC_BRIU, KC_NO, KC_NO, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_INS, KC_DEL,
- MACRO01, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP,
- MACRO02, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN,
- MACRO03, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME,
- MACRO04, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
- MACRO05, KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, MO(MAC_FN), KC_SPC, KC_RCMD, KC_LEFT, KC_DOWN, KC_RGHT),
+ MC_1, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP,
+ MC_2, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN,
+ MC_3, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME,
+ MC_4, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
+ MC_5, KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, MO(MAC_FN), KC_SPC, KC_RCMD, KC_LEFT, KC_DOWN, KC_RGHT),
[MAC_FN] = LAYOUT_iso_90(
RGB_TOG, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______,
@@ -47,11 +47,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[WIN_BASE] = LAYOUT_iso_90(
KC_MUTE, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
- MACRO01, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP,
- MACRO02, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN,
- MACRO03, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME,
- MACRO04, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
- MACRO05, KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, MO(WIN_FN), KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT),
+ MC_1, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP,
+ MC_2, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN,
+ MC_3, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME,
+ MC_4, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
+ MC_5, KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, MO(WIN_FN), KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT),
[WIN_FN] = LAYOUT_iso_90(
RGB_TOG, _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
diff --git a/keyboards/keychron/q2/ansi/keymaps/via/keymap.c b/keyboards/keychron/q2/ansi/keymaps/via/keymap.c
index a80ca64630e..ea386157bcb 100644
--- a/keyboards/keychron/q2/ansi/keymaps/via/keymap.c
+++ b/keyboards/keychron/q2/ansi/keymaps/via/keymap.c
@@ -24,11 +24,6 @@ enum layers{
_FN3
};
-enum custom_keycodes {
- KC_TASK = USER00,
- KC_FLXP
-};
-
#define KC_TASK LGUI(KC_TAB)
#define KC_FLXP LGUI(KC_E)
diff --git a/keyboards/keychron/q65/ansi_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q65/ansi_encoder/keymaps/keychron/keymap.c
index 95fd7a12e08..898da7dbac2 100644
--- a/keyboards/keychron/q65/ansi_encoder/keymaps/keychron/keymap.c
+++ b/keyboards/keychron/q65/ansi_encoder/keymaps/keychron/keymap.c
@@ -30,17 +30,17 @@ enum layers{
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[MAC_BASE] = LAYOUT_ansi_73(
KC_MUTE, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
- MACRO02, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_HOME,
- MACRO03, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP,
- MACRO04, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
- MACRO05, KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD, MO(_FN1), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
+ MC_2, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_HOME,
+ MC_3, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP,
+ MC_4, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
+ MC_5, KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD, MO(_FN1), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
[WIN_BASE] = LAYOUT_ansi_73(
KC_MUTE, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
- MACRO02, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_HOME,
- MACRO03, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP,
- MACRO04, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
- MACRO05, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FN2), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
+ MC_2, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_HOME,
+ MC_3, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP,
+ MC_4, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
+ MC_5, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FN2), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
[_FN1] = LAYOUT_ansi_73(
RGB_TOG, KC_GRV, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/keymaps/via/keymap.c b/keyboards/kprepublic/bm60hsrgb_ec/rev2/keymaps/via/keymap.c
index 74191c2ff94..288f920d5e2 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/keymaps/via/keymap.c
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/keymaps/via/keymap.c
@@ -15,7 +15,7 @@
#include QMK_KEYBOARD_H
enum my_keycodes {
- RMT = USER00,
+ RMT = QK_KB_0,
RMS,
RMIH,
RMDH,
diff --git a/keyboards/kprepublic/jj40/keymaps/via/keymap.c b/keyboards/kprepublic/jj40/keymaps/via/keymap.c
index 131566cfbec..84e27088497 100644
--- a/keyboards/kprepublic/jj40/keymaps/via/keymap.c
+++ b/keyboards/kprepublic/jj40/keymaps/via/keymap.c
@@ -15,8 +15,8 @@
*/
#include QMK_KEYBOARD_H
-#define LOWER FN_MO13
-#define RAISE FN_MO23
+#define LOWER TL_LOWR
+#define RAISE TL_UPPR
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Qwerty
diff --git a/keyboards/kprepublic/jj50/keymaps/via/keymap.c b/keyboards/kprepublic/jj50/keymaps/via/keymap.c
index a47756b212f..3e8d1c56860 100644
--- a/keyboards/kprepublic/jj50/keymaps/via/keymap.c
+++ b/keyboards/kprepublic/jj50/keymaps/via/keymap.c
@@ -26,8 +26,8 @@ enum layers {
};
#define FN MO(_FN)
-#define LOWER FN_MO13
-#define RAISE FN_MO23
+#define LOWER TL_LOWR
+#define RAISE TL_UPPR
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/massdrop/alt/keymaps/via/keymap.c b/keyboards/massdrop/alt/keymaps/via/keymap.c
index 3781f2227b3..2722fbbb373 100644
--- a/keyboards/massdrop/alt/keymaps/via/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
#include QMK_KEYBOARD_H
enum alt_keycodes {
- U_T_AUTO = USER00, //USB Extra Port Toggle Auto Detect / Always Active
+ U_T_AUTO = QK_KB_0, //USB Extra Port Toggle Auto Detect / Always Active
U_T_AGCR, //USB Toggle Automatic GCR control
DBG_TOG, //DEBUG Toggle On / Off
DBG_MTRX, //DEBUG Toggle Matrix Prints
diff --git a/keyboards/massdrop/alt/keymaps/via/readme.md b/keyboards/massdrop/alt/keymaps/via/readme.md
index 1315fb085db..61194ff7abb 100644
--- a/keyboards/massdrop/alt/keymaps/via/readme.md
+++ b/keyboards/massdrop/alt/keymaps/via/readme.md
@@ -1,19 +1,22 @@
# VIA keymap for the Drop Alt Keyboard
-## *LED Modes:*
+
+## _LED Modes:_
+
Enables all RGB Matrix animation modes available in QMK, all of which are selectable through VIA or using the LED mode keys
```c
#define USB_LED_INDICATOR_ENABLE
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#define RGB_MATRIX_KEYPRESSES
```
-## *User Keycodes:*
+## _User Keycodes:_
+
All keyboard specific keycodes are defined in the user_keycodes space, allowing for them to be placed on your keyboard through VIA
```c
enum alt_keycodes {
- U_T_AUTO = USER00, //USB Extra Port Toggle Auto Detect / Always Active
+ U_T_AUTO = QK_KB_0, //USB Extra Port Toggle Auto Detect / Always Active
U_T_AGCR, //USB Toggle Automatic GCR control
DBG_TOG, //DEBUG Toggle On / Off
DBG_MTRX, //DEBUG Toggle Matrix Prints
@@ -21,4 +24,4 @@ enum alt_keycodes {
DBG_MOU, //DEBUG Toggle Mouse Prints
MD_BOOT, //Restart into bootloader after hold timeout
};
-```
\ No newline at end of file
+```
diff --git a/keyboards/massdrop/ctrl/keymaps/via/keymap.c b/keyboards/massdrop/ctrl/keymaps/via/keymap.c
index 6cca86cface..471dd69aa08 100644
--- a/keyboards/massdrop/ctrl/keymaps/via/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
#include QMK_KEYBOARD_H
enum ctrl_keycodes {
- U_T_AUTO = USER00, //USB Extra Port Toggle Auto Detect / Always Active
+ U_T_AUTO = QK_KB_0, //USB Extra Port Toggle Auto Detect / Always Active
U_T_AGCR, //USB Toggle Automatic GCR control
DBG_TOG, //DEBUG Toggle On / Off
DBG_MTRX, //DEBUG Toggle Matrix Prints
diff --git a/keyboards/mechlovin/adelais/keymaps/via/keymap.c b/keyboards/mechlovin/adelais/keymaps/via/keymap.c
index c83d398f640..c67904c516e 100644
--- a/keyboards/mechlovin/adelais/keymaps/via/keymap.c
+++ b/keyboards/mechlovin/adelais/keymaps/via/keymap.c
@@ -16,16 +16,16 @@
#include QMK_KEYBOARD_H
enum my_keycodes {
- BL_TOG = USER00,
- BL_EFFECT = USER01,
- BL_ISPD = USER02,
- BL_DSPD = USER03,
- BL_IHUE = USER04,
- BL_DHUE = USER05,
- BL_ISAT = USER06,
- BL_DSAT = USER07,
- BL_IVAL = USER08,
- BL_DVAL = USER09
+ BL_TOG = QK_KB_0,
+ BL_EFFECT,
+ BL_ISPD,
+ BL_DSPD,
+ BL_IHUE,
+ BL_DHUE,
+ BL_ISAT,
+ BL_DSAT,
+ BL_IVAL,
+ BL_DVAL
};
diff --git a/keyboards/mechlovin/kay65/keymaps/via/keymap.c b/keyboards/mechlovin/kay65/keymaps/via/keymap.c
index 5011472a790..1f29ba8c3a8 100644
--- a/keyboards/mechlovin/kay65/keymaps/via/keymap.c
+++ b/keyboards/mechlovin/kay65/keymaps/via/keymap.c
@@ -18,8 +18,8 @@ along with this program. If not, see .
#include QMK_KEYBOARD_H
enum my_keycodes {
- LOGO_LED_ON = USER00,
- LOGO_LED_OFF = USER01
+ LOGO_LED_ON = QK_KB_0,
+ LOGO_LED_OFF
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/keymaps/via/keymap.c b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/keymaps/via/keymap.c
index b57369b8e1c..344be9548cd 100644
--- a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/keymaps/via/keymap.c
+++ b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/keymaps/via/keymap.c
@@ -18,7 +18,7 @@ along with this program. If not, see .
#include QMK_KEYBOARD_H
enum my_keycodes {
- LOGO_LED_ON = USER00,
+ LOGO_LED_ON = QK_KB_0,
LOGO_LED_OFF
};
diff --git a/keyboards/mechwild/puckbuddy/puckbuddy.h b/keyboards/mechwild/puckbuddy/puckbuddy.h
index 13540a50756..42c7ac16f07 100644
--- a/keyboards/mechwild/puckbuddy/puckbuddy.h
+++ b/keyboards/mechwild/puckbuddy/puckbuddy.h
@@ -40,11 +40,7 @@ extern keyboard_config_t keyboard_config;
extern uint16_t dpi_array[];
enum keyboard_keycodes {
-#ifdef VIA_ENABLE
- DPI_UP = USER00,
-#else
- DPI_UP = SAFE_RANGE,
-#endif
+ DPI_UP = QK_KB_0,
DPI_DN,
DPI_FINE,
TAP_UP,
diff --git a/keyboards/moonlander/keymaps/via/keymap.c b/keyboards/moonlander/keymaps/via/keymap.c
index 70264c240b4..91ad0d1bf7a 100644
--- a/keyboards/moonlander/keymaps/via/keymap.c
+++ b/keyboards/moonlander/keymaps/via/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[SYMB] = LAYOUT_moonlander(
- USER00, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
+ QK_KB_0, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
_______, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, _______, _______, KC_UP, KC_7, KC_8, KC_9, KC_ASTR, KC_F12,
_______, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_GRV, _______, _______, KC_DOWN, KC_4, KC_5, KC_6, KC_PLUS, _______,
_______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, KC_AMPR, KC_1, KC_2, KC_3, KC_BSLS, _______,
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[MDIA] = LAYOUT_moonlander(
- USER01, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
+ QK_KB_1, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
_______, _______, _______, KC_MS_U, _______, _______, _______, _______, _______, _______, _______, _______, _______, EE_CLR,
_______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY,
_______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MNXT, _______, _______,
@@ -100,12 +100,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
- case USER00:
+ case QK_KB_0:
if (record->event.pressed) {
SEND_STRING(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
}
return false;
- case USER01:
+ case QK_KB_1:
if (record->event.pressed) {
keyboard_config.led_level ^= 1;
eeconfig_update_kb(keyboard_config.raw);
diff --git a/keyboards/mwstudio/mw65_rgb/keymaps/via/keymap.c b/keyboards/mwstudio/mw65_rgb/keymaps/via/keymap.c
index 4204b7acd8e..a1b54a8411c 100644
--- a/keyboards/mwstudio/mw65_rgb/keymaps/via/keymap.c
+++ b/keyboards/mwstudio/mw65_rgb/keymaps/via/keymap.c
@@ -26,6 +26,11 @@ typedef union {
user_config_t user_config;
+enum custom_keycodes {
+ USER00 = QK_KB_0,
+ USER01
+};
+
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
diff --git a/keyboards/mwstudio/mw75r2/keymaps/via/keymap.c b/keyboards/mwstudio/mw75r2/keymaps/via/keymap.c
index bdcd738708e..e94667954ee 100644
--- a/keyboards/mwstudio/mw75r2/keymaps/via/keymap.c
+++ b/keyboards/mwstudio/mw75r2/keymaps/via/keymap.c
@@ -27,6 +27,11 @@ typedef union {
user_config_t user_config;
+enum custom_keycodes {
+ USER00 = QK_KB_0,
+ USER01
+};
+
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/mxss/mxss_frontled.h b/keyboards/mxss/mxss_frontled.h
index 36606686559..71aba3a7935 100644
--- a/keyboards/mxss/mxss_frontled.h
+++ b/keyboards/mxss/mxss_frontled.h
@@ -64,7 +64,7 @@ typedef union {
// Custom keycodes for front LED control
enum fled_keycodes {
- FLED_MOD = USER00, // USER00 = VIA custom keycode start
+ FLED_MOD = QK_KB_0, // QK_KB_0 = VIA custom keycode start
FLED_VAI,
FLED_VAD,
NEW_SAFE_RANGE // define a new safe range
diff --git a/keyboards/nullbitsco/nibble/keymaps/oled_bongocat/keymap.c b/keyboards/nullbitsco/nibble/keymaps/oled_bongocat/keymap.c
index 631f28171aa..33652005cb5 100644
--- a/keyboards/nullbitsco/nibble/keymaps/oled_bongocat/keymap.c
+++ b/keyboards/nullbitsco/nibble/keymaps/oled_bongocat/keymap.c
@@ -29,7 +29,7 @@ enum layer_names {
#define KC_DISC_DEAF KC_F24
enum custom_keycodes {
- PROG = USER00,
+ PROG = QK_KB_0,
DISC_MUTE,
DISC_DEAF,
SUPER_ALT_TAB,
diff --git a/keyboards/nullbitsco/nibble/keymaps/via/keymap.c b/keyboards/nullbitsco/nibble/keymaps/via/keymap.c
index aab6a41af36..b71f9119ef4 100644
--- a/keyboards/nullbitsco/nibble/keymaps/via/keymap.c
+++ b/keyboards/nullbitsco/nibble/keymaps/via/keymap.c
@@ -24,11 +24,9 @@ enum layer_names {
#define KC_DISC_MUTE KC_F23
#define KC_DISC_DEAF KC_F24
-#define NUM_CUST_KEYCODES (_NUM_CUST_KCS - SAFE_RANGE)
-#define VIA_KEYCODE_RANGE USER00
enum custom_keycodes {
- PROG = SAFE_RANGE,
+ PROG = QK_KB_0,
DISC_MUTE,
DISC_DEAF,
SUPER_ALT_TAB,
@@ -76,17 +74,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
-void map_via_keycode(uint16_t * keycode) {
- if (abs(*keycode - VIA_KEYCODE_RANGE) < NUM_CUST_KEYCODES) { //make into macro?
- dprintf("VIA custom keycode found, mapping to QMK keycode.\n");
- uint16_t new_keycode = (*keycode - VIA_KEYCODE_RANGE) + SAFE_RANGE;
- dprintf("VIA KC: %u QMK KC: %u\n", *keycode, new_keycode);
- *keycode = new_keycode;
- }
-}
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- map_via_keycode(&keycode);
// Send keystrokes to host keyboard, if connected (see readme)
process_record_remote_kb(keycode, record);
switch(keycode) {
diff --git a/keyboards/orthocode/orthocode.h b/keyboards/orthocode/orthocode.h
index 57f122a4714..fd3fa927440 100644
--- a/keyboards/orthocode/orthocode.h
+++ b/keyboards/orthocode/orthocode.h
@@ -37,14 +37,6 @@
}
enum custom_keycodes {
-#ifdef VIA_ENABLE
- SHIFTSPACE = USER00,
-#else
- SHIFTSPACE = SAFE_RANGE,
-#endif
-#ifdef VIA_ENABLE
- QWERTY = SAFE_RANGE
-#else
+ SHIFTSPACE = QK_KB_0,
QWERTY
-#endif
};
diff --git a/keyboards/paprikman/albacore/keymaps/pulp/keymap.c b/keyboards/paprikman/albacore/keymaps/pulp/keymap.c
index 0bf0d42d5a7..0bb0c2221dc 100644
--- a/keyboards/paprikman/albacore/keymaps/pulp/keymap.c
+++ b/keyboards/paprikman/albacore/keymaps/pulp/keymap.c
@@ -18,7 +18,7 @@
uint16_t layer_timer;
enum layer_keycodes {
- TG_LAYER = USER00
+ TG_LAYER = QK_KB_0
};
uint8_t get_hold_layer(void) {
diff --git a/keyboards/pdxkbc/keymaps/via/keymap.c b/keyboards/pdxkbc/keymaps/via/keymap.c
index 89d98dea893..84507008e56 100644
--- a/keyboards/pdxkbc/keymaps/via/keymap.c
+++ b/keyboards/pdxkbc/keymaps/via/keymap.c
@@ -16,8 +16,8 @@
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
- MACRO00, MACRO01,
- MACRO02, MACRO03,
+ MC_0, MC_1,
+ MC_2, MC_3,
KC_VOLU, KC_VOLD
),
diff --git a/keyboards/planck/keymaps/via/keymap.c b/keyboards/planck/keymaps/via/keymap.c
index 57c6900d83d..b0226b6a1e7 100644
--- a/keyboards/planck/keymaps/via/keymap.c
+++ b/keyboards/planck/keymaps/via/keymap.c
@@ -17,8 +17,8 @@
#include QMK_KEYBOARD_H
-#define LOWER FN_MO13
-#define RAISE FN_MO23
+#define LOWER TL_LOWR
+#define RAISE TL_UPPR
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/ploopyco/mouse/mouse.h b/keyboards/ploopyco/mouse/mouse.h
index 508a8831698..906b6c93081 100644
--- a/keyboards/ploopyco/mouse/mouse.h
+++ b/keyboards/ploopyco/mouse/mouse.h
@@ -41,17 +41,9 @@ extern keyboard_config_t keyboard_config;
extern uint16_t dpi_array[];
enum ploopy_keycodes {
-#ifdef VIA_ENABLE
- DPI_CONFIG = USER00,
-#else
- DPI_CONFIG = SAFE_RANGE,
-#endif
+ DPI_CONFIG = QK_KB_0,
DRAG_SCROLL,
-#ifdef VIA_ENABLE
- PLOOPY_SAFE_RANGE = SAFE_RANGE,
-#else
PLOOPY_SAFE_RANGE,
-#endif
};
bool encoder_update_user(uint8_t index, bool clockwise);
diff --git a/keyboards/ploopyco/trackball/trackball.h b/keyboards/ploopyco/trackball/trackball.h
index e2e46b2c977..d6c4b0f985a 100644
--- a/keyboards/ploopyco/trackball/trackball.h
+++ b/keyboards/ploopyco/trackball/trackball.h
@@ -44,17 +44,9 @@ extern keyboard_config_t keyboard_config;
extern uint16_t dpi_array[];
enum ploopy_keycodes {
-#ifdef VIA_ENABLE
- DPI_CONFIG = USER00,
-#else
- DPI_CONFIG = SAFE_RANGE,
-#endif
+ DPI_CONFIG = QK_KB_0,
DRAG_SCROLL,
-#ifdef VIA_ENABLE
- PLOOPY_SAFE_RANGE = SAFE_RANGE,
-#else
PLOOPY_SAFE_RANGE,
-#endif
};
bool encoder_update_user(uint8_t index, bool clockwise);
diff --git a/keyboards/ploopyco/trackball_mini/trackball_mini.h b/keyboards/ploopyco/trackball_mini/trackball_mini.h
index 3410751cb06..cbd84cc4b4e 100644
--- a/keyboards/ploopyco/trackball_mini/trackball_mini.h
+++ b/keyboards/ploopyco/trackball_mini/trackball_mini.h
@@ -41,17 +41,9 @@ typedef union {
extern keyboard_config_t keyboard_config;
enum ploopy_keycodes {
-#ifdef VIA_ENABLE
- DPI_CONFIG = USER00,
-#else
- DPI_CONFIG = SAFE_RANGE,
-#endif
+ DPI_CONFIG = QK_KB_0,
DRAG_SCROLL,
-#ifdef VIA_ENABLE
- PLOOPY_SAFE_RANGE = SAFE_RANGE,
-#else
PLOOPY_SAFE_RANGE,
-#endif
};
bool encoder_update_user(uint8_t index, bool clockwise);
diff --git a/keyboards/ploopyco/trackball_thumb/trackball_thumb.h b/keyboards/ploopyco/trackball_thumb/trackball_thumb.h
index 168e8940640..9a01944282e 100644
--- a/keyboards/ploopyco/trackball_thumb/trackball_thumb.h
+++ b/keyboards/ploopyco/trackball_thumb/trackball_thumb.h
@@ -46,15 +46,7 @@ extern keyboard_config_t keyboard_config;
extern uint16_t dpi_array[];
enum ploopy_keycodes {
-#ifdef VIA_ENABLE
- DPI_CONFIG = USER00,
-#else
- DPI_CONFIG = SAFE_RANGE,
-#endif
+ DPI_CONFIG = QK_KB_0,
DRAG_SCROLL,
-#ifdef VIA_ENABLE
- PLOOPY_SAFE_RANGE = SAFE_RANGE,
-#else
PLOOPY_SAFE_RANGE,
-#endif
};
diff --git a/keyboards/plum47/keymaps/via/keymap.c b/keyboards/plum47/keymaps/via/keymap.c
index 8927fa4f761..3d50fe11339 100644
--- a/keyboards/plum47/keymaps/via/keymap.c
+++ b/keyboards/plum47/keymaps/via/keymap.c
@@ -23,8 +23,8 @@ enum layer_names {
_BLANK
};
-#define LOWER FN_MO13
-#define RAISE FN_MO23
+#define LOWER TL_LOWR
+#define RAISE TL_UPPR
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Qwerty
diff --git a/keyboards/preonic/keymaps/jpe230/jpe230.h b/keyboards/preonic/keymaps/jpe230/jpe230.h
index e6b4ed14015..b53239bd31b 100644
--- a/keyboards/preonic/keymaps/jpe230/jpe230.h
+++ b/keyboards/preonic/keymaps/jpe230/jpe230.h
@@ -15,14 +15,8 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
-#ifdef VIA_ENABLE
- #define USER_START USER00
-#else
- #define USER_START SAFE_RANGE
-#endif
-
enum jpe230_keycodes {
- KC_LSRS = USER_START,
+ KC_LSRS = QK_KB_0,
KC_LERS,
KC_LSRE
};
diff --git a/keyboards/preonic/keymaps/via/keymap.c b/keyboards/preonic/keymaps/via/keymap.c
index e9c5c32c737..2d8a3c763f3 100644
--- a/keyboards/preonic/keymaps/via/keymap.c
+++ b/keyboards/preonic/keymaps/via/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL,
KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT,
- _______, KC_LCTL, KC_LALT, KC_LGUI, FN_MO13, KC_SPC, KC_SPC, FN_MO23, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
+ _______, KC_LCTL, KC_LALT, KC_LGUI, TL_LOWR, KC_SPC, KC_SPC, TL_UPPR, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
),
/* Lower
@@ -190,8 +190,8 @@ void matrix_scan_user(void) {
bool music_mask_user(uint16_t keycode) {
switch (keycode) {
- case FN_MO13:
- case FN_MO23:
+ case TL_LOWR:
+ case TL_UPPR:
return false;
default:
return true;
diff --git a/keyboards/rainkeebs/delilah/keymaps/via/keymap.c b/keyboards/rainkeebs/delilah/keymaps/via/keymap.c
index 3a6e0d9a209..3cd3624146e 100644
--- a/keyboards/rainkeebs/delilah/keymaps/via/keymap.c
+++ b/keyboards/rainkeebs/delilah/keymaps/via/keymap.c
@@ -20,8 +20,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
LAYOUT(
KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, FN_MO23,
- KC_LCTL, KC_LGUI, KC_LALT, FN_MO13, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL),
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, TL_UPPR,
+ KC_LCTL, KC_LGUI, KC_LALT, TL_LOWR, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL),
LAYOUT(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/reviung/reviung39/keymaps/via/keymap.c b/keyboards/reviung/reviung39/keymaps/via/keymap.c
index 2ec7b53d214..386c2741dd2 100644
--- a/keyboards/reviung/reviung39/keymaps/via/keymap.c
+++ b/keyboards/reviung/reviung39/keymaps/via/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, RSFT_T(KC_ENT),
- FN_MO13, KC_SPC, FN_MO23
+ TL_LOWR, KC_SPC, TL_UPPR
),
[_LOWER] = LAYOUT(
diff --git a/keyboards/rocketboard_16/keycode_lookup.c b/keyboards/rocketboard_16/keycode_lookup.c
index e744aee5273..61b73bd0c03 100644
--- a/keyboards/rocketboard_16/keycode_lookup.c
+++ b/keyboards/rocketboard_16/keycode_lookup.c
@@ -337,38 +337,38 @@ lookup_table_t lookup_table[333] =
{"SC_RCPC", SC_RCPC},
{"SC_LAPO", SC_LAPO},
{"SC_RAPC", SC_RAPC},
- {"FN_MO13", FN_MO13},
- {"FN_MO23", FN_MO23},
- {"MACRO00", MACRO00},
- {"MACRO01", MACRO01},
- {"MACRO02", MACRO02},
- {"MACRO03", MACRO03},
- {"MACRO04", MACRO04},
- {"MACRO05", MACRO05},
- {"MACRO06", MACRO06},
- {"MACRO07", MACRO07},
- {"MACRO08", MACRO08},
- {"MACRO09", MACRO09},
- {"MACRO10", MACRO10},
- {"MACRO11", MACRO11},
- {"MACRO12", MACRO12},
- {"MACRO13", MACRO13},
- {"MACRO14", MACRO14},
- {"MACRO15", MACRO15},
- {"USER00", USER00},
- {"USER01", USER01},
- {"USER02", USER02},
- {"USER03", USER03},
- {"USER04", USER04},
- {"USER05", USER05},
- {"USER06", USER06},
- {"USER07", USER07},
- {"USER08", USER08},
- {"USER09", USER09},
- {"USER10", USER10},
- {"USER11", USER11},
- {"USER12", USER12},
- {"USER13", USER13},
- {"USER14", USER14},
- {"USER15", USER15}
+ {"TL_LOWR", TL_LOWR},
+ {"TL_UPPR", TL_UPPR},
+ {"QK_MACRO_0", QK_MACRO_0},
+ {"QK_MACRO_1", QK_MACRO_1},
+ {"QK_MACRO_2", QK_MACRO_2},
+ {"QK_MACRO_3", QK_MACRO_3},
+ {"QK_MACRO_4", QK_MACRO_4},
+ {"QK_MACRO_5", QK_MACRO_5},
+ {"QK_MACRO_6", QK_MACRO_6},
+ {"QK_MACRO_7", QK_MACRO_7},
+ {"QK_MACRO_8", QK_MACRO_8},
+ {"QK_MACRO_9", QK_MACRO_9},
+ {"QK_MACRO_10", QK_MACRO_10},
+ {"QK_MACRO_11", QK_MACRO_11},
+ {"QK_MACRO_12", QK_MACRO_12},
+ {"QK_MACRO_13", QK_MACRO_13},
+ {"QK_MACRO_14", QK_MACRO_14},
+ {"QK_MACRO_15", QK_MACRO_15},
+ {"QK_KB_0", QK_KB_0},
+ {"QK_KB_1", QK_KB_1},
+ {"QK_KB_2", QK_KB_2},
+ {"QK_KB_3", QK_KB_3},
+ {"QK_KB_4", QK_KB_4},
+ {"QK_KB_5", QK_KB_5},
+ {"QK_KB_6", QK_KB_6},
+ {"QK_KB_7", QK_KB_7},
+ {"QK_KB_8", QK_KB_8},
+ {"QK_KB_9", QK_KB_9},
+ {"QK_KB_10", QK_KB_10},
+ {"QK_KB_11", QK_KB_11},
+ {"QK_KB_12", QK_KB_12},
+ {"QK_KB_13", QK_KB_13},
+ {"QK_KB_14", QK_KB_14},
+ {"QK_KB_15", QK_KB_15}
};
diff --git a/keyboards/takashicompany/heavy_left/keymaps/takashicompany/keymap.c b/keyboards/takashicompany/heavy_left/keymaps/takashicompany/keymap.c
index c8391bff210..5e5fef6456b 100644
--- a/keyboards/takashicompany/heavy_left/keymaps/takashicompany/keymap.c
+++ b/keyboards/takashicompany/heavy_left/keymaps/takashicompany/keymap.c
@@ -18,7 +18,7 @@
// Defines the keycodes used by our macros in process_record_user
enum custom_keycodes {
- KC_00 = USER00,
+ KC_00 = QK_KB_0,
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/takashicompany/heavy_left/keymaps/via/keymap.c b/keyboards/takashicompany/heavy_left/keymaps/via/keymap.c
index ef86c4b0b7a..eb523ebe509 100644
--- a/keyboards/takashicompany/heavy_left/keymaps/via/keymap.c
+++ b/keyboards/takashicompany/heavy_left/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
// Defines the keycodes used by our macros in process_record_user
enum custom_keycodes {
- KC_00 = USER00,
+ KC_00 = QK_KB_0,
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/takashicompany/radialex/keymaps/via/keymap.c b/keyboards/takashicompany/radialex/keymaps/via/keymap.c
index de23d306ebd..5ce5ccccdf0 100644
--- a/keyboards/takashicompany/radialex/keymaps/via/keymap.c
+++ b/keyboards/takashicompany/radialex/keymaps/via/keymap.c
@@ -15,7 +15,7 @@
*/
#include QMK_KEYBOARD_H
-#define RADIALEX USER00
+#define RADIALEX QK_KB_0
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/viktus/sp_mini/keymaps/via/keymap.c b/keyboards/viktus/sp_mini/keymaps/via/keymap.c
index 49d421e9345..de6a8895772 100644
--- a/keyboards/viktus/sp_mini/keymaps/via/keymap.c
+++ b/keyboards/viktus/sp_mini/keymaps/via/keymap.c
@@ -126,7 +126,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}
}
switch(keycode) {
- case USER00:
+ case QK_KB_0:
if (record->event.pressed) {
spongebob_mode ^= 1;
}
diff --git a/keyboards/w1_at/keymaps/via/keymap.c b/keyboards/w1_at/keymaps/via/keymap.c
index 2c6cf0f018e..ce3b6aa4bdd 100644
--- a/keyboards/w1_at/keymaps/via/keymap.c
+++ b/keyboards/w1_at/keymaps/via/keymap.c
@@ -16,7 +16,7 @@
#include QMK_KEYBOARD_H
enum custom_keycodes {
- KC_P00 = USER00
+ KC_P00 = QK_KB_0
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/wilba_tech/rama_works_kara/keymaps/default/keymap.c b/keyboards/wilba_tech/rama_works_kara/keymaps/default/keymap.c
index 27dc90f7217..4bb827cf3ac 100644
--- a/keyboards/wilba_tech/rama_works_kara/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/rama_works_kara/keymaps/default/keymap.c
@@ -23,8 +23,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, FN_MO13,
- KC_LGUI, KC_LALT, KC_SPC, KC_RALT, FN_MO23),
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, TL_LOWR,
+ KC_LGUI, KC_LALT, KC_SPC, KC_RALT, TL_UPPR),
// Fn1 Layer
[1] = LAYOUT_60_hhkb(
diff --git a/keyboards/wilba_tech/rama_works_m50_a/keymaps/default/keymap.c b/keyboards/wilba_tech/rama_works_m50_a/keymaps/default/keymap.c
index 5316207f442..0bff6f5ee8a 100644
--- a/keyboards/wilba_tech/rama_works_m50_a/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/rama_works_m50_a/keymaps/default/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
_______, KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
_______, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT,
- _______, _______, KC_LCTL, KC_LALT, KC_LGUI, FN_MO13, KC_SPC, FN_MO23, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
+ _______, _______, KC_LCTL, KC_LALT, KC_LGUI, TL_LOWR, KC_SPC, TL_UPPR, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
),
diff --git a/keyboards/wilba_tech/rama_works_m50_ax/keymaps/default/keymap.c b/keyboards/wilba_tech/rama_works_m50_ax/keymaps/default/keymap.c
index 37f9bc94db0..6a28f19f2a8 100644
--- a/keyboards/wilba_tech/rama_works_m50_ax/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/rama_works_m50_ax/keymaps/default/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
_______, KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
_______, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT,
- _______, _______, KC_LCTL, KC_LALT, KC_LGUI, FN_MO13, KC_SPC, KC_SPC, FN_MO23, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
+ _______, _______, KC_LCTL, KC_LALT, KC_LGUI, TL_LOWR, KC_SPC, KC_SPC, TL_UPPR, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
),
diff --git a/keyboards/wilba_tech/rama_works_m50_ax/rama_works_m50_ax.c b/keyboards/wilba_tech/rama_works_m50_ax/rama_works_m50_ax.c
index 16814efd7af..86d93b82a10 100644
--- a/keyboards/wilba_tech/rama_works_m50_ax/rama_works_m50_ax.c
+++ b/keyboards/wilba_tech/rama_works_m50_ax/rama_works_m50_ax.c
@@ -15,31 +15,3 @@
*/
#include "rama_works_m50_ax.h"
-
-#ifndef VIA_ENABLE
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
- switch (keycode) {
- case FN_MO13:
- if (record->event.pressed) {
- layer_on(1);
- update_tri_layer(1, 2, 3);
- } else {
- layer_off(1);
- update_tri_layer(1, 2, 3);
- }
- return false;
- break;
- case FN_MO23:
- if (record->event.pressed) {
- layer_on(2);
- update_tri_layer(1, 2, 3);
- } else {
- layer_off(2);
- update_tri_layer(1, 2, 3);
- }
- return false;
- break;
- }
- return process_record_user(keycode, record);
-}
-#endif // VIA_ENABLE
\ No newline at end of file
diff --git a/keyboards/wilba_tech/rama_works_m60_a/keymaps/default/keymap.c b/keyboards/wilba_tech/rama_works_m60_a/keymaps/default/keymap.c
index c3ff625388c..e869a9a070b 100644
--- a/keyboards/wilba_tech/rama_works_m60_a/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/rama_works_m60_a/keymaps/default/keymap.c
@@ -8,8 +8,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, FN_MO13,
- KC_LGUI, KC_LALT, KC_SPC, KC_RALT, FN_MO23),
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, TL_LOWR,
+ KC_LGUI, KC_LALT, KC_SPC, KC_RALT, TL_UPPR),
// Fn1 Layer
[1] = LAYOUT_60_hhkb(
diff --git a/keyboards/wilba_tech/rama_works_m60_a/keymaps/proto/keymap.c b/keyboards/wilba_tech/rama_works_m60_a/keymaps/proto/keymap.c
index c3ff625388c..e869a9a070b 100644
--- a/keyboards/wilba_tech/rama_works_m60_a/keymaps/proto/keymap.c
+++ b/keyboards/wilba_tech/rama_works_m60_a/keymaps/proto/keymap.c
@@ -8,8 +8,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, FN_MO13,
- KC_LGUI, KC_LALT, KC_SPC, KC_RALT, FN_MO23),
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, TL_LOWR,
+ KC_LGUI, KC_LALT, KC_SPC, KC_RALT, TL_UPPR),
// Fn1 Layer
[1] = LAYOUT_60_hhkb(
diff --git a/keyboards/wilba_tech/rama_works_m60_a/keymaps/via/keymap.c b/keyboards/wilba_tech/rama_works_m60_a/keymaps/via/keymap.c
index c3ff625388c..e869a9a070b 100644
--- a/keyboards/wilba_tech/rama_works_m60_a/keymaps/via/keymap.c
+++ b/keyboards/wilba_tech/rama_works_m60_a/keymaps/via/keymap.c
@@ -8,8 +8,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, FN_MO13,
- KC_LGUI, KC_LALT, KC_SPC, KC_RALT, FN_MO23),
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, TL_LOWR,
+ KC_LGUI, KC_LALT, KC_SPC, KC_RALT, TL_UPPR),
// Fn1 Layer
[1] = LAYOUT_60_hhkb(
diff --git a/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/keymap.c b/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/keymap.c
index c3a0886d8b3..5b61116415a 100644
--- a/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/keymap.c
+++ b/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/keymap.c
@@ -10,8 +10,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_ESC, KC_1, KC_2, KC_3,TD(SSHT), KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, TD(LBRC), KC_RBRC, KC_BSPC,
CTRL_C_UP, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, TD(SCLN), TD(QUOT), KC_ENT,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, FN_MO13,
- KC_LALT, KC_LGUI, KC_SPC, KC_RALT, FN_MO23),
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, TL_LOWR,
+ KC_LALT, KC_LGUI, KC_SPC, KC_RALT, TL_UPPR),
// Fn1 Layer
[1] = LAYOUT_60_hhkb(
diff --git a/keyboards/wilba_tech/wt60_b/keymaps/default/keymap.c b/keyboards/wilba_tech/wt60_b/keymaps/default/keymap.c
index 53f63edd6ca..c5517c89243 100644
--- a/keyboards/wilba_tech/wt60_b/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/wt60_b/keymaps/default/keymap.c
@@ -8,8 +8,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, FN_MO13,
- KC_NO, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, FN_MO23, KC_NO),
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, TL_LOWR,
+ KC_NO, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, TL_UPPR, KC_NO),
// Fn1 Layer
[1] = LAYOUT_all(
diff --git a/keyboards/wilba_tech/wt60_b/keymaps/via/keymap.c b/keyboards/wilba_tech/wt60_b/keymaps/via/keymap.c
index 53f63edd6ca..c5517c89243 100644
--- a/keyboards/wilba_tech/wt60_b/keymaps/via/keymap.c
+++ b/keyboards/wilba_tech/wt60_b/keymaps/via/keymap.c
@@ -8,8 +8,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, FN_MO13,
- KC_NO, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, FN_MO23, KC_NO),
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, TL_LOWR,
+ KC_NO, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, TL_UPPR, KC_NO),
// Fn1 Layer
[1] = LAYOUT_all(
diff --git a/keyboards/wilba_tech/wt60_bx/keymaps/default/keymap.c b/keyboards/wilba_tech/wt60_bx/keymaps/default/keymap.c
index 7d43075b348..10b5ee1009c 100644
--- a/keyboards/wilba_tech/wt60_bx/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/wt60_bx/keymaps/default/keymap.c
@@ -8,8 +8,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, FN_MO13,
- KC_NO, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, FN_MO23, KC_NO),
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, TL_LOWR,
+ KC_NO, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, TL_UPPR, KC_NO),
// Fn1 Layer
[1] = LAYOUT_all(
diff --git a/keyboards/wilba_tech/wt60_bx/keymaps/via/keymap.c b/keyboards/wilba_tech/wt60_bx/keymaps/via/keymap.c
index 7d43075b348..10b5ee1009c 100644
--- a/keyboards/wilba_tech/wt60_bx/keymaps/via/keymap.c
+++ b/keyboards/wilba_tech/wt60_bx/keymaps/via/keymap.c
@@ -8,8 +8,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, FN_MO13,
- KC_NO, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, FN_MO23, KC_NO),
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, TL_LOWR,
+ KC_NO, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, TL_UPPR, KC_NO),
// Fn1 Layer
[1] = LAYOUT_all(
diff --git a/keyboards/wilba_tech/wt60_c/keymaps/default/keymap.c b/keyboards/wilba_tech/wt60_c/keymaps/default/keymap.c
index c1fdd18f351..5e598a763f6 100644
--- a/keyboards/wilba_tech/wt60_c/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/wt60_c/keymaps/default/keymap.c
@@ -7,8 +7,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, FN_MO13,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, FN_MO23, KC_RCTL),
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, TL_LOWR,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, TL_UPPR, KC_RCTL),
[1] = LAYOUT_all(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL,
diff --git a/keyboards/wilba_tech/wt60_c/keymaps/via/keymap.c b/keyboards/wilba_tech/wt60_c/keymaps/via/keymap.c
index c1fdd18f351..5e598a763f6 100644
--- a/keyboards/wilba_tech/wt60_c/keymaps/via/keymap.c
+++ b/keyboards/wilba_tech/wt60_c/keymaps/via/keymap.c
@@ -7,8 +7,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, FN_MO13,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, FN_MO23, KC_RCTL),
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, TL_LOWR,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, TL_UPPR, KC_RCTL),
[1] = LAYOUT_all(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL,
diff --git a/keyboards/wilba_tech/wt_main.c b/keyboards/wilba_tech/wt_main.c
index 3f89066a6c2..92c43c794da 100644
--- a/keyboards/wilba_tech/wt_main.c
+++ b/keyboards/wilba_tech/wt_main.c
@@ -89,29 +89,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record)
process_record_backlight(keycode, record);
#endif // RGB_BACKLIGHT_ENABLED || MONO_BACKLIGHT_ENABLED
- switch (keycode) {
- case FN_MO13:
- if (record->event.pressed) {
- layer_on(1);
- update_tri_layer(1, 2, 3);
- } else {
- layer_off(1);
- update_tri_layer(1, 2, 3);
- }
- return false;
- break;
- case FN_MO23:
- if (record->event.pressed) {
- layer_on(2);
- update_tri_layer(1, 2, 3);
- } else {
- layer_off(2);
- update_tri_layer(1, 2, 3);
- }
- return false;
- break;
- }
-
return process_record_user(keycode, record);
}
@@ -173,6 +150,14 @@ void via_custom_value_command_kb(uint8_t *data, uint8_t length) {
// DO NOT call raw_hid_send(data,length) here, let caller do this
}
+
+void via_set_device_indication(uint8_t value)
+{
+#if RGB_BACKLIGHT_ENABLED || MONO_BACKLIGHT_ENABLED
+ backlight_device_indication(value);
+#endif // RGB_BACKLIGHT_ENABLED || MONO_BACKLIGHT_ENABLED
+}
+
#endif // VIA_ENABLE
//
diff --git a/keyboards/wilba_tech/wt_mono_backlight.c b/keyboards/wilba_tech/wt_mono_backlight.c
index 0fc6e346a19..c79fc02cd99 100644
--- a/keyboards/wilba_tech/wt_mono_backlight.c
+++ b/keyboards/wilba_tech/wt_mono_backlight.c
@@ -184,13 +184,13 @@ defined(MONO_BACKLIGHT_WT80_A)
IS31FL3736_mono_set_brightness(16, 255);
}
#endif
-#if defined(MONO_BACKLIGHT_WT80_A)
+#if defined(MONO_BACKLIGHT_WT80_A)
if ( host_keyboard_led_state().scroll_lock ) {
// SW7,CS7 = (6*8+6) = 54
IS31FL3736_mono_set_brightness(54, 255);
}
#endif
-#if defined(MONO_BACKLIGHT_WT75_C)
+#if defined(MONO_BACKLIGHT_WT75_C)
if ( host_keyboard_led_state().scroll_lock ) {
// SW7,CS8 = (6*8+7) = 55
IS31FL3736_mono_set_brightness(55, 255);
@@ -471,3 +471,14 @@ void backlight_brightness_decrease(void)
g_config.brightness = decrement( g_config.brightness, 8, 0, 255 );
backlight_config_save();
}
+
+void backlight_device_indication(uint8_t value)
+{
+ static uint8_t current_effect = 0;
+ static uint8_t alternate_effect = 0;
+ if ( value == 0 ) {
+ current_effect = g_config.effect;
+ alternate_effect = g_config.effect > 0 ? 0 : 1;
+ }
+ g_config.effect = value % 2 == 0 ? alternate_effect : current_effect;
+}
diff --git a/keyboards/wilba_tech/wt_mono_backlight.h b/keyboards/wilba_tech/wt_mono_backlight.h
index 88183fd8474..9bf76b44bb8 100644
--- a/keyboards/wilba_tech/wt_mono_backlight.h
+++ b/keyboards/wilba_tech/wt_mono_backlight.h
@@ -76,3 +76,4 @@ void backlight_effect_speed_decrease(void);
void backlight_brightness_increase(void);
void backlight_brightness_decrease(void);
+void backlight_device_indication(uint8_t value);
diff --git a/keyboards/wilba_tech/wt_rgb_backlight.c b/keyboards/wilba_tech/wt_rgb_backlight.c
index c82f86304cc..1cd00ae41f6 100644
--- a/keyboards/wilba_tech/wt_rgb_backlight.c
+++ b/keyboards/wilba_tech/wt_rgb_backlight.c
@@ -2554,9 +2554,7 @@ static void gpt_backlight_timer_task(GPTDriver *gptp)
if ( ! suspend_backlight )
{
-#if !defined(RGB_BACKLIGHT_M6_B) && !defined(RGB_BACKLIGHT_M10_C)
backlight_effect_indicators();
-#endif
}
}
@@ -3426,3 +3424,14 @@ void backlight_debug_led( bool state )
}
}
#endif // defined(RGB_DEBUGGING_ONLY)
+
+void backlight_device_indication(uint8_t value)
+{
+ static uint8_t current_effect = 0;
+ static uint8_t alternate_effect = 0;
+ if ( value == 0 ) {
+ current_effect = g_config.effect;
+ alternate_effect = g_config.effect > 0 ? 0 : 1;
+ }
+ g_config.effect = value % 2 == 0 ? alternate_effect : current_effect;
+}
diff --git a/keyboards/wilba_tech/wt_rgb_backlight.h b/keyboards/wilba_tech/wt_rgb_backlight.h
index 2114789213b..6fb2ee21220 100644
--- a/keyboards/wilba_tech/wt_rgb_backlight.h
+++ b/keyboards/wilba_tech/wt_rgb_backlight.h
@@ -112,3 +112,4 @@ void backlight_color_2_sat_decrease(void);
void backlight_test_led( uint8_t index, bool red, bool green, bool blue );
void backlight_debug_led(bool state);
+void backlight_device_indication(uint8_t value);
diff --git a/keyboards/wilba_tech/wt_rgb_backlight_keycodes.h b/keyboards/wilba_tech/wt_rgb_backlight_keycodes.h
index 5a436495353..b8c23c4b073 100644
--- a/keyboards/wilba_tech/wt_rgb_backlight_keycodes.h
+++ b/keyboards/wilba_tech/wt_rgb_backlight_keycodes.h
@@ -15,20 +15,19 @@
*/
#pragma once
-// This is hardcoded at 0x5F00 so it's well after keycode value SAFE_RANGE
enum wt_rgb_backlight_keycodes {
- BR_INC = 0x5F00, // backlight brightness increase
- BR_DEC, // backlight brightness decrease
- EF_INC, // backlight effect increase
- EF_DEC, // backlight effect decrease
- ES_INC,
- ES_DEC,
- H1_INC,
- H1_DEC,
- S1_INC,
- S1_DEC,
- H2_INC,
- H2_DEC,
- S2_INC,
- S2_DEC
+ BR_INC = QK_KB_0, // brightness increase
+ BR_DEC, // brightness decrease
+ EF_INC, // effect increase
+ EF_DEC, // effect decrease
+ ES_INC, // effect speed increase
+ ES_DEC, // effect speed decrease
+ H1_INC, // color 1 hue increase
+ H1_DEC, // color 1 hue decrease
+ S1_INC, // color 1 saturation increase
+ S1_DEC, // color 1 saturation decrease
+ H2_INC, // color 2 hue increase
+ H2_DEC, // color 2 hue decrease
+ S2_INC, // color 2 saturation increase
+ S2_DEC // color 2 saturation decrease
};
diff --git a/keyboards/wilba_tech/zeal60/keymaps/ansi_split_bs_rshift/keymap.c b/keyboards/wilba_tech/zeal60/keymaps/ansi_split_bs_rshift/keymap.c
index 6c290fcdeb7..ad204d5c387 100644
--- a/keyboards/wilba_tech/zeal60/keymaps/ansi_split_bs_rshift/keymap.c
+++ b/keyboards/wilba_tech/zeal60/keymaps/ansi_split_bs_rshift/keymap.c
@@ -8,8 +8,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, FN_MO13,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, FN_MO23, KC_RCTL),
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, TL_LOWR,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, TL_UPPR, KC_RCTL),
// Fn1 Layer
[1] = LAYOUT_60_ansi_split_bs_rshift(
diff --git a/keyboards/wilba_tech/zeal60/keymaps/default/keymap.c b/keyboards/wilba_tech/zeal60/keymaps/default/keymap.c
index f75fb4a57a3..c7352fc4690 100644
--- a/keyboards/wilba_tech/zeal60/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/zeal60/keymaps/default/keymap.c
@@ -9,7 +9,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, FN_MO13, FN_MO23, KC_RCTL),
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, TL_LOWR, TL_UPPR, KC_RCTL),
// Fn1 Layer
[1] = LAYOUT_60_ansi(
diff --git a/keyboards/wilba_tech/zeal60/keymaps/hhkb/keymap.c b/keyboards/wilba_tech/zeal60/keymaps/hhkb/keymap.c
index 0bfc63911ee..c45ebd98ec5 100644
--- a/keyboards/wilba_tech/zeal60/keymaps/hhkb/keymap.c
+++ b/keyboards/wilba_tech/zeal60/keymaps/hhkb/keymap.c
@@ -8,8 +8,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, FN_MO13,
- KC_LGUI, KC_LALT, KC_SPC, KC_RALT, FN_MO23),
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, TL_LOWR,
+ KC_LGUI, KC_LALT, KC_SPC, KC_RALT, TL_UPPR),
// Fn1 Layer
[1] = LAYOUT_60_hhkb(
diff --git a/keyboards/wilba_tech/zeal60/keymaps/iso/keymap.c b/keyboards/wilba_tech/zeal60/keymaps/iso/keymap.c
index 9c4faeae484..292f2483770 100644
--- a/keyboards/wilba_tech/zeal60/keymaps/iso/keymap.c
+++ b/keyboards/wilba_tech/zeal60/keymaps/iso/keymap.c
@@ -9,7 +9,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS,
KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, FN_MO13, FN_MO23, KC_RCTL),
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, TL_LOWR, TL_UPPR, KC_RCTL),
// Fn1 Layer
[1] = LAYOUT_60_iso(
diff --git a/keyboards/wilba_tech/zeal60/keymaps/sethBarberee/keymap.c b/keyboards/wilba_tech/zeal60/keymaps/sethBarberee/keymap.c
index 42322253105..898d80eaee2 100644
--- a/keyboards/wilba_tech/zeal60/keymaps/sethBarberee/keymap.c
+++ b/keyboards/wilba_tech/zeal60/keymaps/sethBarberee/keymap.c
@@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
KC_CAFN, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENFN,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSUP, FN_MO13,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSUP, TL_LOWR,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_TRNS, KC_RGLT, KC_RGDN, KC_RCRT),
// Fn1 Layer
diff --git a/keyboards/wilba_tech/zeal60/keymaps/via/keymap.c b/keyboards/wilba_tech/zeal60/keymaps/via/keymap.c
index 889f94ebe17..58e4dc679cc 100644
--- a/keyboards/wilba_tech/zeal60/keymaps/via/keymap.c
+++ b/keyboards/wilba_tech/zeal60/keymaps/via/keymap.c
@@ -9,7 +9,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, FN_MO13, FN_MO23, KC_RCTL),
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, TL_LOWR, TL_UPPR, KC_RCTL),
// Fn1 Layer
[1] = LAYOUT_60_all(
diff --git a/keyboards/wilba_tech/zeal65/keymaps/default/keymap.c b/keyboards/wilba_tech/zeal65/keymaps/default/keymap.c
index 9a91b12f28c..cd90454655c 100644
--- a/keyboards/wilba_tech/zeal65/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/zeal65/keymaps/default/keymap.c
@@ -9,7 +9,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
- KC_LCTL, KC_LALT, KC_SPC, FN_MO23, FN_MO13, KC_LEFT, KC_DOWN, KC_RGHT),
+ KC_LCTL, KC_LALT, KC_SPC, TL_UPPR, TL_LOWR, KC_LEFT, KC_DOWN, KC_RGHT),
// Fn1 Layer
[1] = LAYOUT_65_normie(
diff --git a/keyboards/wilba_tech/zeal65/keymaps/split_bs/keymap.c b/keyboards/wilba_tech/zeal65/keymaps/split_bs/keymap.c
index 35698065dce..f031a975266 100644
--- a/keyboards/wilba_tech/zeal65/keymaps/split_bs/keymap.c
+++ b/keyboards/wilba_tech/zeal65/keymaps/split_bs/keymap.c
@@ -9,7 +9,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_PGUP,
KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
- KC_LGUI, KC_LALT, KC_SPC, FN_MO23, FN_MO13, KC_LEFT, KC_DOWN, KC_RGHT),
+ KC_LGUI, KC_LALT, KC_SPC, TL_UPPR, TL_LOWR, KC_LEFT, KC_DOWN, KC_RGHT),
// Fn1 Layer
[1] = LAYOUT_65_all(
diff --git a/keyboards/wilba_tech/zeal65/keymaps/via/keymap.c b/keyboards/wilba_tech/zeal65/keymaps/via/keymap.c
index 35698065dce..f031a975266 100644
--- a/keyboards/wilba_tech/zeal65/keymaps/via/keymap.c
+++ b/keyboards/wilba_tech/zeal65/keymaps/via/keymap.c
@@ -9,7 +9,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_PGUP,
KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
- KC_LGUI, KC_LALT, KC_SPC, FN_MO23, FN_MO13, KC_LEFT, KC_DOWN, KC_RGHT),
+ KC_LGUI, KC_LALT, KC_SPC, TL_UPPR, TL_LOWR, KC_LEFT, KC_DOWN, KC_RGHT),
// Fn1 Layer
[1] = LAYOUT_65_all(
diff --git a/keyboards/wilba_tech/zeal65/keymaps/zyber/keymap.c b/keyboards/wilba_tech/zeal65/keymaps/zyber/keymap.c
index a8e9dbb2ab6..a1abd7b5e27 100644
--- a/keyboards/wilba_tech/zeal65/keymaps/zyber/keymap.c
+++ b/keyboards/wilba_tech/zeal65/keymaps/zyber/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, TD(LBRC), KC_RBRC, KC_BSLS, TD(END_HOME),
CTRL_C_UP, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, TD(SCLN), TD(QUOT), KC_ENT, KC_PGUP,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
- KC_LALT, KC_LCMD, KC_SPC, FN_MO23, FN_MO13, KC_LEFT, KC_DOWN, KC_RGHT),
+ KC_LALT, KC_LCMD, KC_SPC, TL_UPPR, TL_LOWR, KC_LEFT, KC_DOWN, KC_RGHT),
// Fn1 Layer
[1] = LAYOUT_65_normie(
diff --git a/keyboards/work_louder/micro/keymaps/via/keymap.c b/keyboards/work_louder/micro/keymaps/via/keymap.c
index 8cc41e1e504..514aae2aa0f 100644
--- a/keyboards/work_louder/micro/keymaps/via/keymap.c
+++ b/keyboards/work_louder/micro/keymaps/via/keymap.c
@@ -24,8 +24,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[3] = LAYOUT(
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
- USER00, USER01, USER03, USER05,
- XXXXXXX, USER02, USER04, USER06,
+ QK_KB_0, QK_KB_1, QK_KB_3, QK_KB_5,
+ XXXXXXX, QK_KB_2, QK_KB_4, QK_KB_6,
XXXXXXX, XXXXXXX, XXXXXXX, TO(0)
)
};
@@ -53,7 +53,7 @@ work_louder_config_t work_louder_config;
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
- case USER09:
+ case QK_KB_9:
if (record->event.pressed) {
work_louder_config.led_level++;
if (work_louder_config.led_level > 4) {
diff --git a/keyboards/work_louder/rgb_functions.h b/keyboards/work_louder/rgb_functions.h
index 9a5cda0fc6d..8940cddefc7 100644
--- a/keyboards/work_louder/rgb_functions.h
+++ b/keyboards/work_louder/rgb_functions.h
@@ -46,31 +46,31 @@
# endif
#else
# ifndef RGB_MATRIX_TOGGLE
-# define RGB_MATRIX_TOGGLE USER00
+# define RGB_MATRIX_TOGGLE QK_KB_0
# endif
# ifndef RGB_MATRIX_MODE_INC
-# define RGB_MATRIX_MODE_INC USER01
+# define RGB_MATRIX_MODE_INC QK_KB_1
# endif
# ifndef RGB_MATRIX_MODE_DEC
-# define RGB_MATRIX_MODE_DEC USER02
+# define RGB_MATRIX_MODE_DEC QK_KB_2
# endif
# ifndef RGB_MATRIX_HUE_INC
-# define RGB_MATRIX_HUE_INC USER03
+# define RGB_MATRIX_HUE_INC QK_KB_3
# endif
# ifndef RGB_MATRIX_HUE_DEC
-# define RGB_MATRIX_HUE_DEC USER04
+# define RGB_MATRIX_HUE_DEC QK_KB_4
# endif
# ifndef RGB_MATRIX_SAT_INC
-# define RGB_MATRIX_SAT_INC USER05
+# define RGB_MATRIX_SAT_INC QK_KB_5
# endif
# ifndef RGB_MATRIX_SAT_DEC
-# define RGB_MATRIX_SAT_DEC USER06
+# define RGB_MATRIX_SAT_DEC QK_KB_6
# endif
# ifndef RGB_MATRIX_VAL_INC
-# define RGB_MATRIX_VAL_INC USER07
+# define RGB_MATRIX_VAL_INC QK_KB_7
# endif
# ifndef RGB_MATRIX_VAL_DEC
-# define RGB_MATRIX_VAL_DEC USER08
+# define RGB_MATRIX_VAL_DEC QK_KB_8
# endif
#endif
diff --git a/keyboards/work_louder/work_board/keymaps/via/keymap.c b/keyboards/work_louder/work_board/keymaps/via/keymap.c
index 17321a773bd..08df414e886 100644
--- a/keyboards/work_louder/work_board/keymaps/via/keymap.c
+++ b/keyboards/work_louder/work_board/keymaps/via/keymap.c
@@ -22,13 +22,13 @@ enum tap_dances {
ENC_TAP,
};
-#define LOWER FN_MO13
-#define RAISE FN_MO23
+#define LOWER TL_LOWR
+#define RAISE TL_UPPR
// clang-format off
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_QWERTY] = LAYOUT(
- KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, USER09,
+ KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, QK_KB_9,
KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT,
MO(3), KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
@@ -99,10 +99,10 @@ typedef union {
work_louder_config_t work_louder_config;
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- if (keycode == USER09) {
+ if (keycode == QK_KB_9) {
preprocess_tap_dance(TD(ENC_TAP), record);
return process_tap_dance(TD(ENC_TAP), record);
- } else if (keycode == USER10 && record->event.pressed) {
+ } else if (keycode == QK_KB_10 && record->event.pressed) {
work_louder_config.led_level ^= true;
eeconfig_update_user(work_louder_config.raw);
layer_state_set_kb(layer_state);
diff --git a/keyboards/xelus/la_plus/la_plus.h b/keyboards/xelus/la_plus/la_plus.h
index f19b79237f1..b3030c7cf48 100755
--- a/keyboards/xelus/la_plus/la_plus.h
+++ b/keyboards/xelus/la_plus/la_plus.h
@@ -42,9 +42,5 @@ typedef union {
} keyboard_config_t;
enum la_plus_keycodes {
-#ifdef VIA_ENABLE
- STARTUP_ANIMATION_CONFIG = USER00,
-#else
- STARTUP_ANIMATION_CONFIG = SAFE_RANGE,
-#endif
+ STARTUP_ANIMATION_CONFIG = QK_KB_0,
};
diff --git a/keyboards/yoichiro/lunakey_pico/keymaps/via/keymap.c b/keyboards/yoichiro/lunakey_pico/keymaps/via/keymap.c
index d664eb5a03d..c7261a3fb85 100644
--- a/keyboards/yoichiro/lunakey_pico/keymaps/via/keymap.c
+++ b/keyboards/yoichiro/lunakey_pico/keymaps/via/keymap.c
@@ -10,8 +10,8 @@ enum layer_number {
_ADJUST,
};
-#define LOWER FN_MO13
-#define RAISE FN_MO23
+#define LOWER TL_LOWR
+#define RAISE TL_UPPR
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/quantum/keycodes.h b/quantum/keycodes.h
index ec51459272b..dfebd22044b 100644
--- a/quantum/keycodes.h
+++ b/quantum/keycodes.h
@@ -721,7 +721,70 @@ enum qk_keycode_defines {
QK_AUTOCORRECT_TOGGLE = 0x7C76,
QK_TRI_LAYER_LOWER = 0x7C77,
QK_TRI_LAYER_UPPER = 0x7C78,
- SAFE_RANGE = 0x7E00,
+ QK_KB_0 = 0x7E00,
+ QK_KB_1 = 0x7E01,
+ QK_KB_2 = 0x7E02,
+ QK_KB_3 = 0x7E03,
+ QK_KB_4 = 0x7E04,
+ QK_KB_5 = 0x7E05,
+ QK_KB_6 = 0x7E06,
+ QK_KB_7 = 0x7E07,
+ QK_KB_8 = 0x7E08,
+ QK_KB_9 = 0x7E09,
+ QK_KB_10 = 0x7E0A,
+ QK_KB_11 = 0x7E0B,
+ QK_KB_12 = 0x7E0C,
+ QK_KB_13 = 0x7E0D,
+ QK_KB_14 = 0x7E0E,
+ QK_KB_15 = 0x7E0F,
+ QK_KB_16 = 0x7E10,
+ QK_KB_17 = 0x7E11,
+ QK_KB_18 = 0x7E12,
+ QK_KB_19 = 0x7E13,
+ QK_KB_20 = 0x7E14,
+ QK_KB_21 = 0x7E15,
+ QK_KB_22 = 0x7E16,
+ QK_KB_23 = 0x7E17,
+ QK_KB_24 = 0x7E18,
+ QK_KB_25 = 0x7E19,
+ QK_KB_26 = 0x7E1A,
+ QK_KB_27 = 0x7E1B,
+ QK_KB_28 = 0x7E1C,
+ QK_KB_29 = 0x7E1D,
+ QK_KB_30 = 0x7E1E,
+ QK_KB_31 = 0x7E1F,
+ QK_USER_0 = 0x7F00,
+ QK_USER_1 = 0x7F01,
+ QK_USER_2 = 0x7F02,
+ QK_USER_3 = 0x7F03,
+ QK_USER_4 = 0x7F04,
+ QK_USER_5 = 0x7F05,
+ QK_USER_6 = 0x7F06,
+ QK_USER_7 = 0x7F07,
+ QK_USER_8 = 0x7F08,
+ QK_USER_9 = 0x7F09,
+ QK_USER_10 = 0x7F0A,
+ QK_USER_11 = 0x7F0B,
+ QK_USER_12 = 0x7F0C,
+ QK_USER_13 = 0x7F0D,
+ QK_USER_14 = 0x7F0E,
+ QK_USER_15 = 0x7F0F,
+ QK_USER_16 = 0x7F10,
+ QK_USER_17 = 0x7F11,
+ QK_USER_18 = 0x7F12,
+ QK_USER_19 = 0x7F13,
+ QK_USER_20 = 0x7F14,
+ QK_USER_21 = 0x7F15,
+ QK_USER_22 = 0x7F16,
+ QK_USER_23 = 0x7F17,
+ QK_USER_24 = 0x7F18,
+ QK_USER_25 = 0x7F19,
+ QK_USER_26 = 0x7F1A,
+ QK_USER_27 = 0x7F1B,
+ QK_USER_28 = 0x7F1C,
+ QK_USER_29 = 0x7F1D,
+ QK_USER_30 = 0x7F1E,
+ QK_USER_31 = 0x7F1F,
// Alias
XXXXXXX = KC_NO,
@@ -1351,3 +1414,5 @@ enum qk_keycode_defines {
#define IS_BACKLIGHT_KEYCODE(code) ((code) >= QK_BACKLIGHT_ON && (code) <= QK_BACKLIGHT_TOGGLE_BREATHING)
#define IS_RGB_KEYCODE(code) ((code) >= RGB_TOG && (code) <= RGB_MODE_TWINKLE)
#define IS_QUANTUM_KEYCODE(code) ((code) >= QK_BOOTLOADER && (code) <= QK_TRI_LAYER_UPPER)
+#define IS_KB_KEYCODE(code) ((code) >= QK_KB_0 && (code) <= QK_KB_31)
+#define IS_USER_KEYCODE(code) ((code) >= QK_USER_0 && (code) <= QK_USER_31)
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index 9933d5c9892..fd737da7178 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -33,6 +33,8 @@
#define QK_RSFT 0x1200
#define QK_RALT 0x1400
#define QK_RGUI 0x1800
+
+#define SAFE_RANGE QK_KB
// clang-format on
// Generic decoding for the whole QK_MODS range
diff --git a/quantum/via.c b/quantum/via.c
index 8cb6eb5fc6f..c54e37a1751 100644
--- a/quantum/via.c
+++ b/quantum/via.c
@@ -153,38 +153,13 @@ __attribute__((weak)) void via_set_device_indication(uint8_t value) {
bool process_record_via(uint16_t keycode, keyrecord_t *record) {
// Handle macros
if (record->event.pressed) {
- if (keycode >= MACRO00 && keycode <= MACRO15) {
- uint8_t id = keycode - MACRO00;
+ if (keycode >= QK_MACRO && keycode <= QK_MACRO_MAX) {
+ uint8_t id = keycode - QK_MACRO;
dynamic_keymap_macro_send(id);
return false;
}
}
- // TODO: ideally this would be generalized and refactored into
- // QMK core as advanced keycodes, until then, the simple case
- // can be available here to keyboards using VIA
- switch (keycode) {
- case FN_MO13:
- if (record->event.pressed) {
- layer_on(1);
- update_tri_layer(1, 2, 3);
- } else {
- layer_off(1);
- update_tri_layer(1, 2, 3);
- }
- return false;
- break;
- case FN_MO23:
- if (record->event.pressed) {
- layer_on(2);
- update_tri_layer(1, 2, 3);
- } else {
- layer_off(2);
- update_tri_layer(1, 2, 3);
- }
- return false;
- break;
- }
return true;
}
@@ -303,25 +278,22 @@ void raw_hid_receive(uint8_t *data, uint8_t length) {
break;
}
case id_switch_matrix_state: {
-// Round up to the nearest number of bytes required to hold row state.
-// Multiply by number of rows to get the required size in bytes.
-// Guard against this being too big for the HID message.
-#if (((MATRIX_COLS + 7) / 8) * MATRIX_ROWS <= 28)
- uint8_t i = 1;
- for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
- matrix_row_t value = matrix_get_row(row);
-# if (MATRIX_COLS > 24)
+ uint8_t offset = command_data[1];
+ uint8_t rows = 28 / ((MATRIX_COLS + 7) / 8);
+ uint8_t i = 2;
+ for (uint8_t row = 0; row < rows && row + offset < MATRIX_ROWS; row++) {
+ matrix_row_t value = matrix_get_row(row + offset);
+#if (MATRIX_COLS > 24)
command_data[i++] = (value >> 24) & 0xFF;
-# endif
-# if (MATRIX_COLS > 16)
+#endif
+#if (MATRIX_COLS > 16)
command_data[i++] = (value >> 16) & 0xFF;
-# endif
-# if (MATRIX_COLS > 8)
+#endif
+#if (MATRIX_COLS > 8)
command_data[i++] = (value >> 8) & 0xFF;
-# endif
+#endif
command_data[i++] = value & 0xFF;
}
-#endif
break;
}
case id_firmware_version: {
diff --git a/quantum/via.h b/quantum/via.h
index eca0733525d..ab4eb050281 100644
--- a/quantum/via.h
+++ b/quantum/via.h
@@ -58,7 +58,7 @@
// This is changed only when the command IDs change,
// so VIA Configurator can detect compatible firmware.
-#define VIA_PROTOCOL_VERSION 0x000B
+#define VIA_PROTOCOL_VERSION 0x000C
// This is a version number for the firmware for the keyboard.
// It can be used to ensure the VIA keyboard definition and the firmware
@@ -135,46 +135,6 @@ enum via_qmk_audio_value {
id_qmk_audio_clicky_enable = 2,
};
-enum via_keycodes {
- FN_MO13 = QK_MACRO,
- FN_MO23,
- MACRO00,
- MACRO01,
- MACRO02,
- MACRO03,
- MACRO04,
- MACRO05,
- MACRO06,
- MACRO07,
- MACRO08,
- MACRO09,
- MACRO10,
- MACRO11,
- MACRO12,
- MACRO13,
- MACRO14,
- MACRO15,
-};
-
-enum user_keycodes {
- USER00 = QK_USER,
- USER01,
- USER02,
- USER03,
- USER04,
- USER05,
- USER06,
- USER07,
- USER08,
- USER09,
- USER10,
- USER11,
- USER12,
- USER13,
- USER14,
- USER15,
-};
-
// Can be called in an overriding via_init_kb() to test if keyboard level code usage of
// EEPROM is invalid and use/save defaults.
bool via_eeprom_is_valid(void);
diff --git a/tests/test_common/keycode_table.cpp b/tests/test_common/keycode_table.cpp
index 3aa97f4e0d7..d21630c01be 100644
--- a/tests/test_common/keycode_table.cpp
+++ b/tests/test_common/keycode_table.cpp
@@ -663,5 +663,68 @@ std::map KEYCODE_ID_TABLE = {
{QK_AUTOCORRECT_TOGGLE, "QK_AUTOCORRECT_TOGGLE"},
{QK_TRI_LAYER_LOWER, "QK_TRI_LAYER_LOWER"},
{QK_TRI_LAYER_UPPER, "QK_TRI_LAYER_UPPER"},
- {SAFE_RANGE, "SAFE_RANGE"},
+ {QK_KB_0, "QK_KB_0"},
+ {QK_KB_1, "QK_KB_1"},
+ {QK_KB_2, "QK_KB_2"},
+ {QK_KB_3, "QK_KB_3"},
+ {QK_KB_4, "QK_KB_4"},
+ {QK_KB_5, "QK_KB_5"},
+ {QK_KB_6, "QK_KB_6"},
+ {QK_KB_7, "QK_KB_7"},
+ {QK_KB_8, "QK_KB_8"},
+ {QK_KB_9, "QK_KB_9"},
+ {QK_KB_10, "QK_KB_10"},
+ {QK_KB_11, "QK_KB_11"},
+ {QK_KB_12, "QK_KB_12"},
+ {QK_KB_13, "QK_KB_13"},
+ {QK_KB_14, "QK_KB_14"},
+ {QK_KB_15, "QK_KB_15"},
+ {QK_KB_16, "QK_KB_16"},
+ {QK_KB_17, "QK_KB_17"},
+ {QK_KB_18, "QK_KB_18"},
+ {QK_KB_19, "QK_KB_19"},
+ {QK_KB_20, "QK_KB_20"},
+ {QK_KB_21, "QK_KB_21"},
+ {QK_KB_22, "QK_KB_22"},
+ {QK_KB_23, "QK_KB_23"},
+ {QK_KB_24, "QK_KB_24"},
+ {QK_KB_25, "QK_KB_25"},
+ {QK_KB_26, "QK_KB_26"},
+ {QK_KB_27, "QK_KB_27"},
+ {QK_KB_28, "QK_KB_28"},
+ {QK_KB_29, "QK_KB_29"},
+ {QK_KB_30, "QK_KB_30"},
+ {QK_KB_31, "QK_KB_31"},
+ {QK_USER_0, "QK_USER_0"},
+ {QK_USER_1, "QK_USER_1"},
+ {QK_USER_2, "QK_USER_2"},
+ {QK_USER_3, "QK_USER_3"},
+ {QK_USER_4, "QK_USER_4"},
+ {QK_USER_5, "QK_USER_5"},
+ {QK_USER_6, "QK_USER_6"},
+ {QK_USER_7, "QK_USER_7"},
+ {QK_USER_8, "QK_USER_8"},
+ {QK_USER_9, "QK_USER_9"},
+ {QK_USER_10, "QK_USER_10"},
+ {QK_USER_11, "QK_USER_11"},
+ {QK_USER_12, "QK_USER_12"},
+ {QK_USER_13, "QK_USER_13"},
+ {QK_USER_14, "QK_USER_14"},
+ {QK_USER_15, "QK_USER_15"},
+ {QK_USER_16, "QK_USER_16"},
+ {QK_USER_17, "QK_USER_17"},
+ {QK_USER_18, "QK_USER_18"},
+ {QK_USER_19, "QK_USER_19"},
+ {QK_USER_20, "QK_USER_20"},
+ {QK_USER_21, "QK_USER_21"},
+ {QK_USER_22, "QK_USER_22"},
+ {QK_USER_23, "QK_USER_23"},
+ {QK_USER_24, "QK_USER_24"},
+ {QK_USER_25, "QK_USER_25"},
+ {QK_USER_26, "QK_USER_26"},
+ {QK_USER_27, "QK_USER_27"},
+ {QK_USER_28, "QK_USER_28"},
+ {QK_USER_29, "QK_USER_29"},
+ {QK_USER_30, "QK_USER_30"},
+ {QK_USER_31, "QK_USER_31"},
};
diff --git a/users/talljoe/talljoe.h b/users/talljoe/talljoe.h
index 23dabdd8834..04d640b1eaf 100644
--- a/users/talljoe/talljoe.h
+++ b/users/talljoe/talljoe.h
@@ -123,7 +123,7 @@ enum layers {
#define H2_DEC KC_NO
#define S2_INC KC_NO
#define S2_DEC KC_NO
- #define FN_MO13 KC_NO
+ #define TL_LOWR KC_NO
#define FN_MO2 KC_NO
#endif