Merge pull request #305 from nrrkeene/master
Custom handling for shift keys, improved media layer
This commit is contained in:
		
						commit
						dbb1c2f281
					
				
					 7 changed files with 1506 additions and 1549 deletions
				
			
		|  | @ -5,32 +5,41 @@ | |||
| #include "action_util.h" | ||||
| 
 | ||||
| #define BASE 0 // default layer
 | ||||
| #define LOCK    1 // shift-lock layer
 | ||||
| #define SYMB_SH 2 // symbols shift layer
 | ||||
| #define SYMB_LK 3 // symbols lock layer
 | ||||
| #define SYMB_UN 4 // symbols unlock layer
 | ||||
| #define MDIA_SH 5 // media shift layer
 | ||||
| #define MDIA_LK 6 // media lock layer
 | ||||
| #define MDIA_UN 7 // media unlock layer
 | ||||
| #define UNLOCK  8 // clear to base layer
 | ||||
| #define SYMB 1 // symbols layer
 | ||||
| #define MDIA 2 // media layer
 | ||||
| #define LOCK 3 // shift-lock layer
 | ||||
| 
 | ||||
| #define LSymb 0 // left symbol-shift key
 | ||||
| #define LMdia 1 // left media-shift key
 | ||||
| #define LLock 2 // left shift-lock key
 | ||||
| #define RSymb 3 // right symbol-shift key
 | ||||
| #define RMdia 4 // right media-shift key
 | ||||
| #define RLock 5 // right shift-lock key
 | ||||
| 
 | ||||
| #define MUL   6 // mouse up left
 | ||||
| #define MUR   7 // mouse up right
 | ||||
| #define MDL   8 // mouse down left
 | ||||
| #define MDR   9 // mouse down right
 | ||||
| 
 | ||||
| /*
 | ||||
|  * The Ordinary Layout for the Ergodox EZ keyboard, v3.1 | ||||
|  * modifications from default by Nicholas Keene ergodoxez@nicholaskeene.com | ||||
|  * The Ordinary Layout for the Ergodox EZ keyboard, v3.14 | ||||
|  *  | ||||
|  * Modifications from default by Nicholas Keene ergodoxez@nicholaskeene.com | ||||
|  *  | ||||
|  * Details: readme.md | ||||
|  *          https://github.com/nrrkeene/qmk_firmware/tree/master/keyboard/ergodox_ez/keymaps/ordinary
 | ||||
|  */ | ||||
| 
 | ||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
| 
 | ||||
| /* Keymap 0: Base Layer
 | ||||
| /******* Base Layer ********************************************************************************************************
 | ||||
|  * | ||||
|  * ,-----------------------------------------------------.           ,-----------------------------------------------------. | ||||
|  * | LOCK   `~ |   1  |   2  |   3  |   4  |   5  | ESC  |           |  -   |   6  |   7  |   8  |   9  |   0  | =    LOCK | | ||||
|  * | Lock   `~ |   1  |   2  |   3  |   4  |   5  | ESC  |           |  -   |   6  |   7  |   8  |   9  |   0  | =+   Lock | | ||||
|  * |-----------+------+------+------+------+-------------|           |------+------+------+------+------+------+-----------| | ||||
|  * | Media Tab |   Q  |   W  |   E  |   R  |   T  |   [  |           |  ]   |   Y  |   U  |   I  |   O  |   P  | \   Media | | ||||
|  * | Media Tab |   Q  |   W  |   E  |   R  |   T  |   [  |           |  ]   |   Y  |   U  |   I  |   O  |   P  | \|  Media | | ||||
|  * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------| | ||||
|  * | Symbol    |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |  ;   | '  Symbol | | ||||
|  * | Symbol    |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |  ;   | '" Symbol | | ||||
|  * |-----------+------+------+------+------+------|Shift |           | Tab  |------+------+------+------+------+-----------| | ||||
|  * | LShift    |   Z  |   X  |   C  |   V  |   B  | -Tab |           |      |   N  |   M  |   ,  |   .  |  /   |    RShift | | ||||
|  * `-----------+------+------+------+------+-------------'           `-------------+------+------+------+------+-----------' | ||||
|  | @ -46,41 +55,122 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
|  */ | ||||
| [BASE] = KEYMAP( | ||||
| // left hand
 | ||||
|  LT(LOCK, KC_GRV)   ,KC_1        ,KC_2        ,KC_3   ,KC_4  ,KC_5  ,KC_ESC | ||||
| ,LT(MDIA_SH, KC_TAB),KC_Q        ,KC_W        ,KC_E   ,KC_R  ,KC_T  ,KC_LBRC | ||||
| ,MO(SYMB_SH)        ,KC_A        ,KC_S        ,KC_D   ,KC_F  ,KC_G | ||||
|  F(LLock)  ,KC_1   ,KC_2   ,KC_3   ,KC_4  ,KC_5  ,KC_ESC | ||||
| ,F(LMdia)  ,KC_Q   ,KC_W   ,KC_E   ,KC_R  ,KC_T  ,KC_LBRC | ||||
| ,M(LSymb)  ,KC_A   ,KC_S   ,KC_D   ,KC_F  ,KC_G | ||||
| ,KC_LSFT   ,KC_Z   ,KC_X   ,KC_C   ,KC_V  ,KC_B  ,LSFT(KC_TAB) | ||||
| ,KC_LCTL            ,MEH_T(KC_NO),ALL_T(KC_NO),KC_LALT,KC_LGUI | ||||
| 
 | ||||
| ,KC_LCTL   ,KC_MEH ,KC_HYPR,KC_LALT,KC_LGUI | ||||
|                                          ,KC_HOME,KC_END | ||||
|                                                  ,KC_PGUP | ||||
|                                  ,KC_BSPC,KC_DEL ,KC_PGDN | ||||
| 
 | ||||
|                                                                       // right hand
 | ||||
|                                                                ,KC_MINS ,KC_6   ,KC_7   ,KC_8   ,KC_9        ,KC_0        ,LT(LOCK, KC_EQL) | ||||
|                                                                ,KC_RBRC ,KC_Y   ,KC_U   ,KC_I   ,KC_O        ,KC_P        ,LT(MDIA_SH, KC_BSLS) | ||||
|                                                                         ,KC_H   ,KC_J   ,KC_K   ,KC_L        ,KC_SCLN     ,LT(SYMB_SH, KC_QUOT) | ||||
|                                                                      ,KC_MINS ,KC_6   ,KC_7   ,KC_8   ,KC_9    ,KC_0     ,F(RLock) | ||||
|                                                                      ,KC_RBRC ,KC_Y   ,KC_U   ,KC_I   ,KC_O    ,KC_P     ,F(RMdia) | ||||
|                                                                               ,KC_H   ,KC_J   ,KC_K   ,KC_L    ,KC_SCLN  ,F(RSymb) | ||||
|                                                                      ,KC_TAB  ,KC_N   ,KC_M   ,KC_COMM,KC_DOT  ,KC_SLSH  ,KC_RSFT | ||||
|                                                                                 ,KC_RGUI,KC_RALT,ALL_T(KC_NO),MEH_T(KC_NO),KC_RCTL | ||||
| 
 | ||||
|                                                                                       ,KC_RGUI,KC_RALT,KC_HYPR ,KC_MEH   ,KC_RCTL | ||||
|                                                                      ,KC_LEFT ,KC_RGHT | ||||
|                                                                      ,KC_UP | ||||
|                                                                      ,KC_DOWN ,KC_ENT ,KC_SPC | ||||
|     ), | ||||
| 
 | ||||
| /* Keymap 1: Layer Lock Keys
 | ||||
| /******* Symbols Layer *****************************************************************************************************
 | ||||
|  * | ||||
|  * ,-------------------------------------------------------.           ,-------------------------------------------------------. | ||||
|  * ,-----------------------------------------------------.           ,-----------------------------------------------------. | ||||
|  * |           |  F1  |  F2  |  F3  |  F4  |  F5  | Esc  |           |  -   |  F6  |  F7  |  F8  |  F9  |  F10 |           | | ||||
|  * |-----------+------+------+------+------+-------------|           |------+------+------+------+------+------+-----------| | ||||
|  * |           |   !  |   @  |   {  |   }  |   &  |  <   |           |  >   |   |  |   7  |   8  |   9  |   /  |           | | ||||
|  * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------| | ||||
|  * |           |   #  |   $  |   (  |   )  |   `  |------|           |------|   /  |   4  |   5  |   6  |   *  |           | | ||||
|  * |-----------+------+------+------+------+------| Tab  |           | Shift|------+------+------+------+------+-----------| | ||||
|  * |           |   %  |   ^  |   [  |   ]  |   ~  |      |           |  -Tab|   \  |   1  |   2  |   3  |   -  |           | | ||||
|  * `-----------+------+------+------+------+-------------'           `-------------+------+------+------+------+-----------' | ||||
|  *     | LCtrl | Meh  |Hyper | LAlt | LGui |                                       |RGui/0|RAlt/.|Hypr/=|Meh/+ |RCtrl/Ent| | ||||
|  *     `-----------------------------------'                                       `-------------------------------------' | ||||
|  *                                         ,-------------.           ,-------------. | ||||
|  *                                         | Left | Right|           | Home | End  | | ||||
|  *                                  ,------|------|------|           |------+------+------. | ||||
|  *                                  |      |      |  Up  |           | PgUp |      |      | | ||||
|  *                                  |Space |Enter |------|           |------|BackSp| Del  | | ||||
|  *                                  |      |      | Down |           | PgDn |      |      | | ||||
|  *                                  `--------------------'           `--------------------' | ||||
|  */ | ||||
| [SYMB] = KEYMAP( | ||||
| // left hand
 | ||||
|  KC_TRNS ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,KC_ESC | ||||
| ,KC_TRNS ,KC_EXLM ,KC_AT   ,KC_LCBR ,KC_RCBR ,KC_AMPR ,LSFT(KC_COMM) | ||||
| ,KC_TRNS ,KC_HASH ,KC_DLR  ,KC_LPRN ,KC_RPRN ,KC_GRV  | ||||
| ,KC_TRNS ,KC_PERC ,KC_CIRC ,KC_LBRC ,KC_RBRC ,KC_TILD ,KC_TAB | ||||
| ,KC_LCTL   ,KC_MEH ,KC_HYPR,KC_LALT ,KC_LGUI | ||||
|                                              ,KC_LEFT ,KC_RGHT | ||||
|                                                       ,KC_UP | ||||
|                                     ,KC_SPC  ,KC_ENT  ,KC_DOWN | ||||
|                                                                      // right hand
 | ||||
|                                                                      ,KC_MINS     ,KC_F6   ,KC_F7 ,KC_F8  ,KC_F9 ,KC_F10  ,KC_TRNS | ||||
|                                                                      ,LSFT(KC_DOT),KC_PIPE ,KC_7  ,KC_8   ,KC_9  ,KC_SLSH ,KC_TRNS | ||||
|                                                                                   ,KC_SLSH ,KC_4  ,KC_5   ,KC_6  ,KC_ASTR ,KC_TRNS | ||||
|                                                                      ,LSFT(KC_TAB),KC_BSLS ,KC_1  ,KC_2   ,KC_3  ,KC_MINS ,KC_TRNS | ||||
|                                                                                            ,GUI_T(KC_0),ALT_T(KC_DOT),ALL_T(KC_EQL),MEH_T(KC_PLUS),CTL_T(KC_ENT) | ||||
|                                                                      ,KC_HOME     ,KC_END | ||||
|                                                                      ,KC_PGUP | ||||
|                                                                      ,KC_PGDN     ,KC_BSPC ,KC_DEL | ||||
| ), | ||||
| 
 | ||||
| /******* Media Layer *******************************************************************************************************
 | ||||
|  * | ||||
|  * ,---------------------------------------------------------------.           ,---------------------------------------------------------------. | ||||
|  * |      |   F11   |   F12   |   F13   |   F14   |   F15   | Esc  |           |      |   F16   |   F17   |   F18   |   F19   |   F20   |      | | ||||
|  * |------+---------+---------+---------+---------+----------------|           |------+---------+---------+---------+---------+---------+------| | ||||
|  * |      |Shut Down|MouseUpLf|Mouse Up |MouseUpRg|Volume Up|Scroll|           |Scroll|PrintScrn|   Home  |    Up   |   PgUp  |   Mail  |      | | ||||
|  * |------+---------+---------+---------+---------+---------|  Up  |           |  Up  |---------+---------+---------+---------+---------+------| | ||||
|  * |      |  Sleep  |MouseLeft|MouseDown|MouseRght|Volume Dn|------|           |------| Num Lock|   Left  |   Down  |   Right | MyComp  |      | | ||||
|  * |------+---------+---------+---------+---------+---------|Scroll|           |Scroll|---------+---------+---------+---------+---------+------| | ||||
|  * |      |         |MouseDnLf|MouseDown|MouseDnRg|  Mute   | Down |           | Down |         |   End   |   Down  |   PgDn  |         |      | | ||||
|  * `------+---------+---------+---------+---------+----------------'           `----------------+---------+---------+---------+---------+------' | ||||
|  *  |LCtrl|   Meh   |  MClick | LClick  |  R Click|                                             |Cmd/Insrt|Optn/Del | Hyper   |  Meh    |RCtrl| | ||||
|  *  `---------------------------------------------'                                             `---------------------------------------------' | ||||
|  *                                                   ,-------------.           ,-------------. | ||||
|  *                                                   | Stop |Refrsh|           | Prev | Next | | ||||
|  *                                            ,------|------|------|           |------+------+------. | ||||
|  *                                            |Brwser|Brwser|Search|           |VolUp |      |      | | ||||
|  *                                            |Back  | Fwd  |------|           |------| Stop | Play-| | ||||
|  *                                            |      |      | Home |           |VolDn |      | Pause| | ||||
|  *                                            `--------------------'           `--------------------' | ||||
|  */ | ||||
| [MDIA] = KEYMAP( | ||||
| // left hand
 | ||||
|  KC_TRNS ,KC_F11   ,KC_F12  ,KC_F13   ,KC_F14  ,KC_F15  ,KC_ESC | ||||
| ,KC_TRNS ,KC_POWER ,M(MUL)  ,KC_MS_U  ,M(MUR)  ,KC_VOLU ,KC_WH_U | ||||
| ,KC_TRNS ,KC_SLEP  ,KC_MS_L ,KC_MS_D  ,KC_MS_R ,KC_VOLD | ||||
| ,KC_TRNS ,KC_NO    ,M(MDL)  ,KC_MS_D  ,M(MDR)  ,KC_MUTE ,KC_WH_D | ||||
| ,KC_LCTL ,KC_MEH   ,KC_BTN3 ,KC_BTN1  ,KC_BTN2 | ||||
|                                                ,KC_WSTP ,KC_WREF | ||||
|                                                         ,KC_WSCH | ||||
|                                       ,KC_WBAK ,KC_NO   ,KC_WHOM | ||||
|                                                                      // right hand
 | ||||
|                                                                      ,KC_NO    ,KC_F16  ,KC_F17       ,KC_F18       ,KC_F19  ,KC_F20  ,KC_TRNS | ||||
|                                                                      ,KC_WH_U  ,KC_PSCR ,KC_HOME      ,KC_UP        ,KC_PGUP ,KC_MAIL ,KC_TRNS | ||||
|                                                                                ,KC_NLCK ,KC_LEFT      ,KC_DOWN      ,KC_RIGHT,KC_MYCM ,KC_TRNS | ||||
|                                                                      ,KC_WH_D  ,KC_NO   ,KC_END       ,KC_DOWN      ,KC_PGDN ,KC_NO   ,KC_TRNS | ||||
|                                                                                         ,GUI_T(KC_INS),ALT_T(KC_DEL),KC_HYPR ,KC_MEH  ,KC_RCTL | ||||
|                                                                      ,KC_MPRV  ,KC_MNXT | ||||
|                                                                      ,KC_VOLU | ||||
|                                                                      ,KC_VOLD  ,KC_MSTP ,KC_MPLY | ||||
| ), | ||||
| 
 | ||||
| /******* Lock Layer ********************************************************************************************************
 | ||||
|  * | ||||
|  * ,-----------------------------------------------------.           ,-----------------------------------------------------. | ||||
|  * |           |  Esc |      |      |      |      |      |           |      |      |      |      |      | Bspc |           | | ||||
|  * |-------------+------+------+------+------+-------------|           |------+------+------+------+------+------+-------------| | ||||
|  * | Media  LOCK |      |      |      |      |      |      |           |      |      |      |      |      |      | Media  LOCK | | ||||
|  * |-------------+------+------+------+------+------|      |           |      |------+------+------+------+------+-------------| | ||||
|  * | Symbol LOCK |      |      |      |      |      |------|           |------|      |      |      |      |      | Symbol LOCK | | ||||
|  * |-------------+------+------+------+------+------|      |           |      |------+------+------+------+------+-------------| | ||||
|  * |-----------+------+------+------+------+-------------|           |------+------+------+------+------+------+-----------| | ||||
|  * |           |      |      |      |      |      |      |           |      |      |      |      |      |      |           | | ||||
|  * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------| | ||||
|  * |           |      |      |      |      |      |------|           |------|      |      |      |      |      |           | | ||||
|  * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------| | ||||
|  * | Caps LOCK |      |      |      |      |      |      |           |      |      |      |      |      |      | Caps LOCK | | ||||
|  * `-------------+------+------+------+------+-------------'           `-------------+------+------+------+------+-------------' | ||||
|  * `-----------+------+------+------+------+-------------'           `-------------+------+------+------+------+-----------' | ||||
|  *      |      |      |      |      |      |                                       |      |      |      |      |      | | ||||
|  *      `------------------------------------'                                       `------------------------------------' | ||||
|  *      `----------------------------------'                                       `----------------------------------' | ||||
|  *                                         ,-------------.           ,-------------. | ||||
|  *                                         |      |      |           |      |      | | ||||
|  *                                  ,------|------|------|           |------+------+------. | ||||
|  | @ -92,262 +182,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| [LOCK] = KEYMAP( | ||||
| // left hand
 | ||||
|  KC_TRNS ,KC_ESC  ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS | ||||
| ,KC_FN3  ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS | ||||
| ,KC_FN2  ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS | ||||
| ,KC_CAPS ,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 | ||||
| 
 | ||||
|                                                                 // right hand
 | ||||
|                                                                ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_BSPC ,KC_TRNS | ||||
|                                                                ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_FN3 | ||||
|                                                                         ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_FN2 | ||||
|                                                                ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_CAPS | ||||
|                                                                                  ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS | ||||
| 
 | ||||
|                                                                ,KC_TRNS ,KC_TRNS | ||||
|                                                                ,KC_TRNS | ||||
|                                                                ,KC_TRNS ,KC_TRNS ,KC_TRNS | ||||
|     ), | ||||
| 
 | ||||
| /* Keymap 2: Symbol Shift Layer
 | ||||
|  * | ||||
|  * ,-----------------------------------------------------.           ,-----------------------------------------------------. | ||||
|  * | LOCK      |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |  -   |  F6  |  F7  |  F8  |  F9  |  F10 |      LOCK | | ||||
|  * |-----------+------+------+------+------+-------------|           |------+------+------+------+------+------+-----------| | ||||
|  * | Media     |   !  |   @  |   {  |   }  |   &  |  <   |           |  >   |   |  |   7  |   8  |   9  |   /  |     Media | | ||||
|  * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------| | ||||
|  * | Symbol    |   #  |   $  |   (  |   )  |   `  |------|           |------|   /  |   4  |   5  |   6  |   *  |    Symbol | | ||||
|  * |-----------+------+------+------+------+------| Tab  |           | Shift|------+------+------+------+------+-----------| | ||||
|  * | LShift    |   %  |   ^  |   [  |   ]  |   ~  |      |           |  -Tab|   \  |   1  |   2  |   3  |   -  |    RShift | | ||||
|  * `-----------+------+------+------+------+-------------'           `------------+------+------+------+------+------------' | ||||
|  *      |      |      |      |      |      |                                       |   0  |    . |   =  |   +  | Entr | | ||||
|  *      `----------------------------------'                                       `----------------------------------' | ||||
|  *                                         ,-------------.           ,-------------. | ||||
|  *                                         | Left | Right|           | Home | End  | | ||||
|  *                                  ,------|------|------|           |------+------+------. | ||||
|  *                                  |      |      |  Up  |           | PgUp |      |      | | ||||
|  *                                  |Space |Enter |------|           |------|BackSp| Del  | | ||||
|  *                                  |      |      | Down |           | PgDn |      |      | | ||||
|  *                                  `--------------------'           `--------------------' | ||||
|  */ | ||||
| [SYMB_SH] = KEYMAP( | ||||
| // left hand
 | ||||
|  KC_FN2        ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,KC_TRNS | ||||
| ,MO(MDIA_SH)   ,KC_EXLM ,KC_AT   ,KC_LCBR ,KC_RCBR ,KC_AMPR ,LSFT(KC_COMM) | ||||
| ,MO(SYMB_SH)   ,KC_HASH ,KC_DLR  ,KC_LPRN ,KC_RPRN ,KC_GRV  | ||||
| ,KC_LSFT       ,KC_PERC ,KC_CIRC ,KC_LBRC ,KC_RBRC ,KC_TILD ,KC_TAB | ||||
| ,KC_TRNS       ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS | ||||
|                                                    ,KC_LEFT ,KC_RGHT | ||||
|                                                             ,KC_UP | ||||
|                                           ,KC_SPC  ,KC_ENT  ,KC_DOWN | ||||
|                                                                     // right hand
 | ||||
|                                                                     ,KC_MINS     ,KC_F6   ,KC_F7 ,KC_F8  ,KC_F9 ,KC_F10  ,KC_FN2 | ||||
|                                                                     ,LSFT(KC_DOT),KC_PIPE ,KC_7  ,KC_8   ,KC_9  ,KC_SLSH ,MO(MDIA_SH) | ||||
|                                                                                  ,KC_SLSH ,KC_4  ,KC_5   ,KC_6  ,KC_ASTR ,MO(SYMB_SH) | ||||
|                                                                     ,LSFT(KC_TAB),KC_BSLS ,KC_1  ,KC_2   ,KC_3  ,KC_MINS ,KC_RSFT | ||||
|                                                                                           ,GUI_T(KC_0),ALT_T(KC_DOT),ALL_T(KC_EQL),MEH_T(KC_PLUS),CTL_T(KC_ENT) | ||||
|                                                                     ,KC_HOME     ,KC_END | ||||
|                                                                     ,KC_PGUP | ||||
|                                                                     ,KC_PGDN     ,KC_BSPC ,KC_DEL | ||||
| ), | ||||
| 
 | ||||
| /* Keymap 3: Symbol Lock Layer
 | ||||
|  * | ||||
|  * ,-----------------------------------------------------.           ,-----------------------------------------------------. | ||||
|  * | LOCK      |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |  -   |  F6  |  F7  |  F8  |  F9  |  F10 |      LOCK | | ||||
|  * |-----------+------+------+------+------+-------------|           |------+------+------+------+------+------+-----------| | ||||
|  * | Media     |   !  |   @  |   {  |   }  |   &  |  <   |           |  >   |   |  |   7  |   8  |   9  |   /  |     Media | | ||||
|  * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------| | ||||
|  * | Symbol    |   #  |   $  |   (  |   )  |   `  |------|           |------|   /  |   4  |   5  |   6  |   *  |    Symbol | | ||||
|  * |-----------+------+------+------+------+------| Tab  |           | Shift|------+------+------+------+------+-----------| | ||||
|  * | LShift    |   %  |   ^  |   [  |   ]  |   ~  |      |           |  -Tab|   \  |   1  |   2  |   3  |   -  |    RShift | | ||||
|  * `-----------+------+------+------+------+-------------'           `------------+------+------+------+------+------------' | ||||
|  *      |      |      |      |      |      |                                       |   0  |    . |   =  |   +  | Entr | | ||||
|  *      `----------------------------------'                                       `----------------------------------' | ||||
|  *                                         ,-------------.           ,-------------. | ||||
|  *                                         | Left | Right|           | Home | End  | | ||||
|  *                                  ,------|------|------|           |------+------+------. | ||||
|  *                                  |      |      |  Up  |           | PgUp |      |      | | ||||
|  *                                  |Space |Enter |------|           |------|BackSp| Del  | | ||||
|  *                                  |      |      | Down |           | PgDn |      |      | | ||||
|  *                                  `--------------------'           `--------------------' | ||||
|  */ | ||||
| [SYMB_LK] = KEYMAP( | ||||
| // left hand
 | ||||
|  MO(SYMB_UN)  ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,KC_TRNS | ||||
| ,MO(MDIA_SH) ,KC_EXLM ,KC_AT   ,KC_LCBR ,KC_RCBR ,KC_AMPR ,LSFT(KC_COMM) | ||||
| ,MO(UNLOCK)  ,KC_HASH ,KC_DLR  ,KC_LPRN ,KC_RPRN ,KC_GRV | ||||
| ,KC_LSFT     ,KC_PERC ,KC_CIRC ,KC_LBRC ,KC_RBRC ,KC_TILD ,KC_TAB | ||||
| ,KC_TRNS     ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS | ||||
|                                                  ,KC_LEFT ,KC_RGHT | ||||
|                                                           ,KC_UP | ||||
|                                         ,KC_SPC  ,KC_ENT  ,KC_DOWN | ||||
|                                                                     // right hand
 | ||||
|                                                                     ,KC_MINS     ,KC_F6   ,KC_F7 ,KC_F8  ,KC_F9 ,KC_F10  ,MO(SYMB_UN) | ||||
|                                                                     ,LSFT(KC_DOT),KC_PIPE ,KC_7  ,KC_8   ,KC_9  ,KC_SLSH ,MO(MDIA_SH) | ||||
|                                                                                  ,KC_SLSH ,KC_4  ,KC_5   ,KC_6  ,KC_ASTR ,MO(UNLOCK) | ||||
|                                                                     ,LSFT(KC_TAB),KC_BSLS ,KC_1  ,KC_2   ,KC_3  ,KC_MINS ,KC_RSFT | ||||
|                                                                                           ,GUI_T(KC_0),ALT_T(KC_DOT),ALL_T(KC_EQL),MEH_T(KC_PLUS),CTL_T(KC_ENT) | ||||
|                                                                     ,KC_HOME     ,KC_END | ||||
|                                                                     ,KC_PGUP | ||||
|                                                                     ,KC_PGDN     ,KC_BSPC ,KC_DEL | ||||
|     ), | ||||
| 
 | ||||
| /* Keymap 4: Symbol Unlock Layer
 | ||||
|  * | ||||
|  * ,------------------------------------------------------.           ,------------------------------------------------------. | ||||
|  * |            | Esc  |      |      |      |      |      |           |      |      |      |      |      | Bspc |            | | ||||
|  * |------------+------+------+------+------+-------------|           |------+------+------+------+------+------+------------| | ||||
|  * | Media LOCK |      |      |      |      |      |      |           |      |      |      |      |      |      | Media LOCK | | ||||
|  * |------------+------+------+------+------+------|      |           |      |------+------+------+------+------+------------| | ||||
|  * |     UNLOCK |      |      |      |      |      |------|           |------|      |      |      |      |      |     UNLOCK | | ||||
|  * |------------+------+------+------+------+------|      |           |      |------+------+------+------+------+------------| | ||||
|  * | Caps  LOCK |      |      |      |      |      |      |           |      |      |      |      |      |      | Caps  LOCK | | ||||
|  * `------------+------+------+------+------+-------------'           `-------------+------+------+------+------+------------' | ||||
|  *       |      |      |      |      |      |                                       |      |      |      |      |      | | ||||
|  *       `----------------------------------'                                       `----------------------------------' | ||||
|  *                                          ,-------------.           ,-------------. | ||||
|  *                                          |      |      |           |      |      | | ||||
|  *                                   ,------|------|------|           |------+------+------. | ||||
|  *                                   |      |      |      |           |      |      |      | | ||||
|  *                                   |      |      |------|           |------|      |      | | ||||
|  *                                   |      |      |      |           |      |      |      | | ||||
|  *                                   `--------------------'           `--------------------' | ||||
|  */ | ||||
| [SYMB_UN] = KEYMAP( | ||||
| // left hand
 | ||||
|  KC_TRNS     ,KC_ESC  ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS | ||||
| ,TG(MDIA_LK) ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS | ||||
| ,KC_FN1      ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS | ||||
| ,KC_CAPS     ,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 | ||||
|                                                                      // right hand
 | ||||
|                                                                      ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_BSPC ,KC_TRNS | ||||
|                                                                      ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,TG(MDIA_LK) | ||||
|                                                                               ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_FN1 | ||||
|                                                                      ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_CAPS | ||||
|                                                                      ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS | ||||
|                                                                      ,KC_TRNS ,KC_TRNS | ||||
|                                                                      ,KC_TRNS | ||||
|                                                                      ,KC_TRNS ,KC_TRNS ,KC_TRNS | ||||
| ), | ||||
| 
 | ||||
| /* Keymap 5: Media Shift Layer
 | ||||
|  * | ||||
|  * ,-----------------------------------------------------.           ,-----------------------------------------------------. | ||||
|  * | LOCK      | F11  | F12  | F13  | F14  | F15  |      |           |      | F16  | F17  | F18  | F19  | F20  |      LOCK | | ||||
|  * |-----------+------+------+------+------+-------------|           |------+------+------+------+------+------+-----------| | ||||
|  * | Media     |ShutDn|LClick| MsUp |RClick|Vol Up|ScrlUp|           |ScrlUp|PrtScr| Home |  Up  | PgUp | Mail |     Media | | ||||
|  * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------| | ||||
|  * | Symbol    | Sleep|MsLeft|MsDown|MsRght|Vol Dn|------|           |------|NumLok| Left | Down | Right|MyComp|    Symbol | | ||||
|  * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------| | ||||
|  * | LShift    |      |      |MsDown|      | Mute |ScrlDn|           |ScrlDn|      | End  | Down | PgDn |      |    RShift | | ||||
|  * `-----------+------+------+------+------+-------------'           `-------------+------+------+------+------+-----------' | ||||
|  *      | LCtrl| Meh  |Hyper | LAlt | LGui |                                       |Insert|Delete| Hyper| LAlt | LGui | | ||||
|  *      `----------------------------------'                                       `----------------------------------' | ||||
|  *                                         ,-------------.           ,-------------. | ||||
|  *                                         | Stop |Refrsh|           | Prev | Next | | ||||
|  *                                  ,------|------|------|           |------+------+------. | ||||
|  *                                  |Brwser|Brwser|Search|           |VolUp |      |      | | ||||
|  *                                  |Back  | Fwd  |------|           |------| Stop | Play-| | ||||
|  *                                  |      |      | Home |           |VolDn |      | Pause| | ||||
|  *                                  `--------------------'           `--------------------' | ||||
|  */ | ||||
| [MDIA_SH] = KEYMAP( | ||||
| // left hand
 | ||||
|  KC_FN3        ,KC_F11      ,KC_F12  ,KC_F13  ,KC_F14  ,KC_F15  ,KC_NO | ||||
| ,MO(MDIA_SH)   ,KC_POWER    ,KC_BTN1 ,KC_MS_U ,KC_BTN2 ,KC_VOLU ,KC_WH_U | ||||
| ,MO(SYMB_SH)   ,KC_SLEP     ,KC_MS_L ,KC_MS_D ,KC_MS_R ,KC_VOLD | ||||
| ,KC_LSFT       ,KC_NO       ,KC_NO   ,KC_MS_D ,KC_NO   ,KC_MUTE ,KC_WH_D | ||||
| ,KC_LCTL       ,MEH_T(KC_NO),ALL_T(KC_NO),KC_LALT,KC_LGUI | ||||
|                                                        ,KC_WSTP ,KC_WREF | ||||
|                                                                 ,KC_WSCH | ||||
|                                               ,KC_WBAK ,KC_NO   ,KC_WHOM | ||||
|                                                                      // right hand
 | ||||
|                                                                      ,KC_NO    ,KC_F16  ,KC_F17 ,KC_F18  ,KC_F19  ,KC_F20  ,KC_FN3 | ||||
|                                                                      ,KC_WH_U  ,KC_PSCR ,KC_HOME,KC_UP   ,KC_PGUP ,KC_MAIL ,MO(MDIA_SH) | ||||
|                                                                                ,KC_NLCK ,KC_LEFT,KC_DOWN ,KC_RIGHT,KC_MYCM ,MO(SYMB_SH) | ||||
|                                                                      ,KC_WH_D  ,KC_NO   ,KC_END ,KC_DOWN ,KC_PGDN ,KC_NO   ,KC_RSFT | ||||
|                                                                                         ,GUI_T(KC_INS),ALT_T(KC_DEL),ALL_T(KC_NO),MEH_T(KC_NO),KC_RCTL | ||||
|                                                                      ,KC_MPRV  ,KC_MNXT | ||||
|                                                                      ,KC_VOLU | ||||
|                                                                      ,KC_VOLD  ,KC_MSTP ,KC_MPLY | ||||
| ), | ||||
| 
 | ||||
| /* Keymap 6: Media Lock Layer
 | ||||
|  * | ||||
|  * ,-----------------------------------------------------.           ,-----------------------------------------------------. | ||||
|  * | LOCK      | F11  | F12  | F13  | F14  | F15  |      |           |      | F16  | F17  | F18  | F19  | F20  |      LOCK | | ||||
|  * |-----------+------+------+------+------+-------------|           |------+------+------+------+------+------+-----------| | ||||
|  * | Media     |ShutDn|LClick| MsUp |RClick|Vol Up|ScrlUp|           |ScrlUp|PrtScr| Home |  Up  | PgUp | Mail |     Media | | ||||
|  * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------| | ||||
|  * |           | Sleep|MsLeft|MsDown|MsRght|Vol Dn|------|           |------|NumLok| Left | Down | Right|MyComp|           | | ||||
|  * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------| | ||||
|  * | LShift    |      |      |MsDown|      | Mute |ScrlDn|           |ScrlDn|      | End  | Down | PgDn |      |    RShift | | ||||
|  * `-----------+------+------+------+------+-------------'           `-------------+------+------+------+------+-----------' | ||||
|  *      | LCtrl| Meh  |Hyper | LAlt | LGui |                                       |Insert|Delete| Hyper| LAlt | LGui | | ||||
|  *      `----------------------------------'                                       `----------------------------------' | ||||
|  *                                         ,-------------.           ,-------------. | ||||
|  *                                         | Stop |Refrsh|           | Prev | Next | | ||||
|  *                                  ,------|------|------|           |------+------+------. | ||||
|  *                                  |Brwser|Brwser|Search|           |VolUp |      |      | | ||||
|  *                                  |Back  | Fwd  |------|           |------| Stop | Play-| | ||||
|  *                                  |      |      | Home |           |VolDn |      | Pause| | ||||
|  *                                  `--------------------'           `--------------------' | ||||
|  */ | ||||
| [MDIA_LK] = KEYMAP( | ||||
| // left hand
 | ||||
|  MO(MDIA_UN),KC_F11      ,KC_F12  ,KC_F13  ,KC_F14  ,KC_F15  ,KC_NO | ||||
| ,MO(UNLOCK) ,KC_POWER    ,KC_BTN1 ,KC_MS_U ,KC_BTN2 ,KC_VOLU ,KC_WH_U | ||||
| ,KC_NO      ,KC_SLEP     ,KC_MS_L ,KC_MS_D ,KC_MS_R ,KC_VOLD   | ||||
| ,KC_LSFT    ,KC_NO       ,KC_NO   ,KC_MS_D ,KC_NO   ,KC_MUTE ,KC_WH_D | ||||
| ,KC_LCTL    ,MEH_T(KC_NO),ALL_T(KC_NO),KC_LALT,KC_LGUI | ||||
|                                                     ,KC_WSTP ,KC_WREF | ||||
|                                                              ,KC_WSCH | ||||
|                                            ,KC_WBAK ,KC_NO   ,KC_WHOM | ||||
|                                                                      // right hand
 | ||||
|                                                                      ,KC_NO    ,KC_F16  ,KC_F17 ,KC_F18  ,KC_F19  ,KC_F20  ,MO(MDIA_UN) | ||||
|                                                                      ,KC_WH_U  ,KC_PSCR ,KC_HOME,KC_UP   ,KC_PGUP ,KC_MAIL ,MO(UNLOCK) | ||||
|                                                                                ,KC_NLCK ,KC_LEFT,KC_DOWN ,KC_RIGHT,KC_MYCM ,KC_NO | ||||
|                                                                      ,KC_WH_D  ,KC_NO   ,KC_END ,KC_DOWN ,KC_PGDN ,KC_NO   ,KC_RSFT | ||||
|                                                                                         ,GUI_T(KC_INS),ALT_T(KC_DEL),ALL_T(KC_NO),MEH_T(KC_NO),KC_RCTL | ||||
|                                                                      ,KC_MPRV  ,KC_MNXT | ||||
|                                                                      ,KC_VOLU | ||||
|                                                                      ,KC_VOLD  ,KC_MSTP ,KC_MPLY | ||||
|     ), | ||||
| 
 | ||||
| /* Keymap 7: Media Unlock Layer
 | ||||
|  * | ||||
|  * ,-----------------------------------------------------.           ,-----------------------------------------------------. | ||||
|  * |           | Esc  |      |      |      |      |      |           |      |      |      |      |      | Bspc |           | | ||||
|  * |-----------+------+------+------+------+-------------|           |------+------+------+------+------+------+-----------| | ||||
|  * |    UNLOCK |      |      |      |      |      |      |           |      |      |      |      |      |      |    UNLOCK | | ||||
|  * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------| | ||||
|  * |           |      |      |      |      |      |------|           |------|      |      |      |      |      |           | | ||||
|  * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------| | ||||
|  * | Caps LOCK |      |      |      |      |      |      |           |      |      |      |      |      |      | Caps LOCK | | ||||
|  * `-----------+------+------+------+------+-------------'           `-------------+------+------+------+------+-----------' | ||||
|  *      |      |      |      |      |      |                                       |      |      |      |      |      | | ||||
|  *      `----------------------------------'                                       `----------------------------------' | ||||
|  *                                         ,-------------.           ,-------------. | ||||
|  *                                         |      |      |           |      |      | | ||||
|  *                                  ,------|------|------|           |------+------+------. | ||||
|  *                                  |      |      |      |           |      |      |      | | ||||
|  *                                  |      |      |------|           |------|      |      | | ||||
|  *                                  |      |      |      |           |      |      |      | | ||||
|  *                                  `--------------------'           `--------------------' | ||||
|  */ | ||||
| [MDIA_UN] = KEYMAP( | ||||
| // left hand
 | ||||
|  KC_TRNS ,KC_ESC  ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS | ||||
| ,KC_FN1  ,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_CAPS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS | ||||
| ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS | ||||
|  | @ -355,59 +190,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
|                                              ,KC_TRNS ,KC_TRNS | ||||
|                                                       ,KC_TRNS | ||||
|                                      ,KC_TRNS,KC_TRNS ,KC_TRNS | ||||
| 
 | ||||
|                                                                      // right hand
 | ||||
|                                                                      ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_BSPC ,KC_TRNS | ||||
|                                                                ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_FN1 | ||||
|                                                                      ,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_CAPS | ||||
|                                                                                        ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS | ||||
| 
 | ||||
|                                                                ,KC_TRNS ,KC_TRNS | ||||
|                                                                ,KC_TRNS | ||||
|                                                                ,KC_TRNS ,KC_TRNS ,KC_TRNS | ||||
|     ), | ||||
| 
 | ||||
| /* Keymap 8: Unlock Layer
 | ||||
|  * | ||||
|  * ,-----------------------------------------------------.           ,-----------------------------------------------------. | ||||
|  * | UNLOCK    |      |      |      |      |      |      |           |      |      |      |      |      |      |    UNLOCK | | ||||
|  * |-----------+------+------+------+------+-------------|           |------+------+------+------+------+------+-----------| | ||||
|  * |           |      |      |      |      |      |      |           |      |      |      |      |      |      |           | | ||||
|  * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------| | ||||
|  * |           |      |      |      |      |      |------|           |------|      |      |      |      |      |           | | ||||
|  * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------| | ||||
|  * |           |      |      |      |      |      |      |           |      |      |      |      |      |      |           | | ||||
|  * `-----------+------+------+------+------+-------------'           `-------------+------+------+------+------+-----------' | ||||
|  *      |      |      |      |      |      |                                       |      |      |      |      |      | | ||||
|  *      `----------------------------------'                                       `----------------------------------' | ||||
|  *                                         ,-------------.           ,-------------. | ||||
|  *                                         |      |      |           |      |      | | ||||
|  *                                  ,------|------|------|           |------+------+------. | ||||
|  *                                  |      |      |      |           |      |      |      | | ||||
|  *                                  |      |      |------|           |------|      |      | | ||||
|  *                                  |      |      |      |           |      |      |      | | ||||
|  *                                  `--------------------'           `--------------------' | ||||
|  */ | ||||
| [UNLOCK] = KEYMAP( | ||||
| // left hand
 | ||||
|  KC_FN1  ,KC_ESC  ,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 ,KC_TRNS ,KC_TRNS | ||||
| 
 | ||||
|                                              ,KC_TRNS ,KC_TRNS | ||||
|                                                       ,KC_TRNS | ||||
|                                     ,KC_TRNS ,KC_TRNS ,KC_TRNS | ||||
| 
 | ||||
|                                                                 // right hand
 | ||||
|                                                                ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_FN1 | ||||
|                                                                ,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 | ||||
|                                                                      ,KC_TRNS ,KC_TRNS ,KC_TRNS | ||||
|  | @ -415,23 +204,190 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| }; | ||||
| 
 | ||||
| const uint16_t PROGMEM fn_actions[] = { | ||||
|      [1] = ACTION_LAYER_CLEAR(ON_PRESS)           // FN1 - clear to base layer
 | ||||
|     ,[2] = ACTION_LAYER_INVERT(SYMB_LK, ON_PRESS) // FN2 - toggle to Symbols on press
 | ||||
|     ,[3] = ACTION_LAYER_INVERT(MDIA_LK, ON_PRESS) // FN3 - toggle to Media on press
 | ||||
|      // the six faux shift keys are implemented as macro taps
 | ||||
|      [LSymb] = ACTION_MACRO_TAP(LSymb) | ||||
|     ,[LMdia] = ACTION_MACRO_TAP(LMdia) | ||||
|     ,[LLock] = ACTION_MACRO_TAP(LLock) | ||||
|     ,[RSymb] = ACTION_MACRO_TAP(RSymb) | ||||
|     ,[RMdia] = ACTION_MACRO_TAP(RMdia) | ||||
|     ,[RLock] = ACTION_MACRO_TAP(RLock) | ||||
| }; | ||||
| 
 | ||||
| uint16_t symb_shift = 0; // there are two shift keys for each layer, and two lock
 | ||||
| uint16_t mdia_shift = 0; // keys; we increment a counter for each key pressed and
 | ||||
| uint16_t shift_lock = 0; // decrement when released.
 | ||||
| 
 | ||||
| bool symb_lock = false;  // when shift-lock is used in conjunction with a shift
 | ||||
| bool mdia_lock = false;  // key the lock flag is toggled
 | ||||
| 
 | ||||
| const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | ||||
| { | ||||
|   // MACRODOWN only works in this function
 | ||||
|     switch(id) { | ||||
|         case 0: | ||||
|         // shift and lock between layers
 | ||||
| 
 | ||||
|         case LSymb: | ||||
|         if (record->event.pressed) { | ||||
|           register_code(KC_RSFT); | ||||
|             symb_shift++; | ||||
|             if(shift_lock) symb_lock = !symb_lock; | ||||
|             layer_on(SYMB); | ||||
|         } else { | ||||
|           unregister_code(KC_RSFT); | ||||
|             symb_shift--; | ||||
|             if((!symb_shift) && (!symb_lock)) layer_off(SYMB); | ||||
|         } | ||||
|         break; | ||||
| 
 | ||||
|         case LMdia: | ||||
|         if (record->event.pressed) { | ||||
|             if (record->tap.count && !shift_lock) { | ||||
|                 register_code(KC_TAB); | ||||
|             } else { | ||||
|                 mdia_shift++; | ||||
|                 if(shift_lock) mdia_lock = !mdia_lock; | ||||
|                 layer_on(MDIA); | ||||
|             } | ||||
|         } else { | ||||
|             if(record->tap.count && !shift_lock) { | ||||
|                 unregister_code(KC_TAB); | ||||
|             } else { | ||||
|                 mdia_shift--; | ||||
|                 if((!mdia_shift) && (!mdia_lock)) layer_off(MDIA); | ||||
|             } | ||||
|         } | ||||
|         break; | ||||
| 
 | ||||
|         case LLock: | ||||
|         if (record->event.pressed) { | ||||
|             shift_lock++; | ||||
|             if(symb_shift) symb_lock = !symb_lock; | ||||
|             if(mdia_shift) mdia_lock = !mdia_lock; | ||||
|             if(!record->tap.count && (keyboard_report->mods & (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)))) { | ||||
|                 register_code(KC_CAPS); | ||||
|                 unregister_code(KC_CAPS); | ||||
|             } | ||||
|             layer_on(LOCK); | ||||
|           } else { | ||||
|             if(record->tap.count && !record->tap.interrupted && !symb_shift && !mdia_shift) { | ||||
|                 register_code(KC_GRV); | ||||
|                 unregister_code(KC_GRV); | ||||
|             } | ||||
|             shift_lock--; | ||||
|             if(!shift_lock) layer_off(LOCK); | ||||
|         } | ||||
|         break; | ||||
| 
 | ||||
|         case RSymb: | ||||
|         if (record->event.pressed) { | ||||
|             if (record->tap.count && !shift_lock) { | ||||
|                 register_code(KC_QUOT); | ||||
|             } else { | ||||
|                 symb_shift++; | ||||
|                 if(shift_lock) symb_lock = !symb_lock; | ||||
|                 layer_on(SYMB); | ||||
|             } | ||||
|         } else { | ||||
|             if(record->tap.count && !shift_lock) { | ||||
|                 unregister_code(KC_QUOT); | ||||
|             } else { | ||||
|                 symb_shift--; | ||||
|                 if((!symb_shift) && (!symb_lock)) layer_off(SYMB); | ||||
|             } | ||||
|         } | ||||
|         break; | ||||
| 
 | ||||
|         case RMdia: | ||||
|         if (record->event.pressed) { | ||||
|             if (record->tap.count && !shift_lock) { | ||||
|                 register_code(KC_BSLS); | ||||
|             } else { | ||||
|                 mdia_shift++; | ||||
|                 if(shift_lock) mdia_lock = !mdia_lock; | ||||
|                 layer_on(MDIA); | ||||
|             } | ||||
|         } else { | ||||
|             if(record->tap.count && !shift_lock) { | ||||
|                 unregister_code(KC_BSLS); | ||||
|             } else { | ||||
|                 mdia_shift--; | ||||
|                 if((!mdia_shift) && (!mdia_lock)) layer_off(MDIA); | ||||
|             } | ||||
|         } | ||||
|         break; | ||||
| 
 | ||||
|         case RLock: | ||||
|         if (record->event.pressed) { | ||||
|             shift_lock++; | ||||
|             if(symb_shift) symb_lock = !symb_lock; | ||||
|             if(mdia_shift) mdia_lock = !mdia_lock; | ||||
|             if(!record->tap.count && (keyboard_report->mods & (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)))) { | ||||
|                     register_code(KC_CAPS); | ||||
|                     unregister_code(KC_CAPS); | ||||
|             }  | ||||
|             layer_on(LOCK); | ||||
|         } else { | ||||
|             if (record->tap.count && !record->tap.interrupted && !symb_shift && !mdia_shift) { | ||||
|                 register_code(KC_EQL); | ||||
|                 unregister_code(KC_EQL); | ||||
|             } | ||||
|             shift_lock--; | ||||
|             if(!shift_lock) layer_off(LOCK); | ||||
|         } | ||||
|         break; | ||||
| 
 | ||||
|         // mouse diagonals
 | ||||
| 
 | ||||
|         case MUL: // mouse up left
 | ||||
|         if (record->event.pressed) { | ||||
|             mousekey_on(KC_MS_UP); | ||||
|             mousekey_on(KC_MS_LEFT); | ||||
|             mousekey_send(); | ||||
|         } else { | ||||
|             mousekey_off(KC_MS_UP); | ||||
|             mousekey_off(KC_MS_LEFT); | ||||
|             mousekey_send(); | ||||
|         } | ||||
|         break; | ||||
| 
 | ||||
|         case MUR: // mouse up right
 | ||||
|         if (record->event.pressed) { | ||||
|             mousekey_on(KC_MS_UP); | ||||
|             mousekey_on(KC_MS_RIGHT); | ||||
|             mousekey_send(); | ||||
|         } else { | ||||
|             mousekey_off(KC_MS_UP); | ||||
|             mousekey_off(KC_MS_RIGHT); | ||||
|             mousekey_send(); | ||||
|         } | ||||
|         break; | ||||
| 
 | ||||
|         case MDL: // mouse down left
 | ||||
|         if (record->event.pressed) { | ||||
|             mousekey_on(KC_MS_DOWN); | ||||
|             mousekey_on(KC_MS_LEFT); | ||||
|             mousekey_send(); | ||||
|         } else { | ||||
|             mousekey_off(KC_MS_DOWN); | ||||
|             mousekey_off(KC_MS_LEFT); | ||||
|             mousekey_send(); | ||||
|         } | ||||
|         break; | ||||
| 
 | ||||
|         case MDR: // mouse down right
 | ||||
|         if (record->event.pressed) { | ||||
|             mousekey_on(KC_MS_DOWN); | ||||
|             mousekey_on(KC_MS_RIGHT); | ||||
|             mousekey_send(); | ||||
|         } else { | ||||
|             mousekey_off(KC_MS_DOWN); | ||||
|             mousekey_off(KC_MS_RIGHT); | ||||
|             mousekey_send(); | ||||
|         } | ||||
|         break; | ||||
| 
 | ||||
|         default: | ||||
|             // none
 | ||||
|             break; | ||||
|     } | ||||
|      | ||||
|     return MACRO_NONE; | ||||
| }; | ||||
| 
 | ||||
|  | @ -442,8 +398,6 @@ void matrix_init_user(void) { | |||
| 
 | ||||
| // Runs constantly in the background, in a loop.
 | ||||
| void matrix_scan_user(void) { | ||||
|     uint8_t layer = biton32(layer_state); | ||||
| 
 | ||||
|     // shift or caps lock turns on red light
 | ||||
|     if((keyboard_report->mods & (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT))) || (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK))) { | ||||
|         ergodox_right_led_1_on(); | ||||
|  | @ -451,22 +405,15 @@ void matrix_scan_user(void) { | |||
|         ergodox_right_led_1_off(); | ||||
|     } | ||||
| 
 | ||||
|     // do not change lights while locking and unlocking
 | ||||
|     if(layer == LOCK || layer == SYMB_UN || layer == MDIA_UN || layer == UNLOCK) { | ||||
|         return; | ||||
|     } | ||||
| 
 | ||||
|     //ergodox_board_led_off();
 | ||||
| 
 | ||||
|     // symbol turns on green light
 | ||||
|     if(layer == SYMB_SH || layer == SYMB_LK) { | ||||
|     // Symbol layer turns on green light
 | ||||
|     if(layer_state & (1UL<<SYMB)) { | ||||
|         ergodox_right_led_2_on(); | ||||
|     } else { | ||||
|         ergodox_right_led_2_off(); | ||||
|     } | ||||
| 
 | ||||
|     // media turns on blue light
 | ||||
|     if(layer == MDIA_SH || layer == MDIA_LK) { | ||||
|     // Media layer turns on blue light
 | ||||
|     if(layer_state & (1UL<<MDIA)) { | ||||
|         ergodox_right_led_3_on(); | ||||
|     } else { | ||||
|         ergodox_right_led_3_off(); | ||||
|  |  | |||
										
											Binary file not shown.
										
									
								
							| Before Width: | Height: | Size: 118 KiB After Width: | Height: | Size: 121 KiB | 
|  | @ -3,20 +3,20 @@ | |||
| [{y:-0.875,x:5.5},"F15",{c:"#ff4444"},"Esc",{x:4.5,c:"#cccccc",a:7},"",{c:"#99de2a",a:4},"F16"], | ||||
| [{y:-0.875,c:"#2277ff",w:1.5},"Shift\n\n\n\n\n\nLock",{c:"#99de2a"},"F11",{x:14.5},"F20",{c:"#2277ff",w:1.5},"\n\nShift\n\n\n\n\nLock"], | ||||
| [{y:-0.375,x:3.5,c:"#ff8500"},"Mouse\n\n\n\n\n\nUp",{x:10.5},"Cursor\n\n\n\n\n\nUp"], | ||||
| [{y:-0.875,x:2.5},"Left\n\n\n\n\n\nClick",{x:1},"Right\n\n\n\n\n\nClick",{x:8.5,c:"#ffb063"},"Home",{x:1},"Page\n\n\n\n\n\nUp"], | ||||
| [{y:-0.875,x:2.5},"Mouse\n\n\n\n\n\nUpLeft",{x:1},"Mouse\n\n\n\n\n\nUpRgt",{x:8.5,c:"#ffb063"},"Home",{x:1},"Page\n\n\n\n\n\nUp"], | ||||
| [{y:-0.875,x:5.5,c:"#e6e067"},"Vol\n\n\n\n\n\nUp",{c:"#ffb063",h:1.5},"Scroll\n\n\n\n\n\nUp",{x:4.5,h:1.5},"Scroll\n\n\n\n\n\nUp",{c:"#e6e067"},"Print\n\n\n\n\n\nScreen"], | ||||
| [{y:-0.875,c:"#000000",t:"#ff0000",w:1.5},"Media\n\n\n\n\n\nShift",{c:"#e6e067",t:"#000000"},"Shut\n\n\n\n\n\nDown",{x:14.5},"Mail",{c:"#000000",t:"#ff0000",w:1.5},"\n\nMedia\n\n\n\n\nShift"], | ||||
| [{y:-0.375,x:3.5,c:"#ff8500",t:"#000000"},"Mouse\n\n\n\n\n\nDown",{x:10.5},"Cursor\n\n\n\n\n\nDown"], | ||||
| [{y:-0.875,x:2.5},"Mouse\n\n\n\n\n\nLeft",{x:1},"Mouse\n\n\n\n\n\nRight",{x:8.5},"Cursor\n\n\n\n\n\nLeft",{x:1},"Cursor\n\n\n\n\n\nRight"], | ||||
| [{y:-0.875,x:5.5,c:"#e6e067"},"Vol\n\n\n\n\n\nDown",{x:6.5},"Num\n\n\n\n\n\nLock"], | ||||
| [{y:-0.875,c:"#cccccc",a:7,w:1.5},"",{c:"#e6e067",a:4},"Sleep",{x:14.5},"My\n\n\n\n\n\nComp",{c:"#cccccc",a:7,w:1.5},""], | ||||
| [{y:-0.625,x:6.5,c:"#ffb063",a:4,h:1.5},"Scroll\n\n\n\n\n\nDown",{x:4.5,h:1.5},"Scroll\n\n\n\n\n\nDown"], | ||||
| [{y:-0.875,c:"#2277ff",w:1.5},"Symbols\n\n\n\n\n\nShift",{c:"#e6e067"},"Sleep",{x:14.5},"My\n\n\n\n\n\nComp",{c:"#2277ff",w:1.5},"\n\nSymbols\n\n\n\n\nShift"], | ||||
| [{y:-0.625,x:6.5,c:"#ffb063",h:1.5},"Scroll\n\n\n\n\n\nDown",{x:4.5,h:1.5},"Scroll\n\n\n\n\n\nDown"], | ||||
| [{y:-0.75,x:3.5,c:"#ff8500"},"Mouse\n\n\n\n\n\nDown",{x:10.5},"Cursor\n\n\n\n\n\nDown"], | ||||
| [{y:-0.875,x:2.5,c:"#cccccc",a:7},"",{x:1},"",{x:8.5,c:"#ffb063",a:4},"End",{x:1},"Page\n\n\n\n\n\nDown"], | ||||
| [{y:-0.875,x:2.5},"Mouse\n\n\n\n\n\nDnLeft",{x:1},"Mouse\n\n\n\n\n\nDnRgt",{x:8.5,c:"#ffb063"},"End",{x:1},"Page\n\n\n\n\n\nDown"], | ||||
| [{y:-0.875,x:5.5,c:"#e6e067"},"Mute",{x:6.5,c:"#cccccc",a:7},""], | ||||
| [{y:-0.875,c:"#2277ff",a:4,f2:1,w:1.5},"Capitals\nShift\n\n\n\n\nShift",{c:"#cccccc",a:7},"",{x:14.5},"",{c:"#2277ff",a:4,fa:[0,1,0,1],w:1.5},"\n\nCapitals\nShift\n\n\n\nShift"], | ||||
| [{y:-0.375,x:3.5,c:"#77aaff"},"Option\n\n\nLAlt",{x:10.5,c:"#ffb063"},"Delete\n\n\nOption"], | ||||
| [{y:-0.875,x:2.5,c:"#77aaff"},"Hyper",{x:1},"Cmd\n\n\nSuper",{x:8.5,c:"#ffb063"},"Insert\n\n\nCmd",{x:1,c:"#77aaff"},"Hyper"], | ||||
| [{y:-0.875,c:"#2277ff",a:4,fa:[0,1,0,0,0,0,0],w:1.5},"Capitals\nShift\n\n\n\n\nShift",{c:"#cccccc",a:7},"",{x:14.5},"",{c:"#2277ff",a:4,fa:[0,1,0,1],w:1.5},"\n\nCapitals\nShift\n\n\n\nShift"], | ||||
| [{y:-0.375,x:3.5,c:"#ff8500"},"Middle\n\n\n\n\n\nClick",{x:10.5,c:"#ffb063"},"Delete\n\n\nOption"], | ||||
| [{y:-0.875,x:2.5,c:"#ff8500"},"Left\n\n\n\n\n\nClick",{x:1},"Right\n\n\n\n\n\nClick",{x:8.5,c:"#ffb063"},"Insert\n\n\nCmd",{x:1,c:"#77aaff"},"Hyper"], | ||||
| [{y:-0.75,x:0.5},"Ctrl\n\n\nLCtrl","Meh",{x:14.5},"Meh","Crtl\n\n\nRCtrl"], | ||||
| [{r:30,rx:6.5,ry:4.25,y:-1,x:1,c:"#ccbb00"},"Stop\n\n\nBrowser","Reload\n\n\nBrowser"], | ||||
| [{h:2},"< Web\n\n\nBrowser",{h:2},"Web >\n\n\nBrowser","Search\n\n\nBrowser"], | ||||
|  |  | |||
										
											Binary file not shown.
										
									
								
							| Before Width: | Height: | Size: 101 KiB After Width: | Height: | Size: 102 KiB | 
|  | @ -14,7 +14,7 @@ | |||
| [{y:-0.75,x:3.5,c:"#bbddbb"},"[",{x:10.5,c:"#89b087"},"2"], | ||||
| [{y:-0.875,x:2.5,c:"#bbddbb"},"^",{x:1},"]",{x:8.5,c:"#89b087"},"1",{x:1},"3"], | ||||
| [{y:-0.875,x:5.5,c:"#bbddbb"},"~",{x:6.5},"\\"], | ||||
| [{y:-0.875,c:"#2277ff",fa:[0,1,0,1,0,0,1],w:1.5},"Capitals\nShift\n\n\n\n\nShift",{c:"#bbddbb"},"%",{x:14.5,c:"#89b087"},"-",{c:"#2277ff",w:1.5},"\n\nCapitals\nShift\n\n\n\nShift"], | ||||
| [{y:-0.875,c:"#2277ff",f2:1,w:1.5},"Capitals\nShift\n\n\n\n\nShift",{c:"#bbddbb"},"%",{x:14.5,c:"#89b087"},"-",{c:"#2277ff",fa:[0,1,0,1],w:1.5},"\n\nCapitals\nShift\n\n\n\nShift"], | ||||
| [{y:-0.375,x:3.5,c:"#77aaff"},"Option\n\n\nLAlt",{x:10.5,c:"#89b087"},".\n\n\nOption"], | ||||
| [{y:-0.875,x:2.5,c:"#77aaff"},"Hyper",{x:1},"Cmd\n\n\nSuper",{x:8.5,c:"#89b087"},"0\n\n\nCmd",{x:1},"=\n\n\nHyper"], | ||||
| [{y:-0.75,x:0.5,c:"#77aaff"},"Ctrl\n\n\nLCtrl","Meh",{x:14.5,c:"#89b087"},"+\n\n\nMeh","Enter\n\n\nCtrl"], | ||||
|  | @ -22,6 +22,6 @@ | |||
| [{h:2},"Space",{h:2},"Enter","Up"], | ||||
| [{x:2},"Down"], | ||||
| [{r:-30,rx:13,y:-1,x:-3},"Home","End"], | ||||
| [{x:-3,f:3},"Page\n\n\n\n\n\nUp",{h:2},"< Del\n\n\nBackspace",{h:2},"Del >\n\n\nDelete"], | ||||
| [{x:-3,f:3},"Page\n\n\n\n\n\nDown"] | ||||
| [{x:-3},"Page\n\n\n\n\n\nUp",{f:3,h:2},"< Del\n\n\nBackspace",{f:3,h:2},"Del >\n\n\nDelete"], | ||||
| [{x:-3},"Page\n\n\n\n\n\nDown"] | ||||
| 
 | ||||
|  |  | |||
										
											
												File diff suppressed because it is too large
												Load diff
											
										
									
								
							|  | @ -67,9 +67,11 @@ Alas, the yellow keys have at best spotty success with common software. Good luc | |||
| 
 | ||||
| ## Switching Between Layers ## | ||||
| 
 | ||||
| The three Shift keys correspond to three logical layers on top of the ever-present base layer, and are represented in the three LEDs on the keyboard: Capitals (red), Symbols (green), Media (blue). The color of a layer illuminates when the layer is active. Shift keys work in the expected way: press them and the keys shift to that layer; release them and the keys shift back to the base layer. The Ordinary Layout also features a Shift Lock key to keep a layer active indefinitely. Hold down the Shift Lock key then press any Shift key to lock to that layer. Or, hold down the Shift key and press the Shift Lock key; it works either way. To revert to the base layer, use the Shift Lock key again in combination with the Shift key. | ||||
| In addition to Symbols and Media the Ordinary Layout treats the Capitals as a logical layer. Each layer is accessed by a shift key on each edge of the keyboard and corresponds to one of the three LEDs on the keyboard: Capitals (red), Symbols (green), Media (blue). The color of a layer illuminates when the layer is active. | ||||
| 
 | ||||
| This layout attempts to treat the Capitals Shift layer the same as the other two Shift layers, but internally they are different which causes some inconsistencies. For instance, it is possible to switch from any layer to any other layer, and to lock to any layer, *except* it is not possible to go from Media to Symbols. You must exit the Media layer before engaging the Symbols layer. Also, the Caps Lock feature must be triggered by first pressing the Shift Lock key then a Capitals Shift key; it doesn't work if you press the Shift key first (instead you get the secondary symbol character associated with the Shift Lock button). | ||||
| Shift buttons work in the expected way: press them and all of the keys switch to that layer; release them and the keys switch back to the base layer. Lock layers using the Shift key in conjunction with the Shift Lock key. For instance, the widely and rightly loathed Caps Lock is engaged by pressing the Shift Lock button then Capitals Shift. Or, hold down the Shift key and press the Shift Lock key; it works either way. All the Shift keys work this way. | ||||
| 
 | ||||
| Multiple layers can be turned on at once but only one controls the keyboard. The order of the LEDs indicates the priority order: Media, Symbols, Capitals. | ||||
| 
 | ||||
| ## Special Escape & Backspace Sequences ## | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Erez Zukerman
						Erez Zukerman