Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

VIA Protocol 12 #19697

Merged
merged 21 commits into from
Feb 22, 2023
Merged

VIA Protocol 12 #19697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
fe7dbc7
Refactored keycodes, switch matrix state
wilba Jan 21, 2023
523f7e2
fix build errors
wilba Jan 24, 2023
8f7a830
increase QK_USER_XX
wilba Jan 26, 2023
da47419
Refactor WT RGB keycodes to QK_USER_xx keycodes
wilba Jan 27, 2023
fc489ab
Merge branch 'develop' into via_protocol_12
wilba Jan 27, 2023
46dfd21
formatting
wilba Jan 28, 2023
0eaabe8
formatting
wilba Jan 28, 2023
0869824
review changes
wilba Jan 28, 2023
cb8e59b
use QK_KB_0 instead of QK_USER_0
wilba Jan 28, 2023
ea8188a
fix keycodes.h generation
wilba Jan 28, 2023
4842c8c
change SAFE_RANGE to range
wilba Jan 28, 2023
d7e2aee
Merge branch 'develop' into via_protocol_12
wilba Jan 31, 2023
b2b9ab1
Merge branch 'develop' into via_protocol_12
wilba Feb 12, 2023
e9e83d5
replace FN_MO13/FN_MO23 with TL_LOWR/TL_UPPR
wilba Feb 12, 2023
36856a0
regenerate keycodes.h
wilba Feb 12, 2023
2d2fd4f
review changes
wilba Feb 13, 2023
e428c66
run util/regen.sh
wilba Feb 14, 2023
3b70c5c
review changes
wilba Feb 20, 2023
939f63c
Merge branch 'develop' into via_protocol_12
wilba Feb 20, 2023
cd396a4
add VIA device indication handler, minor fix to indicators
wilba Feb 20, 2023
587c744
Merge branch 'develop' into via_protocol_12
wilba Feb 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions data/constants/keycodes/keycodes_0.0.2.hjson
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"ranges": {
"0x7E00/0x01FF": {
"define": "SAFE_RANGE"
}
"0x8000/0X3FFF": {
"define": "QK_UNICODEMAP"
},
Expand Down
132 changes: 132 additions & 0 deletions data/constants/keycodes/keycodes_0.0.2_kb.hjson
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
},
}
}
132 changes: 132 additions & 0 deletions data/constants/keycodes/keycodes_0.0.2_user.hjson
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
},
}
}
4 changes: 2 additions & 2 deletions keyboards/acheron/shark/alpha/keymaps/via/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion keyboards/bandominedoni/keymaps/via/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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] = {
Expand Down
6 changes: 1 addition & 5 deletions keyboards/bastardkb/charybdis/charybdis.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 1 addition & 5 deletions keyboards/bastardkb/dilemma/dilemma.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion keyboards/cannonkeys/satisfaction75/satisfaction75.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
};
Expand Down
2 changes: 1 addition & 1 deletion keyboards/chromatonemini/keymaps/via/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion keyboards/crkbd/keymaps/mb_via/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
//`--------------------------' `--------------------------'

),
Expand Down
2 changes: 1 addition & 1 deletion keyboards/crkbd/keymaps/via/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
//`--------------------------' `--------------------------'

),
Expand Down
2 changes: 1 addition & 1 deletion keyboards/delikeeb/flatbread60/keymaps/via/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion keyboards/delikeeb/vaneela/keymaps/via/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion keyboards/delikeeb/vaneelaex/keymaps/via/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading