summaryrefslogtreecommitdiff
path: root/keyboards/nix_studio
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-08-07 01:24:34 +0000
committerQMK Bot <hello@qmk.fm>2022-08-07 01:24:34 +0000
commit93914142a34cae684454d16df9d0ac247bd2b88a (patch)
treeb1607de9b3ab546ab02833ce3c65c612e95fe53f /keyboards/nix_studio
parentc5844931e2240afe3ef90fc6b4f20a4f1140a984 (diff)
parentc6ad38e79f14f641f2b0a2ababe120d3b12a68c2 (diff)
downloadqmk_firmware-93914142a34cae684454d16df9d0ac247bd2b88a.tar.gz
qmk_firmware-93914142a34cae684454d16df9d0ac247bd2b88a.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/nix_studio')
-rw-r--r--keyboards/nix_studio/n60_a/keymaps/default/keymap.c2
-rw-r--r--keyboards/nix_studio/n60_a/keymaps/via/keymap.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/keyboards/nix_studio/n60_a/keymaps/default/keymap.c b/keyboards/nix_studio/n60_a/keymaps/default/keymap.c
index 7c6e9cbcfc..e49120a5c0 100644
--- a/keyboards/nix_studio/n60_a/keymaps/default/keymap.c
+++ b/keyboards/nix_studio/n60_a/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[1] = LAYOUT(
KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TILD, KC_DEL,
- _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,
+ _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/nix_studio/n60_a/keymaps/via/keymap.c b/keyboards/nix_studio/n60_a/keymaps/via/keymap.c
index f31f1c9135..166fc4c3ed 100644
--- a/keyboards/nix_studio/n60_a/keymaps/via/keymap.c
+++ b/keyboards/nix_studio/n60_a/keymaps/via/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[1] = LAYOUT(
KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TILD, KC_DEL,
- _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,
+ _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______