diff options
| author | Nick Brassel <nick@tzarc.org> | 2022-08-28 14:23:01 +1000 |
|---|---|---|
| committer | Nick Brassel <nick@tzarc.org> | 2022-08-28 14:23:01 +1000 |
| commit | 0a3f7e48690bb2b7b008300a54554979a55be19a (patch) | |
| tree | 7499d52f20040ed7d5a56496ecb81ed114f80719 /keyboards/bajjak | |
| parent | fc0bf67f372c38f72c303cdec21b1d4afb5e8cb4 (diff) | |
| parent | 9b5b0722555891ba94f240760ef3a6d4c870fd13 (diff) | |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/bajjak')
| -rw-r--r-- | keyboards/bajjak/keymaps/5x6/keymap.c | 4 | ||||
| -rw-r--r-- | keyboards/bajjak/keymaps/default/keymap.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/keyboards/bajjak/keymaps/5x6/keymap.c b/keyboards/bajjak/keymaps/5x6/keymap.c index e97d0360b7..01b3383780 100644 --- a/keyboards/bajjak/keymaps/5x6/keymap.c +++ b/keyboards/bajjak/keymaps/5x6/keymap.c @@ -103,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |--------+------+------+------+------+------| |------+------+------+------+------+--------| * | | | Lclk | MsUp | Rclk |MsWhUp| | | | | | | | * |--------+------+------+------+------+------| |------+------+------+------+------+--------| - * | RESET | |MsLeft|MsDown|MsRght|MsWhDw| | | | | | | | + * | QK_BOOT | |MsLeft|MsDown|MsRght|MsWhDw| | | | | | | | * |--------+------+------+------+------+------| |------|------+------+------+------+--------| * | LShift | |MsWhL | |MsWhR | | | | | | | | RShift | * ------------------------------------------- ------------------------------------------- @@ -123,7 +123,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_SLEP, KC_BRID, KC_BRIU, XXXXXXX, XXXXXXX, XXXXXXX, KC_EJCT, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, XXXXXXX, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - RESET, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + QK_BOOT, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, KC_WH_L, XXXXXXX, KC_WH_R, XXXXXXX, DF(SYMB), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, XXXXXXX, DF(BASE), _______, _______, _______, _______, diff --git a/keyboards/bajjak/keymaps/default/keymap.c b/keyboards/bajjak/keymaps/default/keymap.c index 4c79261307..3bed2c52e7 100644 --- a/keyboards/bajjak/keymaps/default/keymap.c +++ b/keyboards/bajjak/keymaps/default/keymap.c @@ -113,7 +113,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |--------+------+------+------+------+------+------' `------+------+------+------+------+------+--------| * | LShift | |MsWhL | |MsWhR | | | | | | | | | * `--------+------+------+------+------+------' `-----+------+------+------+------+-------' - * | CTRL |GUI\'"|ALT \ | Left | Right| | Up | Down | | | RESET | + * | CTRL |GUI\'"|ALT \ | Left | Right| | Up | Down | | | QK_BOOT | * `----------------------------------' `----------------------------------' * ,-------------. ,-------------. * |Ctrl/ESC|LALT| | RGUI |Ctrl/Alt| @@ -131,7 +131,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, _______, _______, _______, _______, _______, _______, _______, _______, KC_CAPS, _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, _______, _______, _______, _______, _______, _______, _______, KC_LSFT, _______, KC_WH_L, _______, KC_WH_R, _______, _______, _______, _______, _______, _______, _______, - KC_LCTRL, KC_LGUI, ALT_T(KC_INSERT), KC_LEFT, KC_RGHT, KC_UP, KC_DOWN, _______, _______, RESET, + KC_LCTRL, KC_LGUI, ALT_T(KC_INSERT), KC_LEFT, KC_RGHT, KC_UP, KC_DOWN, _______, _______, QK_BOOT, CTL_T(KC_ESC), KC_LALT, KC_RGUI, CTL_T(KC_RALT), KC_HOME, KC_PGUP, KC_BSPC, KC_DEL, KC_END, KC_PGDN, KC_ENT, KC_SPC |