diff options
| author | Nick Brassel <nick@tzarc.org> | 2022-05-29 07:57:11 +1000 |
|---|---|---|
| committer | Nick Brassel <nick@tzarc.org> | 2022-05-29 07:57:11 +1000 |
| commit | b835171008eaeaa992a1b8e390af8bce6f5f0b8f (patch) | |
| tree | de22c239cc47556f8be7538f95f48ad75b86d110 /keyboards/cannonkeys/adelie | |
| parent | f5d091a9d58c8349437e9d52de87294258cbd256 (diff) | |
| parent | 0c8f78020d01ee5c45481d7d93b9b0d9f7b95103 (diff) | |
Merge branch 'develop' -- breaking changes 2022-05-28.
Diffstat (limited to 'keyboards/cannonkeys/adelie')
| -rw-r--r-- | keyboards/cannonkeys/adelie/keymaps/default/keymap.c | 2 | ||||
| -rw-r--r-- | keyboards/cannonkeys/adelie/keymaps/via/keymap.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/keyboards/cannonkeys/adelie/keymaps/default/keymap.c b/keyboards/cannonkeys/adelie/keymaps/default/keymap.c index 2698da36e5..757c6b56ac 100644 --- a/keyboards/cannonkeys/adelie/keymaps/default/keymap.c +++ b/keyboards/cannonkeys/adelie/keymaps/default/keymap.c @@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_POWER, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MPRV, KC_MNXT, KC_DEL, KC_VOLU, KC_SLEP, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_WAKE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_MUTE, - RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), [_FN3] = LAYOUT_all( diff --git a/keyboards/cannonkeys/adelie/keymaps/via/keymap.c b/keyboards/cannonkeys/adelie/keymaps/via/keymap.c index 2698da36e5..757c6b56ac 100644 --- a/keyboards/cannonkeys/adelie/keymaps/via/keymap.c +++ b/keyboards/cannonkeys/adelie/keymaps/via/keymap.c @@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_POWER, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MPRV, KC_MNXT, KC_DEL, KC_VOLU, KC_SLEP, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_WAKE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_MUTE, - RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), [_FN3] = LAYOUT_all( |