aboutsummaryrefslogtreecommitdiff
path: root/keyboards/lime/keymaps/default/keymap.c
diff options
context:
space:
mode:
authorNick Brassel <[email protected]>2022-05-29 07:57:11 +1000
committerNick Brassel <[email protected]>2022-05-29 07:57:11 +1000
commitb835171008eaeaa992a1b8e390af8bce6f5f0b8f (patch)
treede22c239cc47556f8be7538f95f48ad75b86d110 /keyboards/lime/keymaps/default/keymap.c
parentf5d091a9d58c8349437e9d52de87294258cbd256 (diff)
parent0c8f78020d01ee5c45481d7d93b9b0d9f7b95103 (diff)
downloadqmk_firmware-b835171008eaeaa992a1b8e390af8bce6f5f0b8f.tar.gz
qmk_firmware-b835171008eaeaa992a1b8e390af8bce6f5f0b8f.zip
Merge branch 'develop' -- breaking changes 2022-05-28.0.17.0
Diffstat (limited to 'keyboards/lime/keymaps/default/keymap.c')
-rw-r--r--keyboards/lime/keymaps/default/keymap.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/keyboards/lime/keymaps/default/keymap.c b/keyboards/lime/keymaps/default/keymap.c
index 2d904d36db..3969514513 100644
--- a/keyboards/lime/keymaps/default/keymap.c
+++ b/keyboards/lime/keymaps/default/keymap.c
@@ -17,7 +17,6 @@
#include QMK_KEYBOARD_H
#ifdef JOYSTICK_ENABLE
-# include "joystick.h"
# include "analog.h"
#endif
@@ -143,7 +142,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* ADJUST
* ,-----------------------------------------. ,-----------------------------------------.
- * | RESET| | | | | | | | | | | | |
+ * | QK_BOOT| | | | | | | | | | | | |
* |------+------+------+------+------+------| |------+------+------+------+------+------|
* | |QWERTY| | | | | | | | | | | |
* |------+------+------+------+------+------| |------+------+------+------+------+------|
@@ -156,7 +155,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `----------------------------------------' '------''----------------------------------'
*/
[_ADJUST] = LAYOUT(
- RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+ QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, KC_QWERTY, XXXXXXX, XXXXXXX, CG_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, KC_JOYSTICK_DEBUG,XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLD, KC_MUTE, KC_VOLU, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, KC_COLEMAK, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX,