Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot
2022-08-07 01:24:34 +00:00
242 changed files with 313 additions and 313 deletions

View File

@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |------------------------------------------------------------------------------|
* |BINC |BDEC|BTOG| | | | | | | | | | | |
* |------------------------------------------------------------------------------|
* | | | | | | |RESET |
* | | | | | | |QK_BOOT |
* `------------------------------------------------------------------------------'
*/
[1] = LAYOUT_60_tsangan_hhkb(
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
BL_INC, BL_DEC, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, RESET
_______, _______, _______, _______, _______, _______, QK_BOOT
),
/* Main Numbers, Symbols & Function Layer
@@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |------------------------------------------------------------------------------|
* |BINC |BDEC|BTOG| | | | | | | | | | | |
* |------------------------------------------------------------------------------|
* | | | | | | |RESET |
* | | | | | | |QK_BOOT |
* `------------------------------------------------------------------------------'
*/
[2] = LAYOUT_60_tsangan_hhkb(
@@ -80,6 +80,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
BL_INC, BL_DEC, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, RESET
_______, _______, _______, _______, _______, _______, QK_BOOT
)
};