VIA Protocol 12 + fixes (#19916)

Co-authored-by: Wilba <wilba@wilba.tech>
Co-authored-by: zvecr <git@zvecr.com>
This commit is contained in:
Nick Brassel
2023-02-23 09:19:00 +11:00
committed by GitHub
parent 403b0addea
commit 7f805cc779
135 changed files with 761 additions and 572 deletions

View File

@@ -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;
}

View File

@@ -0,0 +1 @@
TRI_LAYER_ENABLE = yes

View File

@@ -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

View File

@@ -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
),
/*

View File

@@ -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)

View File

@@ -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

View File

@@ -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
),
/*

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______

View File

@@ -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, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______