aboutsummaryrefslogtreecommitdiff
path: root/users
diff options
context:
space:
mode:
authorZach White <skullydazed@gmail.com>2021-01-16 18:43:13 -0800
committerZach White <skullydazed@drpepper.org>2021-01-30 13:11:33 -0800
commit424d59bc7e17da50424f8fcce6244de39b45e644 (patch)
tree84cd5e3acf952992e1af0dcf28bdc1c1ba14baa5 /users
parent2f79cf9247d9388b0ae7e149e9b597f43bb87e2d (diff)
downloadqmk_firmware-424d59bc7e17da50424f8fcce6244de39b45e644.tar.gz
qmk_firmware-424d59bc7e17da50424f8fcce6244de39b45e644.zip
rename callum's custom keycode that conflicts with a LUFA define
Diffstat (limited to 'users')
-rw-r--r--users/callum/callum.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/users/callum/callum.c b/users/callum/callum.c
index 4661902af..b3254a9cf 100644
--- a/users/callum/callum.c
+++ b/users/callum/callum.c
@@ -10,7 +10,7 @@
10#define TABL G(S(KC_LBRC)) 10#define TABL G(S(KC_LBRC))
11#define TABR G(S(KC_RBRC)) 11#define TABR G(S(KC_RBRC))
12#define SPCL A(G(KC_LEFT)) 12#define SPCL A(G(KC_LEFT))
13#define SPCR A(G(KC_RGHT)) 13#define SPC_R A(G(KC_RGHT))
14#define LA_SYM MO(SYM) 14#define LA_SYM MO(SYM)
15#define LA_NAV MO(NAV) 15#define LA_NAV MO(NAV)
16 16
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
50 [NAV] = LAYOUT_callum( 50 [NAV] = LAYOUT_callum(
51 KC_TAB, SW_WIN, TABL, TABR, KC_VOLU, RESET, HOME, KC_UP, END, KC_DEL, 51 KC_TAB, SW_WIN, TABL, TABR, KC_VOLU, RESET, HOME, KC_UP, END, KC_DEL,
52 OS_SHFT, OS_CTRL, OS_ALT, OS_CMD, KC_VOLD, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC, 52 OS_SHFT, OS_CTRL, OS_ALT, OS_CMD, KC_VOLD, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC,
53 SPCL, SPCR, BACK, FWD, KC_MPLY, XXXXXXX, KC_PGDN, KC_PGUP, SW_LANG, KC_ENT, 53 SPCL, SPC_R, BACK, FWD, KC_MPLY, XXXXXXX, KC_PGDN, KC_PGUP, SW_LANG, KC_ENT,
54 _______, _______, _______, _______ 54 _______, _______, _______, _______
55 ), 55 ),
56 56