diff --git a/layouts/community/60_ansi_split_bs_rshift/talljoe/common_core.h b/layouts/community/60_ansi_split_bs_rshift/talljoe/common_core.h new file mode 100644 index 0000000000..b09e13112f --- /dev/null +++ b/layouts/community/60_ansi_split_bs_rshift/talljoe/common_core.h @@ -0,0 +1,7 @@ +#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 \ No newline at end of file diff --git a/layouts/community/60_ansi_split_bs_rshift/talljoe/keymap.c b/layouts/community/60_ansi_split_bs_rshift/talljoe/keymap.c deleted file mode 100644 index 892fc3454a..0000000000 --- a/layouts/community/60_ansi_split_bs_rshift/talljoe/keymap.c +++ /dev/null @@ -1,71 +0,0 @@ -#include QMK_KEYBOARD_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, ______________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_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, ______________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, BL_TOGG, 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), -}; - -void matrix_scan_user(void) { - #ifdef KEYBOARD_gh60 - if (IS_LAYER_ON(_GAME)) { - gh60_wasd_leds_on(); - } else { - gh60_wasd_leds_off(); - } - #endif -} diff --git a/layouts/community/ortho_4x12/talljoe/common_core.h b/layouts/community/ortho_4x12/talljoe/common_core.h new file mode 100644 index 0000000000..9171eab70d --- /dev/null +++ b/layouts/community/ortho_4x12/talljoe/common_core.h @@ -0,0 +1,18 @@ +#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 \ No newline at end of file diff --git a/layouts/community/ortho_4x12/talljoe/config.h b/layouts/community/ortho_4x12/talljoe/config.h new file mode 100644 index 0000000000..a83885c7bf --- /dev/null +++ b/layouts/community/ortho_4x12/talljoe/config.h @@ -0,0 +1,8 @@ +#ifndef CONFIG_USER_H +#define CONFIG_USER_H + +#include QMK_KEYBOARD_CONFIG_H + +#define PREVENT_STUCK_MODIFIERS + +#endif //CONFIG_USER_H diff --git a/users/talljoe/talljoe.c b/users/talljoe/talljoe.c index 54cdb7470e..c070ec8eaf 100644 --- a/users/talljoe/talljoe.c +++ b/users/talljoe/talljoe.c @@ -1,4 +1,76 @@ +#include QMK_KEYBOARD_H + #include "talljoe.h" +#include "common_core.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, ______________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_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, ______________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, BL_TOGG, 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), +}; + +void matrix_scan_user(void) { + #ifdef KEYBOARD_gh60 + if (IS_LAYER_ON(_GAME)) { + gh60_wasd_leds_on(); + } else { + gh60_wasd_leds_off(); + } + #endif +} void matrix_init_user(void) { if (!eeconfig_is_enabled()) {