diff options
| author | Drashna Jael're <drashna@live.com> | 2022-11-13 17:51:56 -0800 |
|---|---|---|
| committer | Drashna Jael're <drashna@live.com> | 2022-11-13 17:51:56 -0800 |
| commit | bed5e1abf5e136d0e70a149f90110abbe8262dba (patch) | |
| tree | ff07cfb0fd6c91c1e55c8f45683ba93774bbddde /keyboards/nixkeyboards | |
| parent | 0719d68b205ecffd8f93dee07b7dd07d8bc8c615 (diff) | |
| parent | ee7426e7b19c25ddfc53d0b50db68a457d8f992b (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/nixkeyboards')
| -rw-r--r--[-rwxr-xr-x] | keyboards/nixkeyboards/day_off/day_off.c | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | keyboards/nixkeyboards/day_off/day_off.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | keyboards/nixkeyboards/day_off/info.json | 0 | ||||
| -rw-r--r-- | keyboards/nixkeyboards/day_off/keymaps/default/keymap.c | 16 | ||||
| -rw-r--r-- | keyboards/nixkeyboards/day_off/readme.md | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | keyboards/nixkeyboards/day_off/rules.mk | 0 |
6 files changed, 9 insertions, 9 deletions
diff --git a/keyboards/nixkeyboards/day_off/day_off.c b/keyboards/nixkeyboards/day_off/day_off.c index 2694682f09..2694682f09 100755..100644 --- a/keyboards/nixkeyboards/day_off/day_off.c +++ b/keyboards/nixkeyboards/day_off/day_off.c diff --git a/keyboards/nixkeyboards/day_off/day_off.h b/keyboards/nixkeyboards/day_off/day_off.h index f890b837e6..f890b837e6 100755..100644 --- a/keyboards/nixkeyboards/day_off/day_off.h +++ b/keyboards/nixkeyboards/day_off/day_off.h diff --git a/keyboards/nixkeyboards/day_off/info.json b/keyboards/nixkeyboards/day_off/info.json index 0c57be6e82..0c57be6e82 100755..100644 --- a/keyboards/nixkeyboards/day_off/info.json +++ b/keyboards/nixkeyboards/day_off/info.json diff --git a/keyboards/nixkeyboards/day_off/keymaps/default/keymap.c b/keyboards/nixkeyboards/day_off/keymaps/default/keymap.c index 61e879eb4f..4718f49798 100644 --- a/keyboards/nixkeyboards/day_off/keymaps/default/keymap.c +++ b/keyboards/nixkeyboards/day_off/keymaps/default/keymap.c @@ -17,35 +17,35 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_all( - KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_MPLY, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_MNXT, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_BSLS, - KC_MPRV, KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_SPC, KC_RGUI, KC_RALT, KC_APP, KC_RCTL, RESET + KC_MPRV, KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_SPC, KC_RGUI, KC_RALT, KC_APP, KC_RCTL, QK_BOOT ), [1] = LAYOUT_all( - RESET, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + QK_BOOT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_MPLY, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_MNXT, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_BSLS, - KC_MPRV, KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_SPC, KC_RGUI, KC_RALT, KC_APP, KC_RCTL, RESET + KC_MPRV, KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_SPC, KC_RGUI, KC_RALT, KC_APP, KC_RCTL, QK_BOOT ), [2] = LAYOUT_all( - KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_MPLY, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_MNXT, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_BSLS, - KC_MPRV, KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_SPC, KC_RGUI, KC_RALT, KC_APP, KC_RCTL, RESET + KC_MPRV, KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_SPC, KC_RGUI, KC_RALT, KC_APP, KC_RCTL, QK_BOOT ), [3] = LAYOUT_all( - KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_MPLY, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_MNXT, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_BSLS, - KC_MPRV, KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_SPC, KC_RGUI, KC_RALT, KC_APP, KC_RCTL, RESET + KC_MPRV, KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_SPC, KC_RGUI, KC_RALT, KC_APP, KC_RCTL, QK_BOOT ), }; diff --git a/keyboards/nixkeyboards/day_off/readme.md b/keyboards/nixkeyboards/day_off/readme.md index 78871fe49d..74d48ca60e 100644 --- a/keyboards/nixkeyboards/day_off/readme.md +++ b/keyboards/nixkeyboards/day_off/readme.md @@ -20,4 +20,4 @@ Enter the bootloader in 3 ways: * **Bootmagic reset**: Hold down the key at (0,1) in the matrix (usually the top left key or Escape) and plug in the keyboard * **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead -* **Keycode in layout**: Press the key mapped to `RESET` if it is available +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/nixkeyboards/day_off/rules.mk b/keyboards/nixkeyboards/day_off/rules.mk index 05e63bf5b8..05e63bf5b8 100755..100644 --- a/keyboards/nixkeyboards/day_off/rules.mk +++ b/keyboards/nixkeyboards/day_off/rules.mk |