1
0
Fork 0

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

This commit is contained in:
QMK Bot 2021-07-23 04:24:47 +00:00
commit 750f40566a

View file

@ -98,7 +98,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |------+------+------+------+------+------| |------+------+------+------+------+------| * |------+------+------+------+------+------| |------+------+------+------+------+------|
* |LShift| 7 | 8 | 9 | 0 | |-------. ,-------| | | | | | | * |LShift| 7 | 8 | 9 | 0 | |-------. ,-------| | | | | | |
* |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------|
* |LCTRL | = | + | - | | | |-------| |-------| | | | | | | * |LCTRL | = | + | - | | | |-------| |-------| | | | | \ | |
* `-----------------------------------------/ / \ \-----------------------------------------' * `-----------------------------------------/ / \ \-----------------------------------------'
* | LGUI | LAlt |LOWER | / Space / \ Enter\ | Bksp |RAISE | Del | * | LGUI | LAlt |LOWER | / Space / \ Enter\ | Bksp |RAISE | Del |
* | | ||||||||/ / \ \ | | | | * | | ||||||||/ / \ \ | | | |
@ -108,7 +108,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, LT_1, LT_2, LT_3, LT_4, LT_5, LT_6, LT_7, LT_8, LT_9, LT_0, KC_GRV, _______, LT_1, LT_2, LT_3, LT_4, LT_5, LT_6, LT_7, LT_8, LT_9, LT_0, KC_GRV,
_______, LT_4, LT_5, LT_6, _______, _______, _______, _______, _______, _______, _______, _______, _______, LT_4, LT_5, LT_6, _______, _______, _______, _______, _______, _______, _______, _______,
_______, LT_7, LT_8, LT_9, LT_0, _______, _______, _______, _______, _______, _______, _______, _______, LT_7, LT_8, LT_9, LT_0, _______, _______, _______, _______, _______, _______, _______,
_______, LT_EQL, KC_PPLS, KC_PMNS, KC_PIPE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, LT_EQL, KC_PPLS, KC_PMNS, KC_PIPE, _______, _______, _______, _______, _______, _______, _______, KC_BSLS, _______,
_______, _______, _______, _______, _______, _______, _______, _______ _______, _______, _______, _______, _______, _______, _______, _______
), ),