Ergodox EZ refactor (#3171)
* Refactor matrices and keymaps * Fixes for @ericgebhart keymap * Deleted macro aliases * ericgebhart/keymap.c to LAYOUT_ergodox_wrapper
This commit is contained in:
		
							parent
							
								
									454bc3c264
								
							
						
					
					
						commit
						698ce733b7
					
				
					 13 changed files with 207 additions and 209 deletions
				
			
		|  | @ -106,9 +106,12 @@ inline void ergodox_led_all_set(uint8_t n) | ||||||
|     ergodox_right_led_3_set(n); |     ergodox_right_led_3_set(n); | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| #define KEYMAP(                                                 \ | /*
 | ||||||
|  |  *   LEFT HAND: LINES 115-122 | ||||||
|  |  *  RIGHT HAND: LINES 124-131 | ||||||
|  |  */ | ||||||
|  | #define LAYOUT_ergodox(                                         \ | ||||||
|                                                                 \ |                                                                 \ | ||||||
|     /* left hand, spatial positions */                          \ |  | ||||||
|     k00,k01,k02,k03,k04,k05,k06,                                \ |     k00,k01,k02,k03,k04,k05,k06,                                \ | ||||||
|     k10,k11,k12,k13,k14,k15,k16,                                \ |     k10,k11,k12,k13,k14,k15,k16,                                \ | ||||||
|     k20,k21,k22,k23,k24,k25,                                    \ |     k20,k21,k22,k23,k24,k25,                                    \ | ||||||
|  | @ -118,7 +121,6 @@ inline void ergodox_led_all_set(uint8_t n) | ||||||
|                                 k54,                            \ |                                 k54,                            \ | ||||||
|                         k53,k52,k51,                            \ |                         k53,k52,k51,                            \ | ||||||
|                                                                 \ |                                                                 \ | ||||||
|     /* right hand, spatial positions */                         \ |  | ||||||
|         k07,k08,k09,k0A,k0B,k0C,k0D,                            \ |         k07,k08,k09,k0A,k0B,k0C,k0D,                            \ | ||||||
|         k17,k18,k19,k1A,k1B,k1C,k1D,                            \ |         k17,k18,k19,k1A,k1B,k1C,k1D,                            \ | ||||||
|             k28,k29,k2A,k2B,k2C,k2D,                            \ |             k28,k29,k2A,k2B,k2C,k2D,                            \ | ||||||
|  | @ -147,9 +149,12 @@ inline void ergodox_led_all_set(uint8_t n) | ||||||
|     { k0D, k1D, k2D, k3D, k4D, KC_NO }    \ |     { k0D, k1D, k2D, k3D, k4D, KC_NO }    \ | ||||||
|    } |    } | ||||||
| 
 | 
 | ||||||
| #define KEYMAP_80(                                              \ | /*
 | ||||||
|  |  *   LEFT HAND: LINES 158-165 | ||||||
|  |  *  RIGHT HAND: LINES 167-174 | ||||||
|  |  */ | ||||||
|  | #define LAYOUT_ergodox_80(                                      \ | ||||||
|                                                                 \ |                                                                 \ | ||||||
|     /* left hand, spatial positions */                          \ |  | ||||||
|     k00,k01,k02,k03,k04,k05,k06,                                \ |     k00,k01,k02,k03,k04,k05,k06,                                \ | ||||||
|     k10,k11,k12,k13,k14,k15,k16,                                \ |     k10,k11,k12,k13,k14,k15,k16,                                \ | ||||||
|     k20,k21,k22,k23,k24,k25,                                    \ |     k20,k21,k22,k23,k24,k25,                                    \ | ||||||
|  | @ -159,7 +164,6 @@ inline void ergodox_led_all_set(uint8_t n) | ||||||
|                         k45,k46,k54,                            \ |                         k45,k46,k54,                            \ | ||||||
|                         k53,k52,k51,                            \ |                         k53,k52,k51,                            \ | ||||||
|                                                                 \ |                                                                 \ | ||||||
|     /* right hand, spatial positions */                         \ |  | ||||||
|         k07,k08,k09,k0A,k0B,k0C,k0D,                            \ |         k07,k08,k09,k0A,k0B,k0C,k0D,                            \ | ||||||
|         k17,k18,k19,k1A,k1B,k1C,k1D,                            \ |         k17,k18,k19,k1A,k1B,k1C,k1D,                            \ | ||||||
|             k28,k29,k2A,k2B,k2C,k2D,                            \ |             k28,k29,k2A,k2B,k2C,k2D,                            \ | ||||||
|  | @ -188,16 +192,16 @@ inline void ergodox_led_all_set(uint8_t n) | ||||||
|     { k0D, k1D, k2D, k3D, k4D, KC_NO }    \ |     { k0D, k1D, k2D, k3D, k4D, KC_NO }    \ | ||||||
|    } |    } | ||||||
| 
 | 
 | ||||||
| #define KEYMAP_PRETTY(                                                                                        \ | /*  ---------- LEFT HAND -----------   ---------- RIGHT HAND ---------- */ | ||||||
|     /* left hand, spatial positions */     /* right hand, spatial positions */                         \ | #define LAYOUT_ergodox_pretty(                                           \ | ||||||
|     L00,L01,L02,L03,L04,L05,L06,               R00,R01,R02,R03,R04,R05,R06,                            \ |     L00,L01,L02,L03,L04,L05,L06,           R00,R01,R02,R03,R04,R05,R06,  \ | ||||||
|     L10,L11,L12,L13,L14,L15,L16,               R10,R11,R12,R13,R14,R15,R16,                            \ |     L10,L11,L12,L13,L14,L15,L16,           R10,R11,R12,R13,R14,R15,R16,  \ | ||||||
|     L20,L21,L22,L23,L24,L25,                       R21,R22,R23,R24,R25,R26,                            \ |     L20,L21,L22,L23,L24,L25,                   R21,R22,R23,R24,R25,R26,  \ | ||||||
|     L30,L31,L32,L33,L34,L35,L36,               R30,R31,R32,R33,R34,R35,R36,                            \ |     L30,L31,L32,L33,L34,L35,L36,           R30,R31,R32,R33,R34,R35,R36,  \ | ||||||
|     L40,L41,L42,L43,L44,                               R42,R43,R44,R45,R46,                            \ |     L40,L41,L42,L43,L44,                           R42,R43,R44,R45,R46,  \ | ||||||
|                             L55,L56,       R50,R51,                                                    \ |                             L55,L56,   R50,R51,                          \ | ||||||
|                                 L54,       R52,                                                        \ |                                 L54,   R52,                              \ | ||||||
|                         L53,L52,L51,       R55,R54,R53 )                                               \ |                         L53,L52,L51,   R55,R54,R53 )                     \ | ||||||
|                                           \ |                                           \ | ||||||
|    /* matrix positions */                 \ |    /* matrix positions */                 \ | ||||||
|     {                                     \ |     {                                     \ | ||||||
|  | @ -218,16 +222,16 @@ inline void ergodox_led_all_set(uint8_t n) | ||||||
|     { R06, R16, R26, R36, R46, KC_NO }    \ |     { R06, R16, R26, R36, R46, KC_NO }    \ | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
| #define KEYMAP_PRETTY_80(                                                                              \ | /*  ---------- LEFT HAND -----------   ---------- RIGHT HAND ---------- */ | ||||||
|     /* left hand, spatial positions */     /* right hand, spatial positions */                         \ | #define LAYOUT_ergodox_pretty_80(                                        \ | ||||||
|     L00,L01,L02,L03,L04,L05,L06,               R00,R01,R02,R03,R04,R05,R06,                            \ |     L00,L01,L02,L03,L04,L05,L06,           R00,R01,R02,R03,R04,R05,R06,  \ | ||||||
|     L10,L11,L12,L13,L14,L15,L16,               R10,R11,R12,R13,R14,R15,R16,                            \ |     L10,L11,L12,L13,L14,L15,L16,           R10,R11,R12,R13,R14,R15,R16,  \ | ||||||
|     L20,L21,L22,L23,L24,L25,                       R21,R22,R23,R24,R25,R26,                            \ |     L20,L21,L22,L23,L24,L25,                   R21,R22,R23,R24,R25,R26,  \ | ||||||
|     L30,L31,L32,L33,L34,L35,L36,               R30,R31,R32,R33,R34,R35,R36,                            \ |     L30,L31,L32,L33,L34,L35,L36,           R30,R31,R32,R33,R34,R35,R36,  \ | ||||||
|     L40,L41,L42,L43,L44,                               R42,R43,R44,R45,R46,                            \ |     L40,L41,L42,L43,L44,                           R42,R43,R44,R45,R46,  \ | ||||||
|                             L55,L56,       R50,R51,                                                    \ |                             L55,L56,   R50,R51,                          \ | ||||||
|                         L45,L46,L54,       R52,R40,R41,                                                \ |                         L45,L46,L54,   R52,R40,R41,                      \ | ||||||
|                         L53,L52,L51,       R55,R54,R53 )                                               \ |                         L53,L52,L51,   R55,R54,R53 )                     \ | ||||||
|                                           \ |                                           \ | ||||||
|       /* matrix positions */              \ |       /* matrix positions */              \ | ||||||
|     {                                     \ |     {                                     \ | ||||||
|  | @ -248,9 +252,4 @@ inline void ergodox_led_all_set(uint8_t n) | ||||||
|     { R06, R16, R26, R36, R46, KC_NO }    \ |     { R06, R16, R26, R36, R46, KC_NO }    \ | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
| #define LAYOUT_ergodox KEYMAP |  | ||||||
| #define LAYOUT_ergodox_pretty KEYMAP_PRETTY |  | ||||||
| #define LAYOUT_ergodox_80 KEYMAP_80 |  | ||||||
| #define LAYOUT_ergodox_pretty_80 KEYMAP_PRETTY_80 |  | ||||||
| 
 |  | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
|  | @ -52,7 +52,7 @@ enum { | ||||||
| 
 | 
 | ||||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|   // Layer 0: basic keys.
 |   // Layer 0: basic keys.
 | ||||||
|   [BASE] = KEYMAP(   |   [BASE] = LAYOUT_ergodox( | ||||||
|     /* left hand */ |     /* left hand */ | ||||||
|     BP_DLR,   BP_DQOT, BP_LGIL, BP_RGIL, BP_LPRN, BP_RPRN, KC_DEL, |     BP_DLR,   BP_DQOT, BP_LGIL, BP_RGIL, BP_LPRN, BP_RPRN, KC_DEL, | ||||||
|     KC_TAB,   BP_B,    BP_ECUT, BP_P,    BP_O,    BP_EGRV, KC_BSPC, |     KC_TAB,   BP_B,    BP_ECUT, BP_P,    BP_O,    BP_EGRV, KC_BSPC, | ||||||
|  | @ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|     KC_DOWN, TD(TAP_MACRO), TT(MOUSE)), |     KC_DOWN, TD(TAP_MACRO), TT(MOUSE)), | ||||||
| 
 | 
 | ||||||
|   // Layer 1: function and media keys.
 |   // Layer 1: function and media keys.
 | ||||||
|   [FN] = KEYMAP(   |   [FN] = LAYOUT_ergodox( | ||||||
|     /* left hand */ |     /* left hand */ | ||||||
|     KC_SLEP, KC_F1, KC_F2,  KC_F3,   KC_F4,    KC_F5,    ___, |     KC_SLEP, KC_F1, KC_F2,  KC_F3,   KC_F4,    KC_F5,    ___, | ||||||
|     ___,     ___,   ___,    ___,     ___,      ___,      ___, |     ___,     ___,   ___,    ___,     ___,      ___,      ___, | ||||||
|  | @ -96,7 +96,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|     // the MOUSE layer below (except for the arrow keys).
 |     // the MOUSE layer below (except for the arrow keys).
 | ||||||
| 
 | 
 | ||||||
|   // Layer 2: Mouse control.
 |   // Layer 2: Mouse control.
 | ||||||
|   [MOUSE] = KEYMAP(   |   [MOUSE] = LAYOUT_ergodox( | ||||||
|     /* left hand */ |     /* left hand */ | ||||||
|     KC_SLEP, KC_F1, KC_F2,   KC_F3,   KC_F4,    KC_F5,    ___, |     KC_SLEP, KC_F1, KC_F2,   KC_F3,   KC_F4,    KC_F5,    ___, | ||||||
|     ___,     ___,   KC_BTN4, KC_MS_U, KC_BTN5,  ___,      ___, |     ___,     ___,   KC_BTN4, KC_MS_U, KC_BTN5,  ___,      ___, | ||||||
|  | @ -117,7 +117,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|     ___, ___, ___), |     ___, ___, ___), | ||||||
| 
 | 
 | ||||||
|   // Layer 3: Numeric keypad and system keys.
 |   // Layer 3: Numeric keypad and system keys.
 | ||||||
|   [NUMS] = KEYMAP(   |   [NUMS] = LAYOUT_ergodox( | ||||||
|     /* left hand */ |     /* left hand */ | ||||||
|     KC_PSCR, KC_INS, KC_PAUS,    ___,     ___,      ___, ___, |     KC_PSCR, KC_INS, KC_PAUS,    ___,     ___,      ___, ___, | ||||||
|     ___,     ___,    ___,        ___,     ___,      ___, ___, |     ___,     ___,    ___,        ___,     ___,      ___, ___, | ||||||
|  | @ -140,7 +140,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|   // Layer 4: hand swap, all keys are mirrored to the other side of the keyboard
 |   // Layer 4: hand swap, all keys are mirrored to the other side of the keyboard
 | ||||||
|   // except for the layer toggle itself (so there is no right arrow when this
 |   // except for the layer toggle itself (so there is no right arrow when this
 | ||||||
|   // layer is activated).
 |   // layer is activated).
 | ||||||
|   [SWAP] = KEYMAP(   |   [SWAP] = LAYOUT_ergodox( | ||||||
|     /* left hand */ |     /* left hand */ | ||||||
|     ___, ___, ___, ___, ___, ___, ___, |     ___, ___, ___, ___, ___, ___, ___, | ||||||
|     ___, ___, ___, ___, ___, ___, ___, |     ___, ___, ___, ___, ___, ___, ___, | ||||||
|  | @ -159,11 +159,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|     ___, TT(SWAP), |     ___, TT(SWAP), | ||||||
|     ___, |     ___, | ||||||
|     ___, ___,      ___), |     ___, ___,      ___), | ||||||
|   | 
 | ||||||
|   // Layer 5: The LEDs are showing the "standard" caps/num/scroll lock indicator
 |   // Layer 5: The LEDs are showing the "standard" caps/num/scroll lock indicator
 | ||||||
|   // instead of their default which shows the currently active layers (FN, NUMS,
 |   // instead of their default which shows the currently active layers (FN, NUMS,
 | ||||||
|   // and MOUSE in that order).
 |   // and MOUSE in that order).
 | ||||||
|   [SYSLEDS] = KEYMAP(   |   [SYSLEDS] = LAYOUT_ergodox( | ||||||
|     /* left hand */ |     /* left hand */ | ||||||
|     ___, ___, ___, ___, ___, ___, ___, |     ___, ___, ___, ___, ___, ___, ___, | ||||||
|     ___, ___, ___, ___, ___, ___, ___, |     ___, ___, ___, ___, ___, ___, ___, | ||||||
|  |  | ||||||
|  | @ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|  */ |  */ | ||||||
| // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 | // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 | ||||||
| // Otherwise, it needs KC_*
 | // Otherwise, it needs KC_*
 | ||||||
| [BASE] = KEYMAP(  // layer 0 : default
 | [BASE] = LAYOUT_ergodox(  // layer 0 : default
 | ||||||
|         // left hand
 |         // left hand
 | ||||||
|         KC_EQL,          KC_1,        KC_2,   KC_3,   KC_4,        KC_5,   KC_LEFT, |         KC_EQL,          KC_1,        KC_2,   KC_3,   KC_4,        KC_5,   KC_LEFT, | ||||||
|         KC_DELT,         KC_Q,        KC_W,   KC_E,   KC_R,        KC_T,   TG(DEV), |         KC_DELT,         KC_Q,        KC_W,   KC_E,   KC_R,        KC_T,   TG(DEV), | ||||||
|  | @ -94,7 +94,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|  *                                 `--------------------'       `--------------------' |  *                                 `--------------------'       `--------------------' | ||||||
|  */ |  */ | ||||||
| // SYMBOLS
 | // SYMBOLS
 | ||||||
| [SYMB] = KEYMAP( | [SYMB] = LAYOUT_ergodox( | ||||||
|        // left hand
 |        // left hand
 | ||||||
|        KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS, |        KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS, | ||||||
|        KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS, |        KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS, | ||||||
|  | @ -136,7 +136,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|  *                                 `--------------------'       `--------------------' |  *                                 `--------------------'       `--------------------' | ||||||
|  */ |  */ | ||||||
| // MEDIA
 | // MEDIA
 | ||||||
| [MDIA] = KEYMAP( | [MDIA] = LAYOUT_ergodox( | ||||||
|        // left hand
 |        // left hand
 | ||||||
|        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||||||
|        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||||||
|  | @ -156,7 +156,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|        KC_TRNS, |        KC_TRNS, | ||||||
|        KC_TRNS, KC_TRNS, KC_TRNS |        KC_TRNS, KC_TRNS, KC_TRNS | ||||||
| ), | ), | ||||||
| [MOUSE] = KEYMAP( | [MOUSE] = LAYOUT_ergodox( | ||||||
|        // left hand
 |        // left hand
 | ||||||
|        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||||||
|        KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS, |        KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS, | ||||||
|  | @ -176,7 +176,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|        KC_TRNS, |        KC_TRNS, | ||||||
|        KC_TRNS, KC_TRNS, KC_TRNS |        KC_TRNS, KC_TRNS, KC_TRNS | ||||||
| ), | ), | ||||||
| [DEV] = KEYMAP( | [DEV] = LAYOUT_ergodox( | ||||||
|        // left hand
 |        // left hand
 | ||||||
|        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||||||
|        KC_TRNS, KC_F12,  KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_TRNS, |        KC_TRNS, KC_F12,  KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_TRNS, | ||||||
|  |  | ||||||
|  | @ -25,13 +25,13 @@ enum custom_keycodes { | ||||||
|   // shell nav macros
 |   // shell nav macros
 | ||||||
|   SHELL_LS, |   SHELL_LS, | ||||||
|   SHELL_LSLTR, |   SHELL_LSLTR, | ||||||
|   SHELL_LSLA,  |   SHELL_LSLA, | ||||||
|   SHELL_CDPRE, |   SHELL_CDPRE, | ||||||
|   SHELL_LESS, |   SHELL_LESS, | ||||||
|   SHELL_PLESS, |   SHELL_PLESS, | ||||||
|   SHELL_PGREP, |   SHELL_PGREP, | ||||||
|   SHELL_TAILF,   |   SHELL_TAILF, | ||||||
|    | 
 | ||||||
|   SHELL_PWD, |   SHELL_PWD, | ||||||
|   SHELL_H3, |   SHELL_H3, | ||||||
|   SHELL_AMMCOLO, |   SHELL_AMMCOLO, | ||||||
|  | @ -40,7 +40,7 @@ enum custom_keycodes { | ||||||
|   SHELL_SCREEN_LIST, |   SHELL_SCREEN_LIST, | ||||||
|   SHELL_MKE, |   SHELL_MKE, | ||||||
|   SHELL_HTCSTATUS, |   SHELL_HTCSTATUS, | ||||||
|    | 
 | ||||||
|   // Cloud9 macros
 |   // Cloud9 macros
 | ||||||
|   CLOUD9_TAB_LEFT, |   CLOUD9_TAB_LEFT, | ||||||
|   CLOUD9_TAB_RIGHT, |   CLOUD9_TAB_RIGHT, | ||||||
|  | @ -48,7 +48,7 @@ enum custom_keycodes { | ||||||
|   CLOUD9_GOTO_SYMBOL, |   CLOUD9_GOTO_SYMBOL, | ||||||
|   CLOUD9_GOTO_LINE, |   CLOUD9_GOTO_LINE, | ||||||
|   CLOUD9_NAVIGATE, |   CLOUD9_NAVIGATE, | ||||||
|    | 
 | ||||||
| }; | }; | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|  | @ -57,7 +57,7 @@ enum custom_keycodes { | ||||||
| #define KEYSEL       2 // arrow navigation + shift (allow text selection)
 | #define KEYSEL       2 // arrow navigation + shift (allow text selection)
 | ||||||
| #define SHELL_NAV    3 // bash shortcuts
 | #define SHELL_NAV    3 // bash shortcuts
 | ||||||
| #define SHELL_SCREEN 4 // linux screen shortcuts
 | #define SHELL_SCREEN 4 // linux screen shortcuts
 | ||||||
| #define SCREEN_NAV   5 // navigate between linux screen tabs 
 | #define SCREEN_NAV   5 // navigate between linux screen tabs
 | ||||||
| #define MOUSE        6 // mouse layer (can be locked with lock key), unmapped for now
 | #define MOUSE        6 // mouse layer (can be locked with lock key), unmapped for now
 | ||||||
| #define BROWSER_CONTROL 7 // control browser and mouse
 | #define BROWSER_CONTROL 7 // control browser and mouse
 | ||||||
| #define COMBINED      	8 // combined numbers and symbols layer
 | #define COMBINED      	8 // combined numbers and symbols layer
 | ||||||
|  | @ -105,7 +105,7 @@ enum custom_keycodes { | ||||||
|                 return MACRO( D(LCTL), T(A), U(LCTL), T(NUM), END);\ |                 return MACRO( D(LCTL), T(A), U(LCTL), T(NUM), END);\ | ||||||
|             }\ |             }\ | ||||||
|         break;\ |         break;\ | ||||||
| 		 | 
 | ||||||
| #define MACRO_SCREEN_REG(MACRO_NAME,NUM) \ | #define MACRO_SCREEN_REG(MACRO_NAME,NUM) \ | ||||||
|         case MACRO_NAME:\ |         case MACRO_NAME:\ | ||||||
|              if (record->event.pressed) {\ |              if (record->event.pressed) {\ | ||||||
|  | @ -142,32 +142,32 @@ enum custom_keycodes { | ||||||
| 
 | 
 | ||||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
| 
 | 
 | ||||||
|   [BASE] = KEYMAP( |   [BASE] = LAYOUT_ergodox( | ||||||
|       // left hand
 |       // left hand
 | ||||||
|       KC_ESC,            KC_F1,         KC_F2,      KC_F3,        KC_F4,   KC_F5,   KC_F6, |       KC_ESC,            KC_F1,         KC_F2,      KC_F3,        KC_F4,   KC_F5,   KC_F6, | ||||||
|       OSL(SCREEN_NAV),   KC_QUOTE,      KC_COMMA,   KC_DOT,       KC_P,    KC_Y,    MEH(KC_2), |       OSL(SCREEN_NAV),   KC_QUOTE,      KC_COMMA,   KC_DOT,       KC_P,    KC_Y,    MEH(KC_2), | ||||||
|       OSL(SHELL_NAV),    KC_A,          KC_O,       KC_E,         KC_U,    KC_I, |       OSL(SHELL_NAV),    KC_A,          KC_O,       KC_E,         KC_U,    KC_I, | ||||||
|       OSL(SHELL_SCREEN), KC_SCOLON,     KC_Q,       KC_J,         KC_K,    KC_X,    MEH(KC_3), |       OSL(SHELL_SCREEN), KC_SCOLON,     KC_Q,       KC_J,         KC_K,    KC_X,    MEH(KC_3), | ||||||
|       MEH(KC_1),         OSM(MOD_LSFT), OSM(MOD_LCTL), MO(KEYSEL), MO(BROWSER_CONTROL), |       MEH(KC_1),         OSM(MOD_LSFT), OSM(MOD_LCTL), MO(KEYSEL), MO(BROWSER_CONTROL), | ||||||
|        | 
 | ||||||
|       // left thumb cluster
 |       // left thumb cluster
 | ||||||
|                 MEH(KC_4),      MEH(KC_5), |                 MEH(KC_4),      MEH(KC_5), | ||||||
|                                 MEH(KC_6), |                                 MEH(KC_6), | ||||||
|       MO(COMBINED),MO(KEYNAV),  OSM(MOD_LALT), |       MO(COMBINED),MO(KEYNAV),  OSM(MOD_LALT), | ||||||
|        | 
 | ||||||
|       // right hand
 |       // right hand
 | ||||||
|       KC_F7,     KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MEH(KC_9), |       KC_F7,     KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MEH(KC_9), | ||||||
|       MEH(KC_7), KC_F,  KC_G,  KC_C,   KC_R,   KC_L,   KC_TAB, |       MEH(KC_7), KC_F,  KC_G,  KC_C,   KC_R,   KC_L,   KC_TAB, | ||||||
|                  KC_D,  KC_H,  KC_T,   KC_N,   KC_S,   RCTL(KC_BSPC), |                  KC_D,  KC_H,  KC_T,   KC_N,   KC_S,   RCTL(KC_BSPC), | ||||||
|       MEH(KC_8), KC_B,  KC_M,  KC_W,   KC_V,   KC_Z,   MEH(KC_F3), |       MEH(KC_8), KC_B,  KC_M,  KC_W,   KC_V,   KC_Z,   MEH(KC_F3), | ||||||
|       KC_BSPC,   RCTL(KC_BSPC), KC_CAPSLOCK, OSM(MOD_LSFT),MEH(KC_F4), |       KC_BSPC,   RCTL(KC_BSPC), KC_CAPSLOCK, OSM(MOD_LSFT),MEH(KC_F4), | ||||||
|      | 
 | ||||||
|       // right thumb cluster
 |       // right thumb cluster
 | ||||||
|       MEH(KC_F5),MEH(KC_F6),MEH(KC_F7),MEH(KC_F8),KC_ENTER,KC_SPACE |       MEH(KC_F5),MEH(KC_F6),MEH(KC_F7),MEH(KC_F8),KC_ENTER,KC_SPACE | ||||||
|    | 
 | ||||||
|   ), |   ), | ||||||
|    | 
 | ||||||
|   [KEYNAV] = KEYMAP( |   [KEYNAV] = LAYOUT_ergodox( | ||||||
|     // left hand
 |     // left hand
 | ||||||
|     KC_TRNS,KC_TRNS,     KC_TRNS,            KC_TRNS,         KC_TRNS,          KC_TRNS,          KC_TRNS, |     KC_TRNS,KC_TRNS,     KC_TRNS,            KC_TRNS,         KC_TRNS,          KC_TRNS,          KC_TRNS, | ||||||
|     KC_TRNS,KC_ESC,      CLOUD9_GOTO_LINE,   RCTL(KC_Z),      RCTL(KC_S),       MEH(KC_F10),      KC_TRNS, |     KC_TRNS,KC_ESC,      CLOUD9_GOTO_LINE,   RCTL(KC_Z),      RCTL(KC_S),       MEH(KC_F10),      KC_TRNS, | ||||||
|  | @ -176,20 +176,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|     KC_TRNS,KC_TRNS,     KC_TRNS,            KC_TRNS,         KC_TRNS, |     KC_TRNS,KC_TRNS,     KC_TRNS,            KC_TRNS,         KC_TRNS, | ||||||
|     // left thumb cluster
 |     // left thumb cluster
 | ||||||
|     KC_TRNS,KC_TRNS,KC_TRNS,TO(MOUSE),KC_TRNS,KC_TRNS, |     KC_TRNS,KC_TRNS,KC_TRNS,TO(MOUSE),KC_TRNS,KC_TRNS, | ||||||
|      | 
 | ||||||
|     // right hand
 |     // right hand
 | ||||||
|     KC_TRNS,KC_TRNS,       KC_TRNS,    KC_TRNS,         KC_TRNS,    KC_TRNS,         MEH(KC_G), |     KC_TRNS,KC_TRNS,       KC_TRNS,    KC_TRNS,         KC_TRNS,    KC_TRNS,         MEH(KC_G), | ||||||
|     KC_TRNS,KC_NO,         KC_HOME,    KC_UP,           KC_END,     KC_PGUP,         MEH(KC_H), |     KC_TRNS,KC_NO,         KC_HOME,    KC_UP,           KC_END,     KC_PGUP,         MEH(KC_H), | ||||||
|             LCTL(KC_LEFT), KC_LEFT,    KC_DOWN,         KC_RIGHT,   LCTL(KC_RIGHT),  MEH(KC_I), |             LCTL(KC_LEFT), KC_LEFT,    KC_DOWN,         KC_RIGHT,   LCTL(KC_RIGHT),  MEH(KC_I), | ||||||
|     KC_TRNS,KC_NO,         RCTL(KC_C), RCTL(KC_X),      RCTL(KC_V), KC_PGDOWN,       MEH(KC_J), |     KC_TRNS,KC_NO,         RCTL(KC_C), RCTL(KC_X),      RCTL(KC_V), KC_PGDOWN,       MEH(KC_J), | ||||||
|                            KC_BSPC,   RCTL(KC_BSPC),    KC_DELETE,  LCTL(KC_DELETE), MEH(KC_K), |                            KC_BSPC,   RCTL(KC_BSPC),    KC_DELETE,  LCTL(KC_DELETE), MEH(KC_K), | ||||||
|      | 
 | ||||||
|     // right thumb cluster
 |     // right thumb cluster
 | ||||||
|     KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS |     KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS | ||||||
|   ),   |   ), | ||||||
|    | 
 | ||||||
|     // key selection layer
 |     // key selection layer
 | ||||||
|     [KEYSEL] = KEYMAP( |     [KEYSEL] = LAYOUT_ergodox( | ||||||
|            // left hand
 |            // left hand
 | ||||||
|            KC_TRNS,KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, |            KC_TRNS,KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, | ||||||
|            KC_TRNS,MEH(KC_G), MEH(KC_H),MEH(KC_I), MEH(KC_J), MEH(KC_K), KC_TRNS, |            KC_TRNS,MEH(KC_G), MEH(KC_H),MEH(KC_I), MEH(KC_J), MEH(KC_K), KC_TRNS, | ||||||
|  | @ -212,10 +212,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|            KC_TRNS, KC_TRNS, |            KC_TRNS, KC_TRNS, | ||||||
|            KC_TRNS, |            KC_TRNS, | ||||||
|            KC_TRNS, KC_TRNS, KC_TRNS |            KC_TRNS, KC_TRNS, KC_TRNS | ||||||
|     ),   |     ), | ||||||
|    | 
 | ||||||
|   // shell navigation layer
 |   // shell navigation layer
 | ||||||
|   [SHELL_NAV] = KEYMAP( |   [SHELL_NAV] = LAYOUT_ergodox( | ||||||
|        // left hand
 |        // left hand
 | ||||||
|        KC_NO,  KC_TRNS,           KC_TRNS,        KC_TRNS,          KC_TRNS,     KC_TRNS,         KC_TRNS, |        KC_NO,  KC_TRNS,           KC_TRNS,        KC_TRNS,          KC_TRNS,     KC_TRNS,         KC_TRNS, | ||||||
|        KC_TRNS,KC_TRNS,           SHELL_PGREP,    SHELL_PLESS,      SHELL_LESS,  KC_TRNS,         SHELL_H3, |        KC_TRNS,KC_TRNS,           SHELL_PGREP,    SHELL_PLESS,      SHELL_LESS,  KC_TRNS,         SHELL_H3, | ||||||
|  | @ -239,10 +239,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|        KC_TRNS, |        KC_TRNS, | ||||||
|        KC_TRNS, KC_TRNS, KC_TRNS |        KC_TRNS, KC_TRNS, KC_TRNS | ||||||
|   ), |   ), | ||||||
|    | 
 | ||||||
| 
 | 
 | ||||||
|     // linux screen layer
 |     // linux screen layer
 | ||||||
|   [SHELL_SCREEN] = KEYMAP( |   [SHELL_SCREEN] = LAYOUT_ergodox( | ||||||
|        // left hand
 |        // left hand
 | ||||||
|        KC_NO,  KC_TRNS,    KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,   KC_TRNS, |        KC_NO,  KC_TRNS,    KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,   KC_TRNS, | ||||||
|        KC_TRNS,KC_TRNS,    KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,   KC_TRNS, |        KC_TRNS,KC_TRNS,    KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,   KC_TRNS, | ||||||
|  | @ -268,7 +268,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|   ), |   ), | ||||||
| 
 | 
 | ||||||
|   // navigation within screen (for copy/paste)
 |   // navigation within screen (for copy/paste)
 | ||||||
|   [SCREEN_NAV] = KEYMAP( |   [SCREEN_NAV] = LAYOUT_ergodox( | ||||||
|        // left hand
 |        // left hand
 | ||||||
|        // left hand
 |        // left hand
 | ||||||
|        KC_NO,  KC_TRNS,    KC_TRNS,              KC_TRNS,     		  KC_TRNS,               KC_TRNS,   KC_TRNS, |        KC_NO,  KC_TRNS,    KC_TRNS,              KC_TRNS,     		  KC_TRNS,               KC_TRNS,   KC_TRNS, | ||||||
|  | @ -293,12 +293,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|        KC_TRNS, |        KC_TRNS, | ||||||
|        KC_TRNS, KC_TRNS, KC_TRNS |        KC_TRNS, KC_TRNS, KC_TRNS | ||||||
|   ), |   ), | ||||||
|    |  | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|    | 
 | ||||||
|   [COMBINED] = KEYMAP( | 
 | ||||||
|    |   [COMBINED] = LAYOUT_ergodox( | ||||||
|  | 
 | ||||||
|     // left hand
 |     // left hand
 | ||||||
|     KC_NO,  KC_TRNS, KC_TRNS,    KC_TRNS,     KC_TRNS,     KC_TRNS, KC_TRNS, |     KC_NO,  KC_TRNS, KC_TRNS,    KC_TRNS,     KC_TRNS,     KC_TRNS, KC_TRNS, | ||||||
|     KC_TRNS,KC_EXLM, KC_AT,      KC_HASH,     KC_DLR,      KC_PERC, KC_TRNS, |     KC_TRNS,KC_EXLM, KC_AT,      KC_HASH,     KC_DLR,      KC_PERC, KC_TRNS, | ||||||
|  | @ -308,27 +308,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|     KC_TRNS,KC_TRNS, KC_TILD,    KC_GRAVE,    KC_CIRC, |     KC_TRNS,KC_TRNS, KC_TILD,    KC_GRAVE,    KC_CIRC, | ||||||
|     // thumb cluster
 |     // thumb cluster
 | ||||||
|     KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, |     KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, | ||||||
|      | 
 | ||||||
|     // right hand
 |     // right hand
 | ||||||
|     KC_TRNS, KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     MEH(KC_L), |     KC_TRNS, KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     MEH(KC_L), | ||||||
|     KC_TRNS, KC_PLUS,     KC_7,    KC_8,    KC_9,    KC_ASTR,     MEH(KC_M), |     KC_TRNS, KC_PLUS,     KC_7,    KC_8,    KC_9,    KC_ASTR,     MEH(KC_M), | ||||||
|              KC_MINS,     KC_4,    KC_5,    KC_6,    KC_SLSH,     MEH(KC_N), |              KC_MINS,     KC_4,    KC_5,    KC_6,    KC_SLSH,     MEH(KC_N), | ||||||
|     KC_TRNS, KC_EQUAL,    KC_1,    KC_2,    KC_3,    KC_QUES,     MEH(KC_O), |     KC_TRNS, KC_EQUAL,    KC_1,    KC_2,    KC_3,    KC_QUES,     MEH(KC_O), | ||||||
|     // bottom row 
 |     // bottom row
 | ||||||
|                           KC_0,    KC_DOT,  KC_PIPE, KC_BSLS,     MEH(KC_P), |                           KC_0,    KC_DOT,  KC_PIPE, KC_BSLS,     MEH(KC_P), | ||||||
|     // thumb cluster
 |     // thumb cluster
 | ||||||
|     KC_TRNS,KC_TRNS, |     KC_TRNS,KC_TRNS, | ||||||
| 	KC_TRNS, | 	KC_TRNS, | ||||||
| 	KC_TRNS,KC_TRNS,KC_TRNS), | 	KC_TRNS,KC_TRNS,KC_TRNS), | ||||||
|    | 
 | ||||||
|    | 
 | ||||||
|     [MOUSE] = KEYMAP( |     [MOUSE] = LAYOUT_ergodox( | ||||||
|            KC_TRNS, KC_TRNS,      KC_TRNS,       KC_TRNS,       KC_TRNS,      KC_TRNS, KC_TRNS, |            KC_TRNS, KC_TRNS,      KC_TRNS,       KC_TRNS,       KC_TRNS,      KC_TRNS, KC_TRNS, | ||||||
|            KC_TRNS, KC_TRNS,      KC_PGUP,       KC_MS_WH_UP,   KC_UP,        KC_TRNS, KC_TRNS, |            KC_TRNS, KC_TRNS,      KC_PGUP,       KC_MS_WH_UP,   KC_UP,        KC_TRNS, KC_TRNS, | ||||||
|            KC_TRNS, KC_MS_ACCEL0, KC_PGDN,       KC_MS_WH_DOWN, KC_DOWN,      KC_TRNS, |            KC_TRNS, KC_MS_ACCEL0, KC_PGDN,       KC_MS_WH_DOWN, KC_DOWN,      KC_TRNS, | ||||||
|            KC_TRNS, KC_TRNS,      KC_TRNS,       KC_TRNS,       KC_TRNS,      KC_TRNS, KC_TRNS, |            KC_TRNS, KC_TRNS,      KC_TRNS,       KC_TRNS,       KC_TRNS,      KC_TRNS, KC_TRNS, | ||||||
|            KC_TRNS, KC_TRNS,      M(MOUSE_LOCK), KC_TRNS,       KC_MS_ACCEL0, |            KC_TRNS, KC_TRNS,      M(MOUSE_LOCK), KC_TRNS,       KC_MS_ACCEL0, | ||||||
|             | 
 | ||||||
|                                                KC_TRNS, KC_TRNS, |                                                KC_TRNS, KC_TRNS, | ||||||
|                                                         KC_TRNS, |                                                         KC_TRNS, | ||||||
|                                       KC_TRNS, KC_BTN3, KC_TRNS, |                                       KC_TRNS, KC_BTN3, KC_TRNS, | ||||||
|  | @ -342,9 +342,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|            KC_TRNS, KC_TRNS, |            KC_TRNS, KC_TRNS, | ||||||
|            KC_TRNS, |            KC_TRNS, | ||||||
|            KC_TRNS, KC_BTN1, KC_BTN2 |            KC_TRNS, KC_BTN1, KC_BTN2 | ||||||
|     ),   |     ), | ||||||
| 	 | 
 | ||||||
|     [BROWSER_CONTROL] = KEYMAP( |     [BROWSER_CONTROL] = LAYOUT_ergodox( | ||||||
| 		   // left hand
 | 		   // left hand
 | ||||||
|            KC_TRNS, KC_TRNS,      KC_TRNS,       KC_TRNS,       KC_TRNS,      KC_TRNS, KC_TRNS, |            KC_TRNS, KC_TRNS,      KC_TRNS,       KC_TRNS,       KC_TRNS,      KC_TRNS, KC_TRNS, | ||||||
|            KC_TRNS, KC_TRNS,      KC_BTN3,       KC_MS_U,       KC_BTN1,      KC_BTN2, KC_TRNS, |            KC_TRNS, KC_TRNS,      KC_BTN3,       KC_MS_U,       KC_BTN1,      KC_BTN2, KC_TRNS, | ||||||
|  | @ -352,7 +352,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|            KC_TRNS, KC_TRNS,      KC_TRNS,       KC_TRNS,       KC_TRNS,      KC_TRNS, KC_TRNS, |            KC_TRNS, KC_TRNS,      KC_TRNS,       KC_TRNS,       KC_TRNS,      KC_TRNS, KC_TRNS, | ||||||
| 		   // bottom row
 | 		   // bottom row
 | ||||||
|            KC_TRNS, KC_TRNS,      KC_TRNS,       KC_TRNS,       KC_TRNS, |            KC_TRNS, KC_TRNS,      KC_TRNS,       KC_TRNS,       KC_TRNS, | ||||||
|             | 
 | ||||||
|                                                KC_TRNS, KC_TRNS, |                                                KC_TRNS, KC_TRNS, | ||||||
|                                                         KC_TRNS, |                                                         KC_TRNS, | ||||||
|                                       KC_TRNS, KC_TRNS, KC_TRNS, |                                       KC_TRNS, KC_TRNS, KC_TRNS, | ||||||
|  | @ -366,8 +366,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|            KC_TRNS, KC_TRNS, |            KC_TRNS, KC_TRNS, | ||||||
|            KC_TRNS, |            KC_TRNS, | ||||||
|            KC_TRNS, RCTL(KC_W), RCTL(KC_T) |            KC_TRNS, RCTL(KC_W), RCTL(KC_T) | ||||||
|     ),  	 |     ), | ||||||
|      | 
 | ||||||
| 
 | 
 | ||||||
| }; | }; | ||||||
| 
 | 
 | ||||||
|  | @ -402,28 +402,28 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | ||||||
|         case SCREEN_TAB_LEFT: |         case SCREEN_TAB_LEFT: | ||||||
|             if (record->event.pressed) { |             if (record->event.pressed) { | ||||||
|                 return MACRO( D(LCTL), T(A), U(LCTL), T(P), END); |                 return MACRO( D(LCTL), T(A), U(LCTL), T(P), END); | ||||||
|             }         |             } | ||||||
|             break; |             break; | ||||||
|         case SCREEN_TAB_RIGHT: |         case SCREEN_TAB_RIGHT: | ||||||
|              if (record->event.pressed) { |              if (record->event.pressed) { | ||||||
|                 return MACRO( D(LCTL), T(A), U(LCTL), T(N), END); |                 return MACRO( D(LCTL), T(A), U(LCTL), T(N), END); | ||||||
|             }                     |             } | ||||||
|             break; |             break; | ||||||
|         case SCREEN_NEW_TAB: |         case SCREEN_NEW_TAB: | ||||||
|              if (record->event.pressed) { |              if (record->event.pressed) { | ||||||
|                 return MACRO( D(LCTL), T(A), U(LCTL), T(C), END); |                 return MACRO( D(LCTL), T(A), U(LCTL), T(C), END); | ||||||
|             }                                 |             } | ||||||
|         break; |         break; | ||||||
|         case SCREEN_DETACH: |         case SCREEN_DETACH: | ||||||
|              if (record->event.pressed) { |              if (record->event.pressed) { | ||||||
|                 return MACRO( D(LCTL), T(A), U(LCTL), T(D), END); |                 return MACRO( D(LCTL), T(A), U(LCTL), T(D), END); | ||||||
|             } |             } | ||||||
|         break;         |         break; | ||||||
|         case SCREEN_RENAME: |         case SCREEN_RENAME: | ||||||
|              if (record->event.pressed) { |              if (record->event.pressed) { | ||||||
|                 return MACRO( D(LCTL), T(A), U(LCTL), D(LSFT), T(A), U(LSFT), END); |                 return MACRO( D(LCTL), T(A), U(LCTL), D(LSFT), T(A), U(LSFT), END); | ||||||
|             }                                 |             } | ||||||
|         break;         |         break; | ||||||
|         case SCREEN_NUMBER: |         case SCREEN_NUMBER: | ||||||
|              if (record->event.pressed) { |              if (record->event.pressed) { | ||||||
|                 return MACRO( D(LCTL), T(A), U(LCTL), D(LSFT), T(SCOLON), U(LSFT), |                 return MACRO( D(LCTL), T(A), U(LCTL), D(LSFT), T(SCOLON), U(LSFT), | ||||||
|  | @ -435,13 +435,13 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | ||||||
|                               T(R), |                               T(R), | ||||||
|                               T(SPC), |                               T(SPC), | ||||||
|                              END); |                              END); | ||||||
|             }                                 |             } | ||||||
|         break;         |         break; | ||||||
| 
 | 
 | ||||||
| 		MACRO_SCREEN_REG(SCREEN_READREG_1,1); | 		MACRO_SCREEN_REG(SCREEN_READREG_1,1); | ||||||
| 		MACRO_SCREEN_REG(SCREEN_READREG_2,2); | 		MACRO_SCREEN_REG(SCREEN_READREG_2,2); | ||||||
| 		MACRO_SCREEN_REG(SCREEN_READREG_3,3); | 		MACRO_SCREEN_REG(SCREEN_READREG_3,3); | ||||||
| 		 | 
 | ||||||
| 		MACRO_SCREEN_PASTE(SCREEN_PASTEREG_1,1); | 		MACRO_SCREEN_PASTE(SCREEN_PASTEREG_1,1); | ||||||
| 		MACRO_SCREEN_PASTE(SCREEN_PASTEREG_2,2); | 		MACRO_SCREEN_PASTE(SCREEN_PASTEREG_2,2); | ||||||
| 		MACRO_SCREEN_PASTE(SCREEN_PASTEREG_3,3); | 		MACRO_SCREEN_PASTE(SCREEN_PASTEREG_3,3); | ||||||
|  | @ -456,19 +456,19 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | ||||||
|         MACRO_SCREEN_NUM(SCREEN_7,7); |         MACRO_SCREEN_NUM(SCREEN_7,7); | ||||||
|         MACRO_SCREEN_NUM(SCREEN_8,8); |         MACRO_SCREEN_NUM(SCREEN_8,8); | ||||||
|         MACRO_SCREEN_NUM(SCREEN_9,9); |         MACRO_SCREEN_NUM(SCREEN_9,9); | ||||||
|          | 
 | ||||||
| 		case SCREEN_UP_JUMP: | 		case SCREEN_UP_JUMP: | ||||||
|             if (record->event.pressed) { |             if (record->event.pressed) { | ||||||
|                 return MACRO( T(5), T(UP), END); |                 return MACRO( T(5), T(UP), END); | ||||||
|             }		 |             } | ||||||
| 		break; | 		break; | ||||||
| 		 | 
 | ||||||
| 		case SCREEN_DOWN_JUMP: | 		case SCREEN_DOWN_JUMP: | ||||||
|             if (record->event.pressed) { |             if (record->event.pressed) { | ||||||
|                 return MACRO( T(5), T(DOWN), END); |                 return MACRO( T(5), T(DOWN), END); | ||||||
|             }		 |             } | ||||||
| 		break;		 | 		break; | ||||||
| 		 | 
 | ||||||
|         case SCREEN_COPY_MODE: |         case SCREEN_COPY_MODE: | ||||||
|             if (record->event.pressed) { |             if (record->event.pressed) { | ||||||
|                 return MACRO( D(LCTL), T(A), U(LCTL), T(ESC), END); |                 return MACRO( D(LCTL), T(A), U(LCTL), T(ESC), END); | ||||||
|  | @ -476,42 +476,42 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | ||||||
|         break; |         break; | ||||||
|         case SCREEN_PASTE: |         case SCREEN_PASTE: | ||||||
|             if (record->event.pressed) { |             if (record->event.pressed) { | ||||||
|                 return MACRO( D(LCTL), T(A), U(LCTL), T(RBRC), END);  |                 return MACRO( D(LCTL), T(A), U(LCTL), T(RBRC), END); | ||||||
|             } |             } | ||||||
|         break;         |         break; | ||||||
| 		 | 
 | ||||||
| 		case SHELL_WRITE_LOGPATTERN: | 		case SHELL_WRITE_LOGPATTERN: | ||||||
|             if (record->event.pressed) { |             if (record->event.pressed) { | ||||||
|                 return MACRO( D(LSFT), |                 return MACRO( D(LSFT), | ||||||
| 							  T(8),  | 							  T(8), | ||||||
| 				              T(8),  | 				              T(8), | ||||||
| 							  U(LSFT), | 							  U(LSFT), | ||||||
| 							  T(L),   | 							  T(L), | ||||||
| 							  T(O),  | 							  T(O), | ||||||
| 							  T(G),  | 							  T(G), | ||||||
| 							  T(LEFT),  | 							  T(LEFT), | ||||||
| 							  T(LEFT),  | 							  T(LEFT), | ||||||
| 							  T(LEFT),  | 							  T(LEFT), | ||||||
| 							  T(LEFT),  | 							  T(LEFT), | ||||||
| 							  END);  | 							  END); | ||||||
|             }		 |             } | ||||||
| 		break; | 		break; | ||||||
| 		 | 
 | ||||||
| 		case SHELL_WRITE_TRANPATTERN: | 		case SHELL_WRITE_TRANPATTERN: | ||||||
|             if (record->event.pressed) { |             if (record->event.pressed) { | ||||||
|                 return MACRO( D(LSFT), |                 return MACRO( D(LSFT), | ||||||
| 							  T(8),  | 							  T(8), | ||||||
| 				              T(8),  | 				              T(8), | ||||||
| 							  U(LSFT), T(T), T(R), T(A), T(N), T(LEFT), T(LEFT), T(LEFT), T(LEFT), T(LEFT), END);  | 							  U(LSFT), T(T), T(R), T(A), T(N), T(LEFT), T(LEFT), T(LEFT), T(LEFT), T(LEFT), END); | ||||||
|             }		 |             } | ||||||
| 		break;		 | 		break; | ||||||
| 		 | 
 | ||||||
| 		case SHELL_EXPAND_PATTERN: | 		case SHELL_EXPAND_PATTERN: | ||||||
|             if (record->event.pressed) { |             if (record->event.pressed) { | ||||||
|                 return MACRO( D(LALT), T(F), U(LALT), D(LCTL), T(X), U(LCTL), D(LSFT), T(8), D(LSFT), END);  |                 return MACRO( D(LALT), T(F), U(LALT), D(LCTL), T(X), U(LCTL), D(LSFT), T(8), D(LSFT), END); | ||||||
|             }		 |             } | ||||||
| 		break;				 | 		break; | ||||||
|     | 
 | ||||||
|       } |       } | ||||||
|     return MACRO_NONE; |     return MACRO_NONE; | ||||||
| }; | }; | ||||||
|  | @ -538,7 +538,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | ||||||
|       return false; |       return false; | ||||||
|       break; |       break; | ||||||
|   } |   } | ||||||
|    | 
 | ||||||
|   // shell macros
 |   // shell macros
 | ||||||
|   if(record->event.pressed) { |   if(record->event.pressed) { | ||||||
|     switch (keycode) { |     switch (keycode) { | ||||||
|  | @ -569,7 +569,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | ||||||
|         case SHELL_PGREP: |         case SHELL_PGREP: | ||||||
|             SEND_STRING(" | grep "); |             SEND_STRING(" | grep "); | ||||||
|             return true; |             return true; | ||||||
|             break;             |             break; | ||||||
|         case SHELL_TAILF: |         case SHELL_TAILF: | ||||||
|             SEND_STRING("tail -f "); |             SEND_STRING("tail -f "); | ||||||
|             return true; |             return true; | ||||||
|  | @ -577,19 +577,19 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | ||||||
|         case SHELL_PWD: |         case SHELL_PWD: | ||||||
|             SEND_STRING("echo `pwd`/"); |             SEND_STRING("echo `pwd`/"); | ||||||
|             return true; |             return true; | ||||||
|             break;             |             break; | ||||||
|         case SHELL_H3: |         case SHELL_H3: | ||||||
|             SEND_STRING("h3\n"); |             SEND_STRING("h3\n"); | ||||||
|             return true; |             return true; | ||||||
|             break;             |             break; | ||||||
|         case SHELL_AMMCOLO: |         case SHELL_AMMCOLO: | ||||||
|             SEND_STRING("ammcolo\n"); |             SEND_STRING("ammcolo\n"); | ||||||
|             return true; |             return true; | ||||||
|             break;             |             break; | ||||||
|         case SHELL_SCREENRD: |         case SHELL_SCREENRD: | ||||||
|             SEND_STRING("screen -r -d "); |             SEND_STRING("screen -r -d "); | ||||||
|             return true; |             return true; | ||||||
|             break;                     |             break; | ||||||
|         case SHELL_SCREEN_NEW: |         case SHELL_SCREEN_NEW: | ||||||
|             SEND_STRING("screen -S "); |             SEND_STRING("screen -S "); | ||||||
|             return true; |             return true; | ||||||
|  | @ -597,44 +597,44 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | ||||||
|         case SHELL_SCREEN_LIST: |         case SHELL_SCREEN_LIST: | ||||||
|             SEND_STRING("screen -list\n"); |             SEND_STRING("screen -list\n"); | ||||||
|             return true; |             return true; | ||||||
|             break;             |             break; | ||||||
|         case SHELL_MKE: |         case SHELL_MKE: | ||||||
|             SEND_STRING("mke\n"); |             SEND_STRING("mke\n"); | ||||||
|             return true; |             return true; | ||||||
|             break;      |             break; | ||||||
|         case SHELL_HTCSTATUS: |         case SHELL_HTCSTATUS: | ||||||
|             SEND_STRING("htcStatus -j "); |             SEND_STRING("htcStatus -j "); | ||||||
|             return true; |             return true; | ||||||
|             break;                |             break; | ||||||
| 		// Cloud9 macros
 | 		// Cloud9 macros
 | ||||||
| 		case CLOUD9_TAB_LEFT: | 		case CLOUD9_TAB_LEFT: | ||||||
|             SEND_STRING(SS_LCTRL("[")); |             SEND_STRING(SS_LCTRL("[")); | ||||||
|             return true;		 |             return true; | ||||||
| 			break; | 			break; | ||||||
| 		case CLOUD9_TAB_RIGHT: | 		case CLOUD9_TAB_RIGHT: | ||||||
|             SEND_STRING(SS_LCTRL("]")); |             SEND_STRING(SS_LCTRL("]")); | ||||||
|             return true;				 |             return true; | ||||||
| 			break; | 			break; | ||||||
| 		case CLOUD9_TAB_CLOSE: | 		case CLOUD9_TAB_CLOSE: | ||||||
|             SEND_STRING(SS_LALT("w")); |             SEND_STRING(SS_LALT("w")); | ||||||
|             return true;				 |             return true; | ||||||
| 			break; | 			break; | ||||||
| 		case CLOUD9_GOTO_SYMBOL: | 		case CLOUD9_GOTO_SYMBOL: | ||||||
|             SEND_STRING(SS_LSFT(SS_LCTRL("e"))); |             SEND_STRING(SS_LSFT(SS_LCTRL("e"))); | ||||||
|             return true;		 |             return true; | ||||||
| 			break; | 			break; | ||||||
| 		case CLOUD9_GOTO_LINE: | 		case CLOUD9_GOTO_LINE: | ||||||
|             SEND_STRING(SS_LCTRL("g")); |             SEND_STRING(SS_LCTRL("g")); | ||||||
|             return true;						 |             return true; | ||||||
| 			break; | 			break; | ||||||
| 		case CLOUD9_NAVIGATE: | 		case CLOUD9_NAVIGATE: | ||||||
|             SEND_STRING(SS_LCTRL("e")); |             SEND_STRING(SS_LCTRL("e")); | ||||||
|             return true; |             return true; | ||||||
| 			break; | 			break; | ||||||
|   		 | 
 | ||||||
|     } |     } | ||||||
|   } |   } | ||||||
|    | 
 | ||||||
|   return true; |   return true; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | @ -655,9 +655,9 @@ void matrix_scan_user(void) { | ||||||
|     ergodox_right_led_3_off(); |     ergodox_right_led_3_off(); | ||||||
|     switch (layer) { |     switch (layer) { | ||||||
|         case COMBINED: |         case COMBINED: | ||||||
|             ergodox_right_led_2_on();         |             ergodox_right_led_2_on(); | ||||||
|             break; |             break; | ||||||
|         case SHELL_NAV:             |         case SHELL_NAV: | ||||||
|         case SHELL_SCREEN: |         case SHELL_SCREEN: | ||||||
|         case KEYNAV: |         case KEYNAV: | ||||||
|         case KEYSEL: |         case KEYSEL: | ||||||
|  |  | ||||||
|  | @ -20,7 +20,7 @@ | ||||||
| 
 | 
 | ||||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
| 
 | 
 | ||||||
|   [DVORAK] = LAYOUT_wrapper ( |   [DVORAK] = LAYOUT_ergodox_wrapper( | ||||||
|                              // left hand
 |                              // left hand
 | ||||||
|                              KC_GRV,     ___NUMBER_L___,   DEF_OS_LAYER_SW, |                              KC_GRV,     ___NUMBER_L___,   DEF_OS_LAYER_SW, | ||||||
|                              KC_LOCK,    ___DVORAK_L1___,  KC_LBRC, |                              KC_LOCK,    ___DVORAK_L1___,  KC_LBRC, | ||||||
|  | @ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|                              ___ERGODOX_THUMB_RIGHT___ |                              ___ERGODOX_THUMB_RIGHT___ | ||||||
|                              ), |                              ), | ||||||
| 
 | 
 | ||||||
|   [XMONAD] = LAYOUT_wrapper ( |   [XMONAD] = LAYOUT_ergodox_wrapper( | ||||||
|                              // left hand
 |                              // left hand
 | ||||||
|                              ___,  ___FUNC_L___,     ___, |                              ___,  ___FUNC_L___,     ___, | ||||||
|                              ___,  ___DVORAK_L1___,  ___, |                              ___,  ___DVORAK_L1___,  ___, | ||||||
|  | @ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|                              ___ERGODOX_THUMB_RIGHT___ |                              ___ERGODOX_THUMB_RIGHT___ | ||||||
|                              ), |                              ), | ||||||
| 
 | 
 | ||||||
|   [QWERTY] = LAYOUT_wrapper( |   [QWERTY] = LAYOUT_ergodox_wrapper( | ||||||
|                             // left hand
 |                             // left hand
 | ||||||
|                             KC_GRV,     ___NUMBER_L___,   DEF_OS_LAYER_SW, |                             KC_GRV,     ___NUMBER_L___,   DEF_OS_LAYER_SW, | ||||||
|                             KC_LOCK,    ___QWERTY_L1___,  KC_LBRC, |                             KC_LOCK,    ___QWERTY_L1___,  KC_LBRC, | ||||||
|  | @ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|                             ___ERGODOX_THUMB_RIGHT___ |                             ___ERGODOX_THUMB_RIGHT___ | ||||||
|                             ), |                             ), | ||||||
| 
 | 
 | ||||||
|   [COLEMAK] = LAYOUT_wrapper ( |   [COLEMAK] = LAYOUT_ergodox_wrapper( | ||||||
|                               // left hand
 |                               // left hand
 | ||||||
|                               KC_GRV,     ___NUMBER_L___,    DEF_OS_LAYER_SW, |                               KC_GRV,     ___NUMBER_L___,    DEF_OS_LAYER_SW, | ||||||
|                               KC_LOCK,    ___COLEMAK_L1___,  KC_LBRC, |                               KC_LOCK,    ___COLEMAK_L1___,  KC_LBRC, | ||||||
|  | @ -100,7 +100,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|                               ___ERGODOX_THUMB_RIGHT___ |                               ___ERGODOX_THUMB_RIGHT___ | ||||||
|                               ), |                               ), | ||||||
| 
 | 
 | ||||||
|   [WORKMAN] = LAYOUT_wrapper ( |   [WORKMAN] = LAYOUT_ergodox_wrapper( | ||||||
|                               // left hand
 |                               // left hand
 | ||||||
|                               KC_GRV,     ___NUMBER_L___,    DEF_OS_LAYER_SW, |                               KC_GRV,     ___NUMBER_L___,    DEF_OS_LAYER_SW, | ||||||
|                               KC_LOCK,    ___WORKMAN_L1___,  KC_LBRC, |                               KC_LOCK,    ___WORKMAN_L1___,  KC_LBRC, | ||||||
|  | @ -120,7 +120,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|                               ___ERGODOX_THUMB_RIGHT___ |                               ___ERGODOX_THUMB_RIGHT___ | ||||||
|                               ), |                               ), | ||||||
| 
 | 
 | ||||||
|   [NORMAN] = LAYOUT_wrapper( |   [NORMAN] = LAYOUT_ergodox_wrapper( | ||||||
|                             // left hand
 |                             // left hand
 | ||||||
|                             KC_GRV,     ___NUMBER_L___,   DEF_OS_LAYER_SW, |                             KC_GRV,     ___NUMBER_L___,   DEF_OS_LAYER_SW, | ||||||
|                             KC_LOCK,    ___NORMAN_L1___,  KC_LBRC, |                             KC_LOCK,    ___NORMAN_L1___,  KC_LBRC, | ||||||
|  | @ -140,7 +140,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|                             ___ERGODOX_THUMB_RIGHT___ |                             ___ERGODOX_THUMB_RIGHT___ | ||||||
|                             ), |                             ), | ||||||
| 
 | 
 | ||||||
|   [DVORAK_ON_BEPO] = LAYOUT_wrapper( |   [DVORAK_ON_BEPO] = LAYOUT_ergodox_wrapper( | ||||||
|                                     // left hand
 |                                     // left hand
 | ||||||
|                                     DB_GRV,     ___NUMBER_BEPO_L___,  DEF_OS_LAYER_SW, |                                     DB_GRV,     ___NUMBER_BEPO_L___,  DEF_OS_LAYER_SW, | ||||||
|                                     KC_LOCK,    ___DVORAK_FR_L1___,   DB_LBRC, |                                     KC_LOCK,    ___DVORAK_FR_L1___,   DB_LBRC, | ||||||
|  | @ -162,7 +162,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|                                     ___ERGODOX_THUMB_RIGHT___ |                                     ___ERGODOX_THUMB_RIGHT___ | ||||||
|                                     ), |                                     ), | ||||||
| 
 | 
 | ||||||
|   [XMONAD_FR] = LAYOUT_wrapper( |   [XMONAD_FR] = LAYOUT_ergodox_wrapper( | ||||||
|                                // left hand
 |                                // left hand
 | ||||||
|                                ___,  ___FUNC_L___,        ___, |                                ___,  ___FUNC_L___,        ___, | ||||||
|                                ___,  ___DVORAK_FR_L1___,  ___, |                                ___,  ___DVORAK_FR_L1___,  ___, | ||||||
|  | @ -183,7 +183,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|                                ___ERGODOX_THUMB_RIGHT___ |                                ___ERGODOX_THUMB_RIGHT___ | ||||||
|                                ), |                                ), | ||||||
| 
 | 
 | ||||||
|   [BEPO] = LAYOUT_wrapper ( |   [BEPO] = LAYOUT_ergodox_wrapper( | ||||||
|                            // Left hand
 |                            // Left hand
 | ||||||
|                            BP_DLR,         ___SYMBOL_BEPO_L___,  DEF_OS_LAYER_SW, |                            BP_DLR,         ___SYMBOL_BEPO_L___,  DEF_OS_LAYER_SW, | ||||||
|                            KC_LOCK,        ___BEPO_FR_L1___,     DB_LBRC, |                            KC_LOCK,        ___BEPO_FR_L1___,     DB_LBRC, | ||||||
|  | @ -205,7 +205,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|                            ), |                            ), | ||||||
| 
 | 
 | ||||||
|   // SYMBOLS
 |   // SYMBOLS
 | ||||||
|   [SYMB] = LAYOUT_wrapper( |   [SYMB] = LAYOUT_ergodox_wrapper( | ||||||
|                           // left hand
 |                           // left hand
 | ||||||
|                           ___,  ___FUNC_L___,     ___, |                           ___,  ___FUNC_L___,     ___, | ||||||
|                           ___,  ___SYMBOLS_1___,  ___, |                           ___,  ___SYMBOLS_1___,  ___, | ||||||
|  | @ -226,7 +226,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|                           ___ERGODOX_TRANS_THUMBS___ |                           ___ERGODOX_TRANS_THUMBS___ | ||||||
|                           ), |                           ), | ||||||
| 
 | 
 | ||||||
|   [SYMB_ON_BEPO] = LAYOUT_wrapper( |   [SYMB_ON_BEPO] = LAYOUT_ergodox_wrapper( | ||||||
|                                   // left hand
 |                                   // left hand
 | ||||||
|                                   ___,  ___FUNC_L___,     ___, |                                   ___,  ___FUNC_L___,     ___, | ||||||
|                                   ___,  ___SYMBOLS_1_BP___,  ___, |                                   ___,  ___SYMBOLS_1_BP___,  ___, | ||||||
|  | @ -248,7 +248,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|                                   ), |                                   ), | ||||||
| 
 | 
 | ||||||
|   // MEDIA AND MOUSE
 |   // MEDIA AND MOUSE
 | ||||||
|   [MDIA] = LAYOUT_wrapper( |   [MDIA] = LAYOUT_ergodox_wrapper( | ||||||
|                           // left hand
 |                           // left hand
 | ||||||
|                           ___,  ___FUNC_L___,  ___, |                           ___,  ___FUNC_L___,  ___, | ||||||
|                           ___MOUSE_BTNS_L___,  ___, ___, |                           ___MOUSE_BTNS_L___,  ___, ___, | ||||||
|  | @ -266,7 +266,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|                           ___ERGODOX_TRANS_THUMBS___ |                           ___ERGODOX_TRANS_THUMBS___ | ||||||
|                           ), |                           ), | ||||||
| 
 | 
 | ||||||
|   [LAYERS] = LAYOUT_wrapper( |   [LAYERS] = LAYOUT_ergodox_wrapper( | ||||||
|                             // left hand
 |                             // left hand
 | ||||||
|                             ___,  ___FUNC_L___,  ___, |                             ___,  ___FUNC_L___,  ___, | ||||||
|                             XXX,  XXX,  XXX, ___LAYERS_L1___,  XXX, XXX, |                             XXX,  XXX,  XXX, ___LAYERS_L1___,  XXX, XXX, | ||||||
|  |  | ||||||
|  | @ -1,8 +1,8 @@ | ||||||
|  | #include QMK_KEYBOARD_H | ||||||
| #include "action_layer.h" | #include "action_layer.h" | ||||||
| #include "action_util.h" | #include "action_util.h" | ||||||
| #include "debug.h" | #include "debug.h" | ||||||
| #include "eeconfig.h" | #include "eeconfig.h" | ||||||
| #include "ergodox_ez.h" |  | ||||||
| #include "version.h" | #include "version.h" | ||||||
| #include "wait.h" | #include "wait.h" | ||||||
| 
 | 
 | ||||||
|  | @ -89,7 +89,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|          *                                  `--------------------'           `--------------------' |          *                                  `--------------------'           `--------------------' | ||||||
|          */ |          */ | ||||||
| 
 | 
 | ||||||
|         [COLE] = KEYMAP( |         [COLE] = LAYOUT_ergodox( | ||||||
|             // Left Hand
 |             // Left Hand
 | ||||||
|             TD(TD_FIND), KC_1, KC_2, KC_3, KC_4, KC_5, TD(TD_UNDO), |             TD(TD_FIND), KC_1, KC_2, KC_3, KC_4, KC_5, TD(TD_UNDO), | ||||||
|             TD(TD_BTK), KC_Q, KC_W, KC_F, KC_P, KC_G, TD(TD_COPY), |             TD(TD_BTK), KC_Q, KC_W, KC_F, KC_P, KC_G, TD(TD_COPY), | ||||||
|  | @ -132,7 +132,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|          *                                  |      |      | ---- |           | ---- |      |      | |          *                                  |      |      | ---- |           | ---- |      |      | | ||||||
|          *                                  `--------------------'           `--------------------' |          *                                  `--------------------'           `--------------------' | ||||||
|          */ |          */ | ||||||
|         [LOWER] = KEYMAP( |         [LOWER] = LAYOUT_ergodox( | ||||||
|             // Left Hand
 |             // Left Hand
 | ||||||
|             ____, ____, ____, ____, ____, ____, ____, |             ____, ____, ____, ____, ____, ____, ____, | ||||||
|             ____, ____, ____, ____, ____, ____, ____, |             ____, ____, ____, ____, ____, ____, ____, | ||||||
|  | @ -175,7 +175,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|          *                                  |      |      | ---- |           | ---- |      |      | |          *                                  |      |      | ---- |           | ---- |      |      | | ||||||
|          *                                  `--------------------'           `--------------------' |          *                                  `--------------------'           `--------------------' | ||||||
|          */ |          */ | ||||||
|         [RAISE] = KEYMAP( |         [RAISE] = LAYOUT_ergodox( | ||||||
|             // Left Hand
 |             // Left Hand
 | ||||||
|             KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, ____, |             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_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ____, | ||||||
|  | @ -218,7 +218,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|          *                                  |      |      | ---- |           | VAD |      |      | |          *                                  |      |      | ---- |           | VAD |      |      | | ||||||
|          *                                  `--------------------'           `--------------------' |          *                                  `--------------------'           `--------------------' | ||||||
|          */ |          */ | ||||||
|         [AUX] = KEYMAP( |         [AUX] = LAYOUT_ergodox( | ||||||
|             // Left Hand
 |             // Left Hand
 | ||||||
|             M(CF_EPRM), ____, ____, ____, ____, ____, KC_PWR, |             M(CF_EPRM), ____, ____, ____, ____, ____, KC_PWR, | ||||||
|             ____, ____, ____, ____, ____, ____, KC_SLEP, |             ____, ____, ____, ____, ____, ____, KC_SLEP, | ||||||
|  |  | ||||||
|  | @ -1,4 +1,4 @@ | ||||||
| #include "ergodox_ez.h" | #include QMK_KEYBOARD_H | ||||||
| #include "debug.h" | #include "debug.h" | ||||||
| #include "action_layer.h" | #include "action_layer.h" | ||||||
| 
 | 
 | ||||||
|  | @ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|  *                                 |      |      | Ctrl |       | Ctrl |        |      | |  *                                 |      |      | Ctrl |       | Ctrl |        |      | | ||||||
|  *                                 `--------------------'       `----------------------' |  *                                 `--------------------'       `----------------------' | ||||||
|  */ |  */ | ||||||
| [BASE] = KEYMAP(  // layer 0 : default
 | [BASE] = LAYOUT_ergodox(  // layer 0 : default
 | ||||||
|         // left hand
 |         // left hand
 | ||||||
|    LT(NAV,KC_ESC),  KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_DELETE, |    LT(NAV,KC_ESC),  KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_DELETE, | ||||||
|         KC_TAB,     KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   CTL_T(KC_ESC), |         KC_TAB,     KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   CTL_T(KC_ESC), | ||||||
|  | @ -78,7 +78,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|  *                                 |      |      |      |       |      |      |      | |  *                                 |      |      |      |       |      |      |      | | ||||||
|  *                                 `--------------------'       `--------------------' |  *                                 `--------------------'       `--------------------' | ||||||
|  */ |  */ | ||||||
| [SYMB_L] = KEYMAP( | [SYMB_L] = LAYOUT_ergodox( | ||||||
|        // left hand
 |        // left hand
 | ||||||
|        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, |        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, | ||||||
|        KC_TRNS,  KC_GRV ,  KC_TILD,  KC_ASTR,  KC_AMPR,  KC_SLSH,  LSFT(KC_COMM), |        KC_TRNS,  KC_GRV ,  KC_TILD,  KC_ASTR,  KC_AMPR,  KC_SLSH,  LSFT(KC_COMM), | ||||||
|  | @ -99,7 +99,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|        KC_TRNS,  KC_SCLN,  KC_DOT |        KC_TRNS,  KC_SCLN,  KC_DOT | ||||||
| ), | ), | ||||||
| 
 | 
 | ||||||
| [SYMB_R] = KEYMAP(  // same as above, but avoids clash between SYMB and ;/:
 | [SYMB_R] = LAYOUT_ergodox(  // same as above, but avoids clash between SYMB and ;/:
 | ||||||
|        // left hand
 |        // left hand
 | ||||||
|        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, |        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, | ||||||
|        KC_TRNS,  KC_GRV ,  KC_TILD,  KC_ASTR,  KC_AMPR,  KC_SLSH,  LSFT(KC_COMM), |        KC_TRNS,  KC_GRV ,  KC_TILD,  KC_ASTR,  KC_AMPR,  KC_SLSH,  LSFT(KC_COMM), | ||||||
|  | @ -140,7 +140,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|  *                                 |      |      |      |       |      |      |      | |  *                                 |      |      |      |       |      |      |      | | ||||||
|  *                                 `--------------------'       `--------------------' |  *                                 `--------------------'       `--------------------' | ||||||
|  */ |  */ | ||||||
| [NAV] = KEYMAP( | [NAV] = LAYOUT_ergodox( | ||||||
|        // left hand
 |        // left hand
 | ||||||
|        KC_TRNS,  KC_F1,    KC_F2,          KC_F3,        KC_F4,    KC_F5,  KC_PAUSE, |        KC_TRNS,  KC_F1,    KC_F2,          KC_F3,        KC_F4,    KC_F5,  KC_PAUSE, | ||||||
|        KC_TRNS,  KC_F1,    KC_F2,          KC_F3,        KC_F4,    KC_F5,  KC_TRNS, |        KC_TRNS,  KC_F1,    KC_F2,          KC_F3,        KC_F4,    KC_F5,  KC_TRNS, | ||||||
|  |  | ||||||
|  | @ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|  */ |  */ | ||||||
| // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 | // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 | ||||||
| // Otherwise, it needs KC_*
 | // Otherwise, it needs KC_*
 | ||||||
| [BASE] = KEYMAP_80(  // layer 0 : default
 | [BASE] = LAYOUT_ergodox_80(  // layer 0 : default
 | ||||||
|         // left hand
 |         // left hand
 | ||||||
|         KC_EQL,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_LEFT, |         KC_EQL,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_LEFT, | ||||||
|         KC_DELT,        KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   TG(SYMB), |         KC_DELT,        KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   TG(SYMB), | ||||||
|  | @ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|  *                                 `--------------------'       `--------------------' |  *                                 `--------------------'       `--------------------' | ||||||
|  */ |  */ | ||||||
| // SYMBOLS
 | // SYMBOLS
 | ||||||
| [SYMB] = KEYMAP_80( | [SYMB] = LAYOUT_ergodox_80( | ||||||
|        // left hand
 |        // left hand
 | ||||||
|        M(0),   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS, |        M(0),   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS, | ||||||
|        KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS, |        KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS, | ||||||
|  | @ -115,7 +115,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|  *                                 `--------------------'       `------------------------' |  *                                 `--------------------'       `------------------------' | ||||||
|  */ |  */ | ||||||
| // MEDIA AND MOUSE
 | // MEDIA AND MOUSE
 | ||||||
| [MDIA] = KEYMAP_80( | [MDIA] = LAYOUT_ergodox_80( | ||||||
|        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||||||
|        KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS, |        KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS, | ||||||
|        KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, |        KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, | ||||||
|  |  | ||||||
|  | @ -1,6 +1,5 @@ | ||||||
| #include QMK_KEYBOARD_H | #include QMK_KEYBOARD_H | ||||||
| 
 | 
 | ||||||
| #include "ergodox_ez.h" |  | ||||||
| #include "debug.h" | #include "debug.h" | ||||||
| #include "action_layer.h" | #include "action_layer.h" | ||||||
| 
 | 
 | ||||||
|  | @ -13,7 +12,7 @@ | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|      | 
 | ||||||
|     [BASE] = LAYOUT_ergodox( |     [BASE] = LAYOUT_ergodox( | ||||||
| 
 | 
 | ||||||
|     // Left side
 |     // Left side
 | ||||||
|  | @ -93,7 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|         /*=============================================*/ |         /*=============================================*/ | ||||||
|     ), |     ), | ||||||
| 
 | 
 | ||||||
|      | 
 | ||||||
|     [SPEC] = LAYOUT_ergodox( |     [SPEC] = LAYOUT_ergodox( | ||||||
| 
 | 
 | ||||||
|     // Left side
 |     // Left side
 | ||||||
|  |  | ||||||
|  | @ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|  */ |  */ | ||||||
| // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 | // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 | ||||||
| // Otherwise, it needs KC_*
 | // Otherwise, it needs KC_*
 | ||||||
| [BASE] = KEYMAP(  // layer 0 : default
 | [BASE] = LAYOUT_ergodox(  // layer 0 : default
 | ||||||
|         // left hand
 |         // left hand
 | ||||||
|         KC_EQL,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_LEFT, |         KC_EQL,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_LEFT, | ||||||
|         KC_DELT,        KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   TG(SYMB), |         KC_DELT,        KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   TG(SYMB), | ||||||
|  | @ -76,7 +76,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|  *                                 `--------------------'       `--------------------' |  *                                 `--------------------'       `--------------------' | ||||||
|  */ |  */ | ||||||
| // SYMBOLS
 | // SYMBOLS
 | ||||||
| [SYMB] = KEYMAP( | [SYMB] = LAYOUT_ergodox( | ||||||
|        // left hand
 |        // left hand
 | ||||||
|        M(0),   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS, |        M(0),   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS, | ||||||
|        KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS, |        KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS, | ||||||
|  | @ -118,7 +118,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|  *                                 `--------------------'       `--------------------' |  *                                 `--------------------'       `--------------------' | ||||||
|  */ |  */ | ||||||
| // MEDIA AND MOUSE
 | // MEDIA AND MOUSE
 | ||||||
| [MDIA] = KEYMAP( | [MDIA] = LAYOUT_ergodox( | ||||||
|        RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |        RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||||||
|        KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS, |        KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS, | ||||||
|        KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, |        KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, | ||||||
|  | @ -188,23 +188,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|  *                                 `--------------------'       `--------------------' |  *                                 `--------------------'       `--------------------' | ||||||
|  */ |  */ | ||||||
| // TxBolt over Serial
 | // TxBolt over Serial
 | ||||||
| [TXBOLT] = KEYMAP( | [TXBOLT] = LAYOUT_ergodox( | ||||||
|        KC_BSPC, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   |        KC_BSPC, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, | ||||||
|        KC_NO,   M(NM),   M(NM),   M(NM),   M(NM),   M(NM),  KC_NO,   |        KC_NO,   M(NM),   M(NM),   M(NM),   M(NM),   M(NM),  KC_NO, | ||||||
|        KC_NO,   M(Sl),   M(Tl),   M(Pl),   M(Hl),   M(X), |        KC_NO,   M(Sl),   M(Tl),   M(Pl),   M(Hl),   M(X), | ||||||
|        KC_NO,   M(Sl),   M(Kl),   M(Wl),   M(Rl),   M(X),   KC_NO, |        KC_NO,   M(Sl),   M(Kl),   M(Wl),   M(Rl),   M(X),   KC_NO, | ||||||
|        KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, |        KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, | ||||||
|                                            KC_NO,   KC_NO,   |                                            KC_NO,   KC_NO, | ||||||
|                                                     KC_NO,   |                                                     KC_NO, | ||||||
|                                   M(Al),   M(Ol),   KC_NO,   |                                   M(Al),   M(Ol),   KC_NO, | ||||||
|     // right hand
 |     // right hand
 | ||||||
|        KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   |        KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, | ||||||
|        KC_TRNS,  M(NM),   M(NM),   M(NM),   M(NM),   M(NM),   M(NM), |        KC_TRNS,  M(NM),   M(NM),   M(NM),   M(NM),   M(NM),   M(NM), | ||||||
|                  M(X),    M(Fr),   M(Pr),   M(Lr),   M(Tr),   M(Dr), |                  M(X),    M(Fr),   M(Pr),   M(Lr),   M(Tr),   M(Dr), | ||||||
|        KC_NO,    M(X),    M(Rr),   M(Br),   M(Gr),   M(Sr),   M(Zr), |        KC_NO,    M(X),    M(Rr),   M(Br),   M(Gr),   M(Sr),   M(Zr), | ||||||
|                           KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   |                           KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, | ||||||
|        KC_NO,   KC_NO,   |        KC_NO,   KC_NO, | ||||||
|        KC_NO,   |        KC_NO, | ||||||
|        KC_NO,   M(Er),   M(Ur) |        KC_NO,   M(Er),   M(Ur) | ||||||
| ), | ), | ||||||
| /* Keymap 4: TxBolt (Serial) Alternative
 | /* Keymap 4: TxBolt (Serial) Alternative
 | ||||||
|  | @ -229,23 +229,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|  *                                 `--------------------'       `--------------------' |  *                                 `--------------------'       `--------------------' | ||||||
|  */ |  */ | ||||||
| // TxBolt over Serial
 | // TxBolt over Serial
 | ||||||
| [TXBOLT2] = KEYMAP( | [TXBOLT2] = LAYOUT_ergodox( | ||||||
|        KC_NO,   M(NM),   M(NM),   M(NM),   M(NM),   M(NM),  KC_NO,   |        KC_NO,   M(NM),   M(NM),   M(NM),   M(NM),   M(NM),  KC_NO, | ||||||
|        KC_NO,   M(Sl),   M(Tl),   M(Pl),   M(Hl),   M(X),   KC_NO,   |        KC_NO,   M(Sl),   M(Tl),   M(Pl),   M(Hl),   M(X),   KC_NO, | ||||||
|        KC_NO,   M(Sl),   M(Kl),   M(Wl),   M(Rl),   M(X), |        KC_NO,   M(Sl),   M(Kl),   M(Wl),   M(Rl),   M(X), | ||||||
|        KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   |        KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, | ||||||
|        KC_NO,   KC_NO,   KC_NO,   M(Al),   M(Ol), |        KC_NO,   KC_NO,   KC_NO,   M(Al),   M(Ol), | ||||||
|                                            KC_NO,   KC_NO,   |                                            KC_NO,   KC_NO, | ||||||
|                                                     KC_NO,   |                                                     KC_NO, | ||||||
|                                   KC_NO,   KC_NO,   KC_NO,   |                                   KC_NO,   KC_NO,   KC_NO, | ||||||
|     // right hand
 |     // right hand
 | ||||||
|        KC_NO,    M(NM),   M(NM),   M(NM),   M(NM),   M(NM),   M(NM), |        KC_NO,    M(NM),   M(NM),   M(NM),   M(NM),   M(NM),   M(NM), | ||||||
|        KC_TRNS,  M(X),    M(Fr),   M(Pr),   M(Lr),   M(Tr),   M(Dr), |        KC_TRNS,  M(X),    M(Fr),   M(Pr),   M(Lr),   M(Tr),   M(Dr), | ||||||
|                  M(X),    M(Rr),   M(Br),   M(Gr),   M(Sr),   M(Zr), |                  M(X),    M(Rr),   M(Br),   M(Gr),   M(Sr),   M(Zr), | ||||||
|        KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   |        KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, | ||||||
|                           M(Er),   M(Ur),   KC_NO,   KC_NO,   KC_NO,   |                           M(Er),   M(Ur),   KC_NO,   KC_NO,   KC_NO, | ||||||
|        KC_NO,   KC_NO,   |        KC_NO,   KC_NO, | ||||||
|        KC_NO,   |        KC_NO, | ||||||
|        KC_NO,   KC_NO,   KC_NO |        KC_NO,   KC_NO,   KC_NO | ||||||
| ), | ), | ||||||
| }; | }; | ||||||
|  |  | ||||||
|  | @ -1,4 +1,4 @@ | ||||||
| #include "ergodox_ez.h" | #include QMK_KEYBOARD_H | ||||||
| #include "debug.h" | #include "debug.h" | ||||||
| #include "action_layer.h" | #include "action_layer.h" | ||||||
| #include "version.h" | #include "version.h" | ||||||
|  | @ -15,16 +15,16 @@ enum custom_keycodes { | ||||||
|   EPRM, |   EPRM, | ||||||
|   VRSN, |   VRSN, | ||||||
|   RGB_SLD, |   RGB_SLD, | ||||||
|    | 
 | ||||||
| }; | }; | ||||||
| 
 | 
 | ||||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
| 
 | 
 | ||||||
|   [0] = KEYMAP(KC_EQUAL,KC_1,KC_2,KC_3,KC_4,KC_5,LCTL(KC_MINUS),KC_DELETE,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_LBRACKET,KC_BSPACE,KC_A,KC_S,KC_D,KC_F,KC_G,KC_LSPO,CTL_T(KC_Z),KC_X,KC_C,KC_V,KC_B,ALL_T(KC_NO),LT(1,KC_GRAVE),KC_QUOTE,LALT(KC_LSHIFT),KC_LEFT,KC_RIGHT,ALT_T(KC_APPLICATION),KC_LGUI,KC_HOME,KC_SPACE,KC_UNDS,KC_END,LCTL(KC_EQUAL),KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINUS,KC_RBRACKET,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_BSLASH,KC_H,ALT_T(KC_J),KC_K,KC_L,LT(2,KC_SCOLON),GUI_T(KC_QUOTE),MEH_T(KC_NO),KC_N,KC_M,KC_COMMA,KC_DOT,CTL_T(KC_SLASH),KC_RSPC,KC_UP,KC_DOWN,KC_LBRACKET,KC_RBRACKET,TT(1),KC_LALT,CTL_T(KC_ESCAPE),KC_PGUP,KC_PGDOWN,LT(1,KC_TAB),KC_ENTER), |   [0] = LAYOUT_ergodox(KC_EQUAL,KC_1,KC_2,KC_3,KC_4,KC_5,LCTL(KC_MINUS),KC_DELETE,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_LBRACKET,KC_BSPACE,KC_A,KC_S,KC_D,KC_F,KC_G,KC_LSPO,CTL_T(KC_Z),KC_X,KC_C,KC_V,KC_B,ALL_T(KC_NO),LT(1,KC_GRAVE),KC_QUOTE,LALT(KC_LSHIFT),KC_LEFT,KC_RIGHT,ALT_T(KC_APPLICATION),KC_LGUI,KC_HOME,KC_SPACE,KC_UNDS,KC_END,LCTL(KC_EQUAL),KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINUS,KC_RBRACKET,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_BSLASH,KC_H,ALT_T(KC_J),KC_K,KC_L,LT(2,KC_SCOLON),GUI_T(KC_QUOTE),MEH_T(KC_NO),KC_N,KC_M,KC_COMMA,KC_DOT,CTL_T(KC_SLASH),KC_RSPC,KC_UP,KC_DOWN,KC_LBRACKET,KC_RBRACKET,TT(1),KC_LALT,CTL_T(KC_ESCAPE),KC_PGUP,KC_PGDOWN,LT(1,KC_TAB),KC_ENTER), | ||||||
| 
 | 
 | ||||||
|   [1] = KEYMAP(KC_TRANSPARENT,KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,LCTL(KC_W),KC_LBRACKET,KC_RBRACKET,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,LCTL(KC_PGUP),LCTL(KC_PGDOWN),RGB_MOD,KC_TRANSPARENT,KC_TRANSPARENT,RGB_VAD,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_F6,KC_F7,KC_F8,KC_F9,KC_F10,KC_F11,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_F12,KC_AMPR,KC_UNDS,KC_MINUS,KC_SCOLON,KC_PLUS,KC_TRANSPARENT,KC_TRANSPARENT,KC_PIPE,KC_AT,KC_EQUAL,KC_PERC,KC_BSLASH,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,RGB_TOG,RGB_SLD,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,RGB_HUI), |   [1] = LAYOUT_ergodox(KC_TRANSPARENT,KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,LCTL(KC_W),KC_LBRACKET,KC_RBRACKET,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,LCTL(KC_PGUP),LCTL(KC_PGDOWN),RGB_MOD,KC_TRANSPARENT,KC_TRANSPARENT,RGB_VAD,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_F6,KC_F7,KC_F8,KC_F9,KC_F10,KC_F11,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_F12,KC_AMPR,KC_UNDS,KC_MINUS,KC_SCOLON,KC_PLUS,KC_TRANSPARENT,KC_TRANSPARENT,KC_PIPE,KC_AT,KC_EQUAL,KC_PERC,KC_BSLASH,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,RGB_TOG,RGB_SLD,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,RGB_HUI), | ||||||
| 
 | 
 | ||||||
|   [2] = KEYMAP(KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MS_UP,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MS_LEFT,KC_MS_DOWN,KC_MS_RIGHT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MS_BTN1,KC_MS_BTN2,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MEDIA_PLAY_PAUSE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MEDIA_PREV_TRACK,KC_MEDIA_NEXT_TRACK,KC_TRANSPARENT,KC_TRANSPARENT,KC_AUDIO_VOL_UP,KC_AUDIO_VOL_DOWN,KC_AUDIO_MUTE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_WWW_BACK), |   [2] = LAYOUT_ergodox(KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MS_UP,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MS_LEFT,KC_MS_DOWN,KC_MS_RIGHT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MS_BTN1,KC_MS_BTN2,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MEDIA_PLAY_PAUSE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MEDIA_PREV_TRACK,KC_MEDIA_NEXT_TRACK,KC_TRANSPARENT,KC_TRANSPARENT,KC_AUDIO_VOL_UP,KC_AUDIO_VOL_DOWN,KC_AUDIO_MUTE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_WWW_BACK), | ||||||
| 
 | 
 | ||||||
| }; | }; | ||||||
| 
 | 
 | ||||||
|  | @ -72,7 +72,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | ||||||
|       } |       } | ||||||
|       return false; |       return false; | ||||||
|       break; |       break; | ||||||
|      | 
 | ||||||
|   } |   } | ||||||
|   return true; |   return true; | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|   *                                 |      |      |      |       |      |      |      | |   *                                 |      |      |      |       |      |      |      | | ||||||
|   *                                 `--------------------'       `--------------------' |   *                                 `--------------------'       `--------------------' | ||||||
|   */ |   */ | ||||||
|   [NORMAL_MODE] = KEYMAP( |   [NORMAL_MODE] = LAYOUT_ergodox( | ||||||
|     // Layer 2 Left Hand
 |     // Layer 2 Left Hand
 | ||||||
|     X_____X,X_____X,X_____X,X_____X,X_____X,X_____X,X_____X, |     X_____X,X_____X,X_____X,X_____X,X_____X,X_____X,X_____X, | ||||||
|     KC_TAB ,X_____X,VIM_W,  VIM_E  ,X_____X,X_____X,X_____X, |     KC_TAB ,X_____X,VIM_W,  VIM_E  ,X_____X,X_____X,X_____X, | ||||||
|  | @ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|   *                                 |   ⌘  |      |      |       |      |      |   ⌘  | |   *                                 |   ⌘  |      |      |       |      |      |   ⌘  | | ||||||
|   *                                 `--------------------'       `--------------------' |   *                                 `--------------------'       `--------------------' | ||||||
|   */ |   */ | ||||||
|   [INSERT_MODE] = KEYMAP( |   [INSERT_MODE] = LAYOUT_ergodox( | ||||||
|     // Left Hand
 |     // Left Hand
 | ||||||
|     NOR_MOD,KC_1,   KC_2,   KC_3,    KC_4,   KC_5, KC_ATM, |     NOR_MOD,KC_1,   KC_2,   KC_3,    KC_4,   KC_5, KC_ATM, | ||||||
|     KC_TAB ,KC_Q,   KC_W,   KC_E,    KC_R,   KC_T, KC_GRV, |     KC_TAB ,KC_Q,   KC_W,   KC_E,    KC_R,   KC_T, KC_GRV, | ||||||
|  | @ -105,7 +105,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|     MO(MOUSE) , KC_ENT, GUI_T(KC_BSPC) |     MO(MOUSE) , KC_ENT, GUI_T(KC_BSPC) | ||||||
|   ), |   ), | ||||||
| 
 | 
 | ||||||
|   [SYMB] = KEYMAP( |   [SYMB] = LAYOUT_ergodox( | ||||||
|     // Left Hand
 |     // Left Hand
 | ||||||
|     NOR_MOD,KC_1,   KC_2,   KC_3,    KC_4,   KC_5, KC_ATM, |     NOR_MOD,KC_1,   KC_2,   KC_3,    KC_4,   KC_5, KC_ATM, | ||||||
|     KC_TAB ,KC_Q,   KC_W,   KC_E,    KC_R,   KC_T, KC_GRV, |     KC_TAB ,KC_Q,   KC_W,   KC_E,    KC_R,   KC_T, KC_GRV, | ||||||
|  | @ -129,7 +129,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|     _______,_______,_______ |     _______,_______,_______ | ||||||
|   ), |   ), | ||||||
| 
 | 
 | ||||||
|   [MOUSE] = KEYMAP( |   [MOUSE] = LAYOUT_ergodox( | ||||||
|     // Left Hand
 |     // Left Hand
 | ||||||
|     _______,_______,_______,_______,_______,_______,_______, |     _______,_______,_______,_______,_______,_______,_______, | ||||||
|     _______,_______,_______,_______,_______,_______,_______, |     _______,_______,_______,_______,_______,_______,_______, | ||||||
|  |  | ||||||
|  | @ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|   */ |   */ | ||||||
|   // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 |   // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 | ||||||
|   // Otherwise, it needs KC_*
 |   // Otherwise, it needs KC_*
 | ||||||
|   [QWERTY] = KEYMAP(  // layer 0 : default
 |   [QWERTY] = LAYOUT_ergodox(  // layer 0 : default
 | ||||||
|           // left hand
 |           // left hand
 | ||||||
|           KC_NO,        KC_NO, KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO, |           KC_NO,        KC_NO, KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO, | ||||||
|           KC_TAB,       KC_Q,  KC_W,   KC_E,   KC_R,   KC_T,   KC_LBRC, |           KC_TAB,       KC_Q,  KC_W,   KC_E,   KC_R,   KC_T,   KC_LBRC, | ||||||
|  | @ -92,7 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|   *                                 |      |      |      |       |      |      |      | |   *                                 |      |      |      |       |      |      |      | | ||||||
|   *                                 `--------------------'       `--------------------' |   *                                 `--------------------'       `--------------------' | ||||||
|   */ |   */ | ||||||
|   [NUMS] = KEYMAP( |   [NUMS] = LAYOUT_ergodox( | ||||||
|         // left hand
 |         // left hand
 | ||||||
|         KC_TRNS,     KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,   KC_TRNS, |         KC_TRNS,     KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,   KC_TRNS, | ||||||
|         LGUI(KC_GRV),KC_GRV, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, |         LGUI(KC_GRV),KC_GRV, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, | ||||||
|  | @ -135,7 +135,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|   *                                 |      |      |      |       |      |      |      | |   *                                 |      |      |      |       |      |      |      | | ||||||
|   *                                 `--------------------'       `--------------------' |   *                                 `--------------------'       `--------------------' | ||||||
|   */ |   */ | ||||||
|   [MOVE] = KEYMAP( |   [MOVE] = LAYOUT_ergodox( | ||||||
|         // left hand
 |         // left hand
 | ||||||
|         KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, |         KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, | ||||||
|         KC_TRNS,KC_TRNS,VIM_W,  KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, |         KC_TRNS,KC_TRNS,VIM_W,  KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, | ||||||
|  | @ -160,7 +160,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|   /* Keymap: AFK Layer
 |   /* Keymap: AFK Layer
 | ||||||
|    * All keys wake |    * All keys wake | ||||||
|    */ |    */ | ||||||
|   [AFK] = KEYMAP( |   [AFK] = LAYOUT_ergodox( | ||||||
|         // left hand
 |         // left hand
 | ||||||
|         BF_WAKE,BF_WAKE,BF_WAKE,BF_WAKE,BF_WAKE,BF_WAKE,BF_WAKE, |         BF_WAKE,BF_WAKE,BF_WAKE,BF_WAKE,BF_WAKE,BF_WAKE,BF_WAKE, | ||||||
|         BF_WAKE,BF_WAKE,BF_WAKE,BF_WAKE,BF_WAKE,BF_WAKE,BF_WAKE, |         BF_WAKE,BF_WAKE,BF_WAKE,BF_WAKE,BF_WAKE,BF_WAKE,BF_WAKE, | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 noroadsleft
						noroadsleft