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

This commit is contained in:
QMK Bot 2022-08-04 00:22:37 +00:00
commit 171862fd5e
2 changed files with 8 additions and 8 deletions

View file

@ -16,22 +16,22 @@
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT( /* Base */ [0] = LAYOUT_ortho_3x3( /* Base */
KC_1, KC_2, KC_3, KC_1, KC_2, KC_3,
KC_4, KC_5, KC_6, KC_4, KC_5, KC_6,
KC_VOLD, KC_VOLU, MO(1) KC_VOLD, KC_VOLU, MO(1)
), ),
[1] = LAYOUT( [1] = LAYOUT_ortho_3x3(
KC_7, KC_8, KC_9, KC_7, KC_8, KC_9,
KC_0, KC_MINUS, KC_PLUS, KC_0, KC_MINUS, KC_PLUS,
RESET, KC_AT , KC_TRNS RESET, KC_AT , KC_TRNS
), ),
[2] = LAYOUT( [2] = LAYOUT_ortho_3x3(
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
), ),
[3] = LAYOUT( [3] = LAYOUT_ortho_3x3(
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

View file

@ -16,22 +16,22 @@
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT( /* Base */ [0] = LAYOUT_ortho_3x3( /* Base */
KC_1, KC_2, KC_3, KC_1, KC_2, KC_3,
KC_4, KC_5, KC_6, KC_4, KC_5, KC_6,
KC_VOLD, KC_VOLU, MO(1) KC_VOLD, KC_VOLU, MO(1)
), ),
[1] = LAYOUT( [1] = LAYOUT_ortho_3x3(
KC_7, KC_8, KC_9, KC_7, KC_8, KC_9,
KC_0, KC_MINUS, KC_PLUS, KC_0, KC_MINUS, KC_PLUS,
RESET, KC_AT , KC_TRNS RESET, KC_AT , KC_TRNS
), ),
[2] = LAYOUT( [2] = LAYOUT_ortho_3x3(
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
), ),
[3] = LAYOUT( [3] = LAYOUT_ortho_3x3(
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