diff options
Diffstat (limited to 'users/talljoe')
-rw-r--r-- | users/talljoe/macros.c | 4 | ||||
-rw-r--r-- | users/talljoe/talljoe.c | 2 | ||||
-rw-r--r-- | users/talljoe/talljoe.h | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/users/talljoe/macros.c b/users/talljoe/macros.c index db8d28d4ce..e9c9b521b7 100644 --- a/users/talljoe/macros.c +++ b/users/talljoe/macros.c @@ -27,13 +27,13 @@ ostype_t get_os() { #define IS_OSX() (get_os() == MACOSX) -#define MOD_SEND(KEY) (IS_OSX() ? SEND_STRING(SS_LCMD(KEY)) : SEND_STRING(SS_LCTRL(KEY))) +#define MOD_SEND(KEY) (IS_OSX() ? SEND_STRING(SS_LCMD(KEY)) : SEND_STRING(SS_LCTL(KEY))) void macro_copy() { MOD_SEND("c"); } void macro_paste() { MOD_SEND("v"); } void macro_lock() { if (IS_OSX()) { - SEND_STRING(SS_LCTRL(SS_LCMD("q"))); + SEND_STRING(SS_LCTL(SS_LCMD("q"))); } else { SEND_STRING(SS_LGUI("l")); } diff --git a/users/talljoe/talljoe.c b/users/talljoe/talljoe.c index 6655170d4a..5e58bc9e3f 100644 --- a/users/talljoe/talljoe.c +++ b/users/talljoe/talljoe.c @@ -39,7 +39,7 @@ const char layer_names[32][16] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE] = TEMPLATE_TKL( - US_LOCK, 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_PSCR, KC_SLCK, MO_ADJ , + US_LOCK, 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_PSCR, KC_SCRL, MO_ADJ , US_GRV , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_MINS, KC_EQL , US_BSLS, KC_INS , KC_HOME, KC_PGUP, US_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_DEL , KC_END , KC_PGDN, CTL_ESC, KC_A, KC_S, KC_D, KC_F, KC_G , KC_H, KC_J, KC_K, KC_L, US_SCLN, KC_QUOT, US_ENT , diff --git a/users/talljoe/talljoe.h b/users/talljoe/talljoe.h index cdb01a9744..23dabdd883 100644 --- a/users/talljoe/talljoe.h +++ b/users/talljoe/talljoe.h @@ -176,9 +176,9 @@ enum layers { #ifndef TEMPLATE_RESET #define TEMPLATE_RESET TEMPLATE_ALT( \ - RESET , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET , \ - RESET , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET , \ + QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, \ + QK_BOOT, XXXXXXX, 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, XXXXXXX, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - RESET , XXXXXXX, XXXXXXX, XXXXXXX, RESET , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX) + QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX) #endif |