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

Jump to bottom

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 6 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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions builddefs/generic_features.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

SPACE_CADET_ENABLE ?= yes
GRAVE_ESC_ENABLE ?= yes
TRI_LAYER_ENABLE ?= yes
wilba marked this conversation as resolved.
Show resolved Hide resolved

GENERIC_FEATURES = \
AUTOCORRECT \
Expand All @@ -39,6 +40,7 @@ GENERIC_FEATURES = \
VELOCIKEY \
WPM \
DYNAMIC_TAPPING_TERM \
TRI_LAYER \

define HANDLE_GENERIC_FEATURE
# $$(info "Processing: $1_ENABLE $2.c")
Expand Down
14 changes: 14 additions & 0 deletions data/constants/keycodes/keycodes_0.0.1_quantum.hjson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,6 +507,20 @@
"aliases": [
"AC_TOGG"
]
},
wilba marked this conversation as resolved.
Show resolved Hide resolved
"0x7C77": {
"group": "quantum",
"key": "QK_TRI_LAYER_1_3",
"aliases": [
"FN_MO13"
]
},
"0x7C78": {
"group": "quantum",
"key": "QK_TRI_LAYER_2_3",
"aliases": [
"FN_MO23"
]
}
}
}
132 changes: 132 additions & 0 deletions data/constants/keycodes/keycodes_0.0.1_user.hjson
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
{
wilba marked this conversation as resolved.
Show resolved Hide resolved
"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",
},
}
}
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_USER_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_USER_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_USER_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_USER_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_USER_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
6 changes: 3 additions & 3 deletions keyboards/dm9records/lain/keymaps/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] = {
),
[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
),
Expand All @@ -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:
// via user keycode QK_USER : toggle leds enable
if (record->event.pressed) {
lain_enable_leds_toggle();
}
Expand Down
2 changes: 1 addition & 1 deletion keyboards/dm9records/lain/keymaps/via/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
2-3: Layor indicator

## Via user keycode
USER00 : toggle leds enable
USER(0) : toggle leds enable
11 changes: 1 addition & 10 deletions keyboards/durgod/dgk6x/dgk6x.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,8 @@
#ifndef WINLOCK_DISABLED
// Define the TGUI key here so it is available in QMK configurator
enum DGK6X_keycodes {
#ifdef VIA_ENABLE
KC_TGUI = USER00, // Toggle between GUI Lock or Unlock
NEW_SAFE_RANGE = SAFE_RANGE
#else
KC_TGUI = SAFE_RANGE, // Toggle between GUI Lock or Unlock
NEW_SAFE_RANGE
#endif
KC_TGUI = QK_USER_0, // Toggle between GUI Lock or Unlock
};

#undef SAFE_RANGE
#define SAFE_RANGE NEW_SAFE_RANGE
#endif /* WINLOCK_DISABLED */

/* Function Prototype */
Expand Down
11 changes: 1 addition & 10 deletions keyboards/durgod/k310/k310.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,17 +82,8 @@
#ifndef WINLOCK_DISABLED
// Define the TGUI key here so it is available in QMK configurator
enum K3x0_keycodes {
#ifdef VIA_ENABLE
KC_TGUI = USER00, // Toggle between GUI Lock or Unlock
NEW_SAFE_RANGE = SAFE_RANGE
#else
KC_TGUI = SAFE_RANGE, // Toggle between GUI Lock or Unlock
NEW_SAFE_RANGE
#endif
KC_TGUI = QK_USER_0, // Toggle between GUI Lock or Unlock
};

#undef SAFE_RANGE
#define SAFE_RANGE NEW_SAFE_RANGE
#endif /* WINLOCK_DISABLED */

/* Function Prototype */
Expand Down
11 changes: 1 addition & 10 deletions keyboards/durgod/k320/k320.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,17 +79,8 @@
#ifndef WINLOCK_DISABLED
// Define the TGUI key here so it is available in QMK configurator
enum K3x0_keycodes {
#ifdef VIA_ENABLE
KC_TGUI = USER00, // Toggle between GUI Lock or Unlock
NEW_SAFE_RANGE = SAFE_RANGE
#else
KC_TGUI = SAFE_RANGE, // Toggle between GUI Lock or Unlock
NEW_SAFE_RANGE
#endif
KC_TGUI = QK_USER_0, // Toggle between GUI Lock or Unlock
};

#undef SAFE_RANGE
#define SAFE_RANGE NEW_SAFE_RANGE
#endif /* WINLOCK_DISABLED */

/* Function Prototype */
Expand Down
2 changes: 1 addition & 1 deletion keyboards/flygone60/rev3/keymaps/via/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_USER_0,
NUT,
FRACNO
};
Expand Down
4 changes: 2 additions & 2 deletions keyboards/geekboards/macropad_v2/keymaps/via/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_USER_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(
Expand Down
2 changes: 1 addition & 1 deletion keyboards/giabalanai/keymaps/via/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ enum custom_keycodes {

MY_CHORD_MAX = MI_CH_BDim7,

VERSION = USER00
VERSION = QK_USER_0
};

#define MY_CHORD_COUNT (MY_CHORD_MAX - MY_CHORD_MIN + 1)
Expand Down
2 changes: 1 addition & 1 deletion keyboards/giabalanai/keymaps/via_giabarinaix2/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ enum custom_keycodes {

MY_CHORD_MAX = MI_CH_BDim7,

VERSION = USER00
VERSION = QK_USER_0
};

#define MY_CHORD_COUNT (MY_CHORD_MAX - MY_CHORD_MIN + 1)
Expand Down
6 changes: 1 addition & 5 deletions keyboards/handwired/tractyl_manuform/tractyl_manuform.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_USER_0,
POINTER_DEFAULT_DPI_REVERSE,
POINTER_SNIPING_DPI_FORWARD,
POINTER_SNIPING_DPI_REVERSE,
Expand Down
6 changes: 1 addition & 5 deletions keyboards/hardwareabstraction/handwire/handwire.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_USER_0,
KC_HPTOFF,
KC_HPTTOG,
KC_HPTRST,
Expand Down
2 changes: 1 addition & 1 deletion keyboards/hardwareabstraction/handwire/keymaps/via/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include QMK_KEYBOARD_H

enum custom_keycodes{
KC_HPTON = USER00,
KC_HPTON = QK_USER_0,
KC_HPTOFF,
KC_HPTTOG,
KC_HPTRST,
Expand Down