More work on common layout.

pull/2764/head
Joe Wasson 7 years ago
parent d524df11b6
commit 56010bf855

@ -1,12 +1,11 @@
#ifndef CONFIG_USER_H
#define CONFIG_USER_H
#include "../../config.h"
#include QMK_KEYBOARD_CONFIG_H
#define PREVENT_STUCK_MODIFIERS
#define SPACE_COUNT 3
#define KM( \
#define LAYOUT( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \

@ -1,61 +1 @@
#include "bananasplit.h"
#include "talljoe.h"
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BASE] = KM_(
KC_ESC , 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_BSLS, KC_GRV,
KC_TAB , _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_LBRC, KC_RBRC, KC_BSPC,
US_CAPS, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, US_QUOT, KC_ENT ,
KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_RSFT, AD_GRV ,
_________MODS_L__________, KC_SPC1, KC_SPC2, KC_SPC3, ______________MODS_R______________),
[_WORKMAN] = KM_(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _________________WORKMAN_L1________________, _________________WORKMAN_R1________________, _______, _______, _______,
_______, _________________WORKMAN_L2________________, _________________WORKMAN_R2________________, _______, _______,
_______, _________________WORKMAN_L3________________, _________________WORKMAN_R3________________, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
[_NORMAN] = KM_(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _________________NORMAN_L1_________________, _________________NORMAN_R1_________________, _______, _______, _______,
_______, _________________NORMAN_L2_________________, _________________NORMAN_R2_________________, _______, _______,
_______, _________________NORMAN_L3_________________, _________________NORMAN_R3_________________, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
[_DVORAK] = KM_(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, _______, _______,
_______, _________________DVORAK_L1_________________, _________________DVORAK_R1_________________, KC_SLSH, KC_EQL , _______,
_______, _________________DVORAK_L2_________________, _________________DVORAK_R2_________________, US_MINS, _______,
_______, _________________DVORAK_L3_________________, _________________DVORAK_R3_________________, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
[_COLMAK] = KM_(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _________________COLEMAK_L1________________, _________________COLEMAK_R1________________, _______, _______, _______,
_______, _________________COLEMAK_L2________________, _________________COLEMAK_R2________________, _______, _______,
_______, _________________COLEMAK_L3________________, _________________COLEMAK_R3________________, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
[_GAME] = KM_(
KC_ESC , 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_BSLS, KC_GRV,
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,
MO_NAV , KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_QUOT, KC_ENT ,
KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO_ADJ ,
KC_LCTL, KC_PTT , KC_PGDN, KC_SPC , KC_SPC , KC_SPC , KC_RALT, KC_RGUI, KC_RCTL, KC_PTT ),
[_NAV] = KM_(
KC_GRV , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
KC_TAB , ________________NAVLAYER_L1________________, ________________NAVLAYER_R1________________, XXXXXXX, XXXXXXX, KC_DEL ,
US_CAPS, ________________NAVLAYER_L2________________, ________________NAVLAYER_R2________________, XXXXXXX, TG_ADJ ,
KC_LSFT, ________________NAVLAYER_L3________________, ________________NAVLAYER_R3________________, KC_RSFT, XXXXXXX,
_________MODS_L__________, NV_SPC1, NV_SPC2, NV_SPC3, ______________MODS_R______________),
// Adjust layer is on the split-shift key; or NAV+Enter (for non-split keyboards)
[_ADJUST] = KM_(
MO_RST , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, ________________ADJLAYER_L1________________, ________________ADJLAYER_R1________________, XXXXXXX, XXXXXXX, KC_DEL ,
XXXXXXX, ________________ADJLAYER_L2________________, ________________ADJLAYER_R2________________, XXXXXXX, TG_ADJ ,
TG_NKRO, ________________ADJLAYER_L3________________, ________________ADJLAYER_R3________________, KC_RSFT, XXXXXXX,
MO_RST , AG_NORM, AG_SWAP, XXXXXXX, BL_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_CAPS),
// To Reset hit FN + ` + Esc
[_RESET] = KM_(
RESET , 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, 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, XXXXXXX, XXXXXXX,
RESET , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX),
};
// This space intentionally left blank

@ -1,7 +0,0 @@
#ifndef COMMON_CORE_H
#define COMMON_CORE_H
//TODO: Replace with macro to support optional keys and map to layout.
#define COMMON_KEYMAP LAYOUT_60_ansi_split_bs_rshift
#endif //COMMON_CORE_H

@ -3,8 +3,20 @@
#include QMK_KEYBOARD_CONFIG_H
#define PREVENT_STUCK_MODIFIERS
#define ENABLE_GAME_LAYER
#define KM LAYOUT_60_ansi_split_bs_rshift
#define LAYOUT( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
K40, K41, K42, K44, K45, K46, K48, K49, K4B, K4C \
) LAYOUT_60_ansi_split_bs_rshift( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
K40, K41, K42, K45, K48, K49, K4B, K4C \
)
#endif //CONFIG_USER_H

@ -0,0 +1 @@
// This space intentionally left blank

@ -1,18 +0,0 @@
#ifndef COMMON_CORE_H
#define COMMON_CORE_H
#define COMMON_KEYMAP( \
K00, K10, K20, K30, K40, K50, K60, K70, K80, K01, K11, K21, K31, K41, K86, \
K51, K61, K71, K81, K02, K12, K22, K32, K42, K52, K62, K72, K82, K03, \
K13, K23, K33, K43, K53, K63, K73, K83, K04, K14, K24, K34, K44, \
K54, K64, K74, K84, K05, K15, K25, K35, K45, K55, K65, K75, K85, \
K06, K16, K26, K36, K46, K56, K66, K76 \
)\
{ \
{ K51, K61, K71, K81, K02, K12, K22, K32, K42, K52, K62, K41 }, \
{ K13, K23, K33, K43, K53, K63, K73, K83, K04, K14, K24, K34 }, \
{ K54, K64, K74, K84, K05, K15, K25, K35, K45, K55, K65, K75 }, \
{ K06, K16, K26, K44, K86, K36, K36, K32, K46, K56, K66, K76 }, \
}
#endif //COMMON_CORE_H

@ -2,7 +2,21 @@
#define CONFIG_USER_H
#include QMK_KEYBOARD_CONFIG_H
#define SPACE_COUNT 3
#define LAYOUT( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
K40, K41, K42, K44, K45, K46, K48, K49, K4B, K4C \
) \
LAYOUT_ortho_4x12( \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1D, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \
K40, K41, K0D, K42, K44, K45, K45, K46, K48, K49, K4B, K4C \
)
#define PREVENT_STUCK_MODIFIERS
#endif //CONFIG_USER_H

@ -0,0 +1 @@
// This space intentionally left blank

@ -0,0 +1,7 @@
#ifndef USERSPACE_CONFIG_H
#define USERSPACE_CONFIG_H
#define PREVENT_STUCK_MODIFIERS
#define IGNORE_MOD_TAP_INTERRUPT
#endif // !USERSPACE_CONFIG_H

@ -1 +1,5 @@
SRC += talljoe.c
ifneq ("$(wildcard users/$(KEYMAP)/config.h)","")
CONFIG_H += users/$(KEYMAP)/config.h
endif

@ -1,65 +1,67 @@
#include QMK_KEYBOARD_H
#include "talljoe.h"
#include "common_core.h"
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BASE] = KM_(
[_BASE] = LAYOUT(
KC_ESC , 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_BSLS, KC_GRV,
KC_TAB , _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_LBRC, KC_RBRC, KC_BSPC,
US_CAPS, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, US_QUOT, KC_ENT ,
KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_RSFT, AD_GRV ,
_________MODS_L__________, KC_SPC1, ______________MODS_R______________),
[_WORKMAN] = KM_(
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,
US_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G , KC_H, KC_J, KC_K, KC_L, KC_SCLN, US_QUOT, KC_ENT ,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B , KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, AD_GRV ,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC2, KC_SPC1, KC_SPC3, KC_RALT, KC_RGUI, KC_RCTL, KC_PTT ),
[_WORKMAN] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _________________WORKMAN_L1________________, _________________WORKMAN_R1________________, _______, _______, _______,
_______, _________________WORKMAN_L2________________, _________________WORKMAN_R2________________, _______, _______,
_______, _________________WORKMAN_L3________________, _________________WORKMAN_R3________________, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______),
[_NORMAN] = KM_(
_______, KC_Q , KC_D , KC_R , KC_W , KC_B , KC_J , KC_F , KC_U , KC_P , KC_SCLN, _______, _______, _______,
_______, KC_A , KC_S , KC_H , KC_T , KC_G , KC_Y , KC_N , KC_E , KC_O , KC_I , _______, _______,
_______, KC_Z , KC_X , KC_M , KC_C , KC_V , KC_K , KC_L , KC_COMM, KC_DOT , KC_SLSH, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
[_NORMAN] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _________________NORMAN_L1_________________, _________________NORMAN_R1_________________, _______, _______, _______,
_______, _________________NORMAN_L2_________________, _________________NORMAN_R2_________________, _______, _______,
_______, _________________NORMAN_L3_________________, _________________NORMAN_R3_________________, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______),
[_DVORAK] = KM_(
_______, KC_Q , KC_W , KC_D , KC_F , KC_K , KC_J , KC_U , KC_R , KC_L , KC_SCLN, _______, _______, _______,
_______, KC_A , KC_S , KC_E , KC_T , KC_G , KC_Y , KC_N , KC_I , KC_O , KC_H , _______, _______,
_______, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_P , KC_M , KC_COMM, KC_DOT , KC_SLSH, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
[_DVORAK] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, _______, _______,
_______, _________________DVORAK_L1_________________, _________________DVORAK_R1_________________, KC_SLSH, KC_EQL , _______,
_______, _________________DVORAK_L2_________________, _________________DVORAK_R2_________________, US_MINS, _______,
_______, _________________DVORAK_L3_________________, _________________DVORAK_R3_________________, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______),
[_COLMAK] = KM_(
_______, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y , KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_EQL , _______,
_______, KC_A, KC_O, KC_E, KC_U, KC_I , KC_D, KC_H, KC_T, KC_N, KC_S, US_MINS, _______,
_______, KC_SCLN, KC_Q, KC_J, KC_K, KC_X , KC_B, KC_M, KC_W, KC_V, KC_Z, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
[_COLMAK] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _________________COLEMAK_L1________________, _________________COLEMAK_R1________________, _______, _______, _______,
_______, _________________COLEMAK_L2________________, _________________COLEMAK_R2________________, _______, _______,
_______, _________________COLEMAK_L3________________, _________________COLEMAK_R3________________, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______),
[_GAME] = KM_(
_______, KC_Q, KC_W, KC_F, KC_P, KC_G , KC_J, KC_L, KC_U, KC_Y, KC_SCLN, _______, _______, _______,
_______, KC_A, KC_R, KC_S, KC_T, KC_D , KC_H, KC_N, KC_E, KC_I, KC_O , _______, _______,
_______, KC_Z, KC_X, KC_C, KC_V, KC_B , KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
#ifdef ENABLE_GAME_LAYER
[_GAME] = LAYOUT(
KC_ESC , 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_BSLS, KC_GRV,
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,
MO_NAV , KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_QUOT, KC_ENT ,
KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO_ADJ ,
KC_LCTL, KC_PTT , KC_PGDN, KC_SPC , KC_RALT, KC_RGUI, KC_RCTL, KC_PTT ),
[_NAV] = KM_(
KC_LCTL, KC_PTT , KC_PGDN, KC_SPC , KC_SPC , KC_SPC , KC_RALT, KC_RGUI, KC_RCTL, KC_PTT ),
#endif
[_NAV] = LAYOUT(
KC_GRV , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
KC_TAB , ________________NAVLAYER_L1________________, ________________NAVLAYER_R1________________, XXXXXXX, XXXXXXX, KC_DEL ,
US_CAPS, ________________NAVLAYER_L2________________, ________________NAVLAYER_R2________________, XXXXXXX, TG_ADJ ,
KC_LSFT, ________________NAVLAYER_L3________________, ________________NAVLAYER_R3________________, KC_RSFT, XXXXXXX,
_________MODS_L__________, NV_SPC1, ______________MODS_R______________),
// Adjust layer is on the split-shift key; or NAV+Enter (for non-split keyboards)
[_ADJUST] = KM_(
KC_TAB , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_VOLU, KC_INS , KC_PGUP, KC_UP , KC_PGDN, XXXXXXX, XXXXXXX, XXXXXXX, KC_DEL ,
US_CAPS, KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_MUTE, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END , XXXXXXX, TG_ADJ ,
KC_LSFT, KC_F9 , KC_F10 , KC_F11 , KC_F12 , KC_VOLD, KC_END , KC_PGDN, XXXXXXX, XXXXXXX, XXXXXXX, KC_RSFT, XXXXXXX,
KC_LCTL, KC_LGUI, KC_LALT, NV_SPC2, NV_SPC1, NV_SPC3, KC_RALT, KC_RGUI, KC_RCTL, KC_PTT ),
// Adjust layer is on the split-shift key; or NAV+Enter (for non-split keyboards)
[_ADJUST] = LAYOUT(
MO_RST , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, ________________ADJLAYER_L1________________, ________________ADJLAYER_R1________________, XXXXXXX, XXXXXXX, KC_DEL ,
XXXXXXX, ________________ADJLAYER_L2________________, ________________ADJLAYER_R2________________, XXXXXXX, TG_ADJ ,
TG_NKRO, ________________ADJLAYER_L3________________, ________________ADJLAYER_R3________________, KC_RSFT, XXXXXXX,
MO_RST , AG_NORM, AG_SWAP, BL_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, KC_CAPS),
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_DEL ,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_ADJ ,
TG_NKRO, LY_QWER, LY_WORK, LY_NRMN, LY_DVRK, LY_CLMK, XXXXXXX, XXXXXXX, XXXXXXX, KC_MAKE, TG_GAME, KC_RSFT, XXXXXXX,
MO_RST , AG_NORM, AG_SWAP, XXXXXXX, BL_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_CAPS),
// To Reset hit FN + ` + Esc
[_RESET] = KM_(
[_RESET] = LAYOUT(
RESET , 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, 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, XXXXXXX, XXXXXXX,
RESET , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX),
RESET , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX),
};
void matrix_scan_user(void) {

@ -15,8 +15,6 @@ enum layers {
_RESET,
};
#define KM_(...) KM(__VA_ARGS__)
#define _______ KC_TRNS
#define XXXXXXX KC_NO
@ -26,7 +24,11 @@ enum layers {
#define MO_ADJ MO(_ADJUST)
#define MO_RST MO(_RESET)
#define TG_ADJ TG(_ADJUST)
#define TG_GAME TG(_GAME)
#ifdef ENABLE_GAME_LAYER
#define TG_GAME TG(_GAME)
#else
#define TG_GAME KC_NO
#endif
#define LY_QWER DF(_BASE)
#define LY_WORK DF(_WORKMAN)
#define LY_NRMN DF(_NORMAN)
@ -59,71 +61,6 @@ enum layers {
enum userspace_custom_keycodes {
KC_MAKE = SAFE_RANGE, // can always be here
NEW_SAFE_RANGE //use "NEWPLACEHOLDER for keymap specific codes
};
#define SAFE_RANGE NEW_SAFE_RANGE
#define _________MODS_L__________ KC_LCTL, KC_LGUI, KC_LALT
#define ______________MODS_R______________ KC_RALT, KC_RGUI, KC_RCTL, KC_PTT
#define _________________QWERTY_L1_________________ KC_Q, KC_W, KC_E, KC_R, KC_T
#define _________________QWERTY_L2_________________ KC_A, KC_S, KC_D, KC_F, KC_G
#define _________________QWERTY_L3_________________ KC_Z, KC_X, KC_C, KC_V, KC_B
#define _________________QWERTY_R1_________________ KC_Y, KC_U, KC_I, KC_O, KC_P
#define _________________QWERTY_R2_________________ KC_H, KC_J, KC_K, KC_L, KC_SCLN
#define _________________QWERTY_R3_________________ KC_N, KC_M, KC_COMM, KC_DOT, KC_SLASH
#define _________________COLEMAK_L1________________ KC_Q, KC_W, KC_F, KC_P, KC_G
#define _________________COLEMAK_L2________________ KC_A, KC_R, KC_S, KC_T, KC_D
#define _________________COLEMAK_L3________________ KC_Z, KC_X, KC_C, KC_V, KC_B
#define _________________COLEMAK_R1________________ KC_J, KC_L, KC_U, KC_Y, KC_SCLN
#define _________________COLEMAK_R2________________ KC_H, KC_N, KC_E, KC_I, KC_O
#define _________________COLEMAK_R3________________ KC_K, KC_M, KC_COMM, KC_DOT, KC_SLASH
#define _________________DVORAK_L1_________________ KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y
#define _________________DVORAK_L2_________________ KC_A, KC_O, KC_E, KC_U, KC_I
#define _________________DVORAK_L3_________________ KC_SCLN, KC_Q, KC_J, KC_K, KC_X
#define _________________DVORAK_R1_________________ KC_F, KC_G, KC_C, KC_R, KC_L
#define _________________DVORAK_R2_________________ KC_D, KC_H, KC_T, KC_N, KC_S
#define _________________DVORAK_R3_________________ KC_B, KC_M, KC_W, KC_V, KC_Z
#define _________________WORKMAN_L1________________ KC_Q , KC_D , KC_R , KC_W , KC_B
#define _________________WORKMAN_L2________________ KC_A , KC_S , KC_H , KC_T , KC_G
#define _________________WORKMAN_L3________________ KC_Z , KC_X , KC_M , KC_C , KC_V
#define _________________WORKMAN_R1________________ KC_J , KC_F , KC_U , KC_P , KC_SCLN
#define _________________WORKMAN_R2________________ KC_Y , KC_N , KC_E , KC_O , KC_I
#define _________________WORKMAN_R3________________ KC_K , KC_L , KC_COMM, KC_DOT , KC_SLSH
#define _________________NORMAN_L1_________________ KC_Q , KC_W , KC_D , KC_F , KC_K
#define _________________NORMAN_L2_________________ KC_A , KC_S , KC_E , KC_T , KC_G
#define _________________NORMAN_L3_________________ KC_Z , KC_X , KC_C , KC_V , KC_B
#define _________________NORMAN_R1_________________ KC_J , KC_U , KC_R , KC_L , KC_SCLN
#define _________________NORMAN_R2_________________ KC_Y , KC_N , KC_I , KC_O , KC_H
#define _________________NORMAN_R3_________________ KC_P , KC_M , KC_COMM, KC_DOT , KC_SLSH
#define ________________NAVLAYER_L1________________ KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_VOLU
#define ________________NAVLAYER_L2________________ KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_MUTE
#define ________________NAVLAYER_L3________________ KC_F9 , KC_F10 , KC_F11 , KC_F12 , KC_VOLD
#define ________________NAVLAYER_R1________________ KC_INS , KC_PGUP, KC_UP , KC_PGDN, XXXXXXX
#define ________________NAVLAYER_R2________________ KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END
#define ________________NAVLAYER_R3________________ KC_END , KC_PGDN, XXXXXXX, XXXXXXX, XXXXXXX
#define ________________ADJLAYER_L1________________ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
#define ________________ADJLAYER_L2________________ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
#define ________________ADJLAYER_L3________________ LY_QWER, LY_WORK, LY_NRMN, LY_DVRK, LY_CLMK
#define ________________ADJLAYER_R1________________ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
#define ________________ADJLAYER_R2________________ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
#define ________________ADJLAYER_R3________________ XXXXXXX, XXXXXXX, XXXXXXX, KC_MAKE, TG_GAME
#endif

Loading…
Cancel
Save