Merge pull request #2 from jackhumbert/master
Update my repo to upstream
This commit is contained in:
		
						commit
						5872f80c96
					
				
					 14 changed files with 4307 additions and 2732 deletions
				
			
		
										
											
												File diff suppressed because it is too large
												Load diff
											
										
									
								
							
										
											Binary file not shown.
										
									
								
							| 
		 Before Width: | Height: | Size: 546 KiB After Width: | Height: | Size: 95 KiB  | 
										
											Binary file not shown.
										
									
								
							| 
		 Before Width: | Height: | Size: 563 KiB After Width: | Height: | Size: 379 KiB  | 
| 
						 | 
				
			
			@ -3,8 +3,7 @@
 | 
			
		|||
#include "action_layer.h"
 | 
			
		||||
 | 
			
		||||
#define BASE 0 // default layer
 | 
			
		||||
#define QWERTY 1 // qwerty keys
 | 
			
		||||
#define FKEYS 2 // F keys + macros
 | 
			
		||||
#define FKEYS 1 // F keys + macros
 | 
			
		||||
 | 
			
		||||
#define MACRO_PUBLIC 10
 | 
			
		||||
#define MACRO_PRIVATE 11
 | 
			
		||||
| 
						 | 
				
			
			@ -43,12 +42,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
 *   |Tab~CL|  <   |  >   |   |  |  &   |                                       |   =  |   +  |   -  |   *  |  L1  |
 | 
			
		||||
 *   `----------------------------------'                                       `----------------------------------'
 | 
			
		||||
 *                                        ,-------------.       ,-------------.
 | 
			
		||||
 *                                        |. ~L1 | , ~L2|       |Home~L1| End~L2|
 | 
			
		||||
 *                                 ,------|------|------|       |------+--------+------.
 | 
			
		||||
 *                                 |      |      | Copy |       | UP   |        |      |
 | 
			
		||||
 *                                 | Enter| Space|------|       |------|  Space |Enter |
 | 
			
		||||
 *                                 | ~LSFT| ~WIN | Past |       | DOWN |   ~WIN | ~LSFT|
 | 
			
		||||
 *                                 `--------------------'       `----------------------'
 | 
			
		||||
 *                                        |. ~L1 | ,    |       |Home  |End~L1|
 | 
			
		||||
 *                                 ,------|------|------|       |------+------+------.
 | 
			
		||||
 *                                 |      |      | Copy |       | UP   |      |      |
 | 
			
		||||
 *                                 | Enter| Space|------|       |------| Space|Enter |
 | 
			
		||||
 *                                 | ~WIN | ~LSFT| Past |       | DOWN | ~LSFT| ~WIN |
 | 
			
		||||
 *                                 `--------------------'       `--------------------'
 | 
			
		||||
 */
 | 
			
		||||
// If it accepts an argument (i.e, is a function), it doesn't need KC_.
 | 
			
		||||
// Otherwise, it needs KC_*
 | 
			
		||||
| 
						 | 
				
			
			@ -59,110 +58,68 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
        KC_LCBR,        KC_A,         KC_S,   KC_D,   KC_F,   KC_G,
 | 
			
		||||
        KC_RCBR,        ALT_T(KC_Z),  KC_X,   KC_C,   KC_V,   KC_B,   KC_SLASH,
 | 
			
		||||
        CTL_T(KC_TAB), LSFT(KC_COMMA),LSFT(KC_DOT),KC_PIPE,KC_AMPR, 
 | 
			
		||||
                                              LT(1,KC_DOT),  LT(2,KC_COMM),
 | 
			
		||||
                                              LT(1,KC_DOT),  KC_COMM,
 | 
			
		||||
                                                              LCTL(KC_C),
 | 
			
		||||
                                               SFT_T(KC_ENTER),GUI_T(KC_SPACE),LCTL(KC_V),
 | 
			
		||||
                                               GUI_T(KC_ENTER),SFT_T(KC_SPACE),LCTL(KC_V),
 | 
			
		||||
        // right hand
 | 
			
		||||
             LCTL(KC_S)  ,     KC_6,   KC_7,   KC_8,   KC_9,   KC_0,     KC_LBRACKET,
 | 
			
		||||
             KC_DELETE,       KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_RBRACKET,
 | 
			
		||||
                          KC_H,   KC_J,   KC_K,   KC_L,   KC_UNDS,LCTL(KC_Y),
 | 
			
		||||
             KC_SCOLON,KC_N,   KC_M, KC_QUOTE  ,KC_EXLM , LSFT(KC_SLASH),   LCTL(KC_Z),
 | 
			
		||||
                                  KC_EQUAL,KC_PLUS  ,  KC_MINUS,KC_ASTR  ,     TG(1),
 | 
			
		||||
             LT(2,KC_HOME),         LT(1,KC_END),
 | 
			
		||||
             KC_HOME,         LT(1,KC_END),
 | 
			
		||||
             KC_UP,
 | 
			
		||||
             KC_DOWN,GUI_T(KC_SPACE), SFT_T(KC_ENTER)
 | 
			
		||||
             KC_DOWN,SFT_T(KC_SPACE), GUI_T(KC_ENTER)
 | 
			
		||||
    ),
 | 
			
		||||
/* Keymap 1: QWERTY layer
 | 
			
		||||
 | 
			
		||||
/* Keymap 1:  F keys + macros
 | 
			
		||||
 *
 | 
			
		||||
 * ,--------------------------------------------------.           ,--------------------------------------------------.
 | 
			
		||||
 * |   `    |   1  |   2  |   3  |   4  |   5  |   -  |           |   =  |   6  |   7  |   8  |   9  |  0   |        |
 | 
			
		||||
 * |  ESC   |  F1  |  F2  |  F3  |  F4  |  F5  |  `   |           | Calc |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
 | 
			
		||||
 * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
 | 
			
		||||
 * |   Tab  |   Q  |   W  |   E  |   R  |   T  |      |           |      |   Y  |   U  |   I  |   O  |   P  |        |
 | 
			
		||||
 * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
 | 
			
		||||
 * |  Esc   |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |  ;   |   '    |
 | 
			
		||||
 * |--------+------+------+------+------+------|  Tab |           |  Esc |------+------+------+------+------+--------|
 | 
			
		||||
 * |  LSHFT |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |  /   |    \   |
 | 
			
		||||
 * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
 | 
			
		||||
 *   | CTRL | WIN  |  ALT |ALT GR| Esc  |                                       | PgUp | PgDw | Ins  | PtSc |      |
 | 
			
		||||
 *   `----------------------------------'                                       `----------------------------------'
 | 
			
		||||
 *                                        ,-------------.       ,-------------.
 | 
			
		||||
 *                                        |      |  Cut |       |      |      |
 | 
			
		||||
 *                                 ,------|------|------|       |------+--------+------.
 | 
			
		||||
 *                                 |      |      |      |       |      |        |      |
 | 
			
		||||
 *                                 |      |      |------|       |------|   Left | Right|
 | 
			
		||||
 *                                 |      |      |      |       |      |        |      |
 | 
			
		||||
 *                                 `--------------------'       `----------------------'
 | 
			
		||||
 */
 | 
			
		||||
// If it accepts an argument (i.e, is a function), it doesn't need KC_.
 | 
			
		||||
// Otherwise, it needs KC_*
 | 
			
		||||
[QWERTY] = KEYMAP(  // layer 2 : QWERTY
 | 
			
		||||
        // left hand
 | 
			
		||||
        KC_GRAVE,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_MINUS,
 | 
			
		||||
        KC_TAB,        KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   KC_TRNS,
 | 
			
		||||
        KC_ESCAPE,        KC_A,         KC_S,   KC_D,   KC_F,   KC_G,
 | 
			
		||||
        KC_LSHIFT,        KC_Z,  KC_X,   KC_C,   KC_V,   KC_B,   KC_TAB,
 | 
			
		||||
        KC_LCTRL, KC_LGUI,KC_LALT,  KC_RALT,    KC_ESCAPE,
 | 
			
		||||
                                              KC_TRNS,  LCTL(KC_X),
 | 
			
		||||
                                                              KC_TRNS,
 | 
			
		||||
                                               KC_TRNS,KC_TRNS,KC_TRNS,
 | 
			
		||||
        // right hand
 | 
			
		||||
             KC_EQUAL  ,     KC_6,   KC_7,   KC_8,   KC_9,   KC_0, KC_TRNS,
 | 
			
		||||
             KC_TRNS,       KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,            KC_TRNS,
 | 
			
		||||
                          KC_H,   KC_J,   KC_K,   KC_L,   KC_SCOLON,  KC_QUOTE,
 | 
			
		||||
             KC_ESCAPE,KC_N,   KC_M,   KC_TRNS,KC_DOT , KC_SLASH,   KC_NONUS_BSLASH,
 | 
			
		||||
                                  KC_PGUP  ,  KC_PGDOWN,KC_INSERT  ,KC_PSCREEN,          KC_TRNS,
 | 
			
		||||
             KC_TRNS,        KC_TRNS,
 | 
			
		||||
             KC_TRNS,
 | 
			
		||||
             KC_TRNS,KC_LEFT, KC_RIGHT
 | 
			
		||||
    ),
 | 
			
		||||
/* Keymap 2:  F keys + macros
 | 
			
		||||
 *
 | 
			
		||||
 * ,--------------------------------------------------.           ,--------------------------------------------------.
 | 
			
		||||
 * |        |  F1  |  F2  |  F3  |  F4  |  F5  |      |           | Calc |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
 | 
			
		||||
 * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
 | 
			
		||||
 * |        |Public|Static|string|int   |return|      |           |      |//TODO|      |      |      |      |   F12  |
 | 
			
		||||
 * |  Tab   |Public|Static|string|int   |return|      |           |      |//TODO|      |      |      |      |   F12  |
 | 
			
		||||
 * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
 | 
			
		||||
 * |        |Privat|Const |var   |float |null  |------|           |------|new   |      |      |      |      |        |
 | 
			
		||||
 * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
 | 
			
		||||
 * |--------+------+------+------+------+------|  \   |           |  ~   |------+------+------+------+------+--------|
 | 
			
		||||
 * |        |      |      |void  |bool  |break;|      |           |      |();   |      |      |      |      |        |
 | 
			
		||||
 * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
 | 
			
		||||
 *   |      | Alt  |      |      |      |                                       |      |      |      |      |      |
 | 
			
		||||
 *   |      |  WIN | Alt  |      |      |                                       | PgUp | PgDw | Ins  | PtSc |      |
 | 
			
		||||
 *   `----------------------------------'                                       `----------------------------------'
 | 
			
		||||
 *                                        ,-------------.       ,-------------.
 | 
			
		||||
 *                                        |      | Cut  |       |      |      |
 | 
			
		||||
 *                                 ,------|------|------|       |------+------+------.
 | 
			
		||||
 *                                 |      |      |      |       |      |      |      |
 | 
			
		||||
 *                                 |      |      |------|       |------|      |      |
 | 
			
		||||
 *                                 |      |      |------|       |------| Left | Right|
 | 
			
		||||
 *                                 |      |      |      |       |      |      |      |
 | 
			
		||||
 *                                 `--------------------'       `--------------------'
 | 
			
		||||
 */
 | 
			
		||||
// FKEYS + MACROS
 | 
			
		||||
[FKEYS] = KEYMAP(
 | 
			
		||||
       // left hand
 | 
			
		||||
       KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
 | 
			
		||||
       KC_TRNS,M(MACRO_PUBLIC),M(MACRO_STATIC),  M(MACRO_STRING),M(MACRO_INT),M(MACRO_RETURN),KC_TRNS,
 | 
			
		||||
       KC_ESCAPE,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_GRAVE,
 | 
			
		||||
       KC_TAB,M(MACRO_PUBLIC),M(MACRO_STATIC),  M(MACRO_STRING),M(MACRO_INT),M(MACRO_RETURN),KC_TRNS,
 | 
			
		||||
       KC_TRNS,M(MACRO_PRIVATE),M(MACRO_CONST), M(MACRO_VAR),M(MACRO_FLOAT),M(MACRO_NULL),
 | 
			
		||||
       KC_TRNS,KC_TRNS,KC_TRNS,M(MACRO_VOID),M(MACRO_BOOL),M(MACRO_BREAK),KC_TRNS,
 | 
			
		||||
       KC_TRNS,KC_LALT,KC_TRNS,KC_TRNS,KC_TRNS,
 | 
			
		||||
                                       KC_TRNS,KC_TRNS,
 | 
			
		||||
       KC_TRNS,KC_TRNS,KC_TRNS,M(MACRO_VOID),M(MACRO_BOOL),M(MACRO_BREAK),KC_BSLASH,
 | 
			
		||||
       KC_TRNS,KC_LGUI,KC_LALT,KC_TRNS,KC_TRNS,
 | 
			
		||||
                                       KC_TRNS,LCTL(KC_X),
 | 
			
		||||
                                               KC_TRNS,
 | 
			
		||||
                               KC_TRNS,KC_TRNS,KC_TRNS,
 | 
			
		||||
       // right hand
 | 
			
		||||
       KC_CALCULATOR, KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,
 | 
			
		||||
       KC_TRNS, M(MACRO_TODO),   KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS, KC_F12,
 | 
			
		||||
                M(MACRO_NEW), KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,
 | 
			
		||||
       KC_TRNS, M(MACRO_PARENTHESE), KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,
 | 
			
		||||
                         KC_TRNS,KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,
 | 
			
		||||
       KC_TILD, M(MACRO_PARENTHESE), KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,
 | 
			
		||||
                         KC_PGUP,KC_PGDOWN,  KC_INSERT,   KC_PSCREEN,  KC_TRNS,
 | 
			
		||||
       KC_TRNS, KC_TRNS,
 | 
			
		||||
       KC_TRNS,
 | 
			
		||||
       KC_TRNS, KC_TRNS, KC_TRNS
 | 
			
		||||
       KC_TRNS, KC_LEFT, KC_RIGHT
 | 
			
		||||
),
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
const uint16_t PROGMEM fn_actions[] = {
 | 
			
		||||
    [1] = ACTION_LAYER_TAP_TOGGLE(QWERTY)                // FN1 - Momentary Layer 1
 | 
			
		||||
    [1] = ACTION_LAYER_TAP_TOGGLE(FKEYS)                // FN1 - Momentary Layer 1
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -4,6 +4,8 @@
 | 
			
		|||
 | 
			
		||||
* Feb 12, 2016 (V1): 
 | 
			
		||||
  * First version commit
 | 
			
		||||
* Mar 20, 2016 (V2):
 | 
			
		||||
  * Removed "Classic QWERTY" layer, inverted GUI and SHIFT on Hold for Space and Enter
 | 
			
		||||
 | 
			
		||||
## About
 | 
			
		||||
This layout was conceived in an attempt to optimise keyboard layout for developers (C# more specifically, but it can work with most of other languages), and limit the keys required to perform the most frequent actions.
 | 
			
		||||
| 
						 | 
				
			
			@ -38,7 +40,6 @@ Still there are many way to improve or iterate on this:
 | 
			
		|||
* Make it language agnostic
 | 
			
		||||
* Check and compile language's keyboard's heatmaps to statistically define keys priority (e.g.  https://dzone.com/articles/most-pressed-keys-various )
 | 
			
		||||
* QWERTY is still not the most efficient typing layout, I would like to create a Dvorak based similar layout in a near futur
 | 
			
		||||
* Layout 1 is mainly here for safety, most of its unique keys could be transfered to Layout 2 and it could then be removed
 | 
			
		||||
 | 
			
		||||
## Issues 
 | 
			
		||||
One of the issues encountered while creating this layout was that I did not find a way to have a key to send a modifier on hold, and a key combination while pressed (e.g. I can't set a Key to do Save (Ctrl + S) when pressed and Shift modifier when hold )
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
 * | Del    |   Q  |   W  |   F  |   P  |   G  |  L1  |           |  L1  |   J  |   L  |   U  |   Y  |   ;  |   \    |
 | 
			
		||||
 * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
 | 
			
		||||
 * | Esc    |   A  |   R  |   S  |   T  |   D  |------|           |------|   H  |   N  |   E  |   I  |  O   |   '    |
 | 
			
		||||
 * |--------+------+------+------+------+------| Hyper|           | Meh  |------+------+------+------+------+--------|
 | 
			
		||||
 * |--------+------+------+------+------+------|   =  |           |   -  |------+------+------+------+------+--------|
 | 
			
		||||
 * | LShift |Z/Ctrl|   X  |   C  |   V  |   B  |      |           |      |   K  |   M  |   ,  |   .  |//Ctrl| RShift |
 | 
			
		||||
 * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
 | 
			
		||||
 *   |Grv/L1|  '"  |AltShf| Left | Right|                                       |  Up  | Down |   [  |   ]  | ~L1  |
 | 
			
		||||
| 
						 | 
				
			
			@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
        KC_EQL,         KC_1,     KC_2,   KC_3,   KC_4,          KC_5,   KC_LEFT,
 | 
			
		||||
        KC_DELT,        KC_Q,     KC_W,   KC_F,   KC_P,          KC_G,   TG(SYMB),
 | 
			
		||||
        KC_ESC,         KC_A,     KC_R,   KC_S,   KC_T,          KC_D,
 | 
			
		||||
        KC_LSFT,        KC_Z,     KC_X,   KC_C,   KC_V,          KC_B,   ALL_T(KC_NO),
 | 
			
		||||
        KC_LSFT,        KC_Z,     KC_X,   KC_C,   KC_V,          KC_B,   KC_EQL,
 | 
			
		||||
        LT(SYMB,KC_GRV),KC_QUOT,  LALT(KC_LSFT),  KC_LEFT,       KC_RGHT,
 | 
			
		||||
                                                             KC_LALT,       F(LWIN),
 | 
			
		||||
                                                                            KC_HOME,
 | 
			
		||||
| 
						 | 
				
			
			@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
             KC_RGHT,     KC_6,   KC_7,   KC_8,   KC_9,   KC_0,             KC_MINS,
 | 
			
		||||
             TG(SYMB),    KC_J,   KC_L,   KC_U,   KC_Y,   KC_SCLN,          KC_BSLS,
 | 
			
		||||
                          KC_H,   KC_N,   KC_E,   KC_I,   KC_O,             KC_QUOT,
 | 
			
		||||
             MEH_T(KC_NO),KC_K,   KC_M,   KC_COMM,KC_DOT, CTL_T(KC_SLSH),   KC_RSFT,
 | 
			
		||||
             KC_MINS,     KC_K,   KC_M,   KC_COMM,KC_DOT, CTL_T(KC_SLSH),   KC_RSFT,
 | 
			
		||||
                                  KC_UP,  KC_DOWN,KC_LBRC,KC_RBRC,          LT(SYMB,KC_NO),
 | 
			
		||||
             KC_LALT,         KC_RALT,
 | 
			
		||||
             KC_PGUP,
 | 
			
		||||
| 
						 | 
				
			
			@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
 * | Del    |   Q  |   W  |   F  |   P  |   G  |  L1  |           |  L1  |   J  |   L  |   U  |   Y  |   ;  |   \    |
 | 
			
		||||
 * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
 | 
			
		||||
 * | Esc    |   A  |   R  |   S  |   T  |   D  |------|           |------|   H  |   N  |   E  |   I  |  O   |   '    |
 | 
			
		||||
 * |--------+------+------+------+------+------| Hyper|           | Meh  |------+------+------+------+------+--------|
 | 
			
		||||
 * |--------+------+------+------+------+------|   =  |           |   -  |------+------+------+------+------+--------|
 | 
			
		||||
 * | LShift |Z/Ctrl|   X  |   C  |   V  |   B  |      |           |      |   K  |   M  |   ,  |   .  |//Ctrl| RShift |
 | 
			
		||||
 * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
 | 
			
		||||
 *   |Grv/L1|  '"  |AltShf| Left | Right|                                       |  Up  | Down |   [  |   ]  | ~L1  |
 | 
			
		||||
| 
						 | 
				
			
			@ -94,7 +94,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
        KC_EQL,         KC_1,     KC_2,   KC_3,   KC_4,          KC_5,   KC_LEFT,
 | 
			
		||||
        KC_DELT,        CM_Q,     CM_W,   CM_F,   CM_P,          CM_G,   TG(SYMB),
 | 
			
		||||
        KC_ESC,         CM_A,     CM_R,   CM_S,   CM_T,          CM_D,
 | 
			
		||||
        KC_LSFT,        CM_Z,     CM_X,   CM_C,   CM_V,          CM_B,   ALL_T(KC_NO),
 | 
			
		||||
        KC_LSFT,        CM_Z,     CM_X,   CM_C,   CM_V,          CM_B,   KC_EQL,
 | 
			
		||||
        LT(SYMB,KC_GRV),KC_QUOT,  LALT(KC_LSFT),  KC_LEFT,       KC_RGHT,
 | 
			
		||||
                                                             KC_LALT,       F(LWIN),
 | 
			
		||||
                                                                            KC_HOME,
 | 
			
		||||
| 
						 | 
				
			
			@ -103,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
             KC_RGHT,     KC_6,   KC_7,   KC_8,   KC_9,   KC_0,             KC_MINS,
 | 
			
		||||
             TG(SYMB),    CM_J,   CM_L,   CM_U,   CM_Y,   KC_P, /*CM_SCLN*/ KC_BSLS,
 | 
			
		||||
                          CM_H,   CM_N,   CM_E,   CM_I,   CM_O,             KC_QUOT,
 | 
			
		||||
             MEH_T(KC_NO),CM_K,   CM_M,   CM_COMM,CM_DOT, CTL_T(CM_SLSH),   KC_RSFT,
 | 
			
		||||
             KC_MINS,     CM_K,   CM_M,   CM_COMM,CM_DOT, CTL_T(CM_SLSH),   KC_RSFT,
 | 
			
		||||
                                  KC_UP,  KC_DOWN,KC_LBRC,KC_RBRC,          LT(SYMB,KC_NO),
 | 
			
		||||
             KC_LALT,         KC_RALT,
 | 
			
		||||
             KC_PGUP,
 | 
			
		||||
| 
						 | 
				
			
			@ -222,22 +222,27 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 | 
			
		|||
        } else {
 | 
			
		||||
             unregister_code(KC_LGUI);
 | 
			
		||||
        }
 | 
			
		||||
        break;
 | 
			
		||||
    case PC1:
 | 
			
		||||
        if (!record->event.pressed) {
 | 
			
		||||
             return MACRO(T(SLCK), T(SLCK), T(1), T(ENT), END);
 | 
			
		||||
             return MACRO(T(SLCK), W(50), T(SLCK), W(50), T(1), W(50), T(ENT), END);
 | 
			
		||||
        }
 | 
			
		||||
        break;
 | 
			
		||||
    case PC2:
 | 
			
		||||
        if (!record->event.pressed) {
 | 
			
		||||
             return MACRO(T(SLCK), T(SLCK), T(2), T(ENT), END);
 | 
			
		||||
             return MACRO(T(SLCK), W(50), T(SLCK), W(50), T(2), W(50), T(ENT), END);
 | 
			
		||||
        }
 | 
			
		||||
        break;
 | 
			
		||||
    case PC3:
 | 
			
		||||
        if (!record->event.pressed) {
 | 
			
		||||
             return MACRO(T(SLCK), T(SLCK), T(3), T(ENT), END);
 | 
			
		||||
             return MACRO(T(SLCK), W(50), T(SLCK), W(50), T(3), W(50), T(ENT), END);
 | 
			
		||||
        }
 | 
			
		||||
        break;
 | 
			
		||||
    case PC4:
 | 
			
		||||
        if (!record->event.pressed) {
 | 
			
		||||
             return MACRO(T(SLCK), T(SLCK), T(4), T(ENT), END);
 | 
			
		||||
             return MACRO(T(SLCK), W(50), T(SLCK), W(50), T(4), W(50), T(ENT), END);
 | 
			
		||||
        }
 | 
			
		||||
        break;
 | 
			
		||||
    }
 | 
			
		||||
    return MACRO_NONE;
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
										
											
												File diff suppressed because it is too large
												Load diff
											
										
									
								
							| 
						 | 
				
			
			@ -0,0 +1,134 @@
 | 
			
		|||
#include "ergodox_ez.h"
 | 
			
		||||
#include "debug.h"
 | 
			
		||||
#include "action_layer.h"
 | 
			
		||||
 | 
			
		||||
#define BASE 0
 | 
			
		||||
#define SYMB 1
 | 
			
		||||
#define PLVR 2
 | 
			
		||||
#define ARRW 3
 | 
			
		||||
 | 
			
		||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
  [BASE] = KEYMAP(
 | 
			
		||||
    KC_GRV,        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_F14,
 | 
			
		||||
    KC_TAB,        KC_Q,    KC_W,    KC_D,    KC_F,    KC_K,    TG(PLVR),
 | 
			
		||||
    CTL_T(KC_ESC), KC_A,    KC_S,    KC_E,    KC_T,    KC_G,
 | 
			
		||||
    KC_LSFT,       KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_LBRC,
 | 
			
		||||
    KC_F1,         KC_F2,   KC_F3,   KC_LALT, KC_LGUI,
 | 
			
		||||
    /*-*/          /*-*/    /*-*/    /*-*/    /*-*/    KC_VOLD, KC_MUTE,
 | 
			
		||||
    /*-*/          /*-*/    /*-*/    /*-*/    /*-*/    /*-*/    KC_VOLU,
 | 
			
		||||
    /*-*/          /*-*/    /*-*/    /*-*/    /*-*/    KC_BSPC, CTL_T(KC_ESC), KC_FN1,
 | 
			
		||||
    //
 | 
			
		||||
    /*-*/          KC_F15,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,          KC_EQL,
 | 
			
		||||
    /*-*/          KC_BSLS, KC_J,    KC_U,    KC_R,    KC_L,    KC_SCLN,       KC_MINS,
 | 
			
		||||
    /*-*/          /*-*/    KC_Y,    KC_N,    KC_I,    KC_O,    KC_H,          KC_ENT,
 | 
			
		||||
    /*-*/          KC_RBRC, KC_P,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,       KC_RSFT,
 | 
			
		||||
    /*-*/          /*-*/    /*-*/    KC_RGUI, KC_RALT, KC_F4,   KC_F5,         KC_F6,
 | 
			
		||||
    KC_MPLY,       KC_MNXT,
 | 
			
		||||
    KC_MPRV,
 | 
			
		||||
    KC_FN3,        KC_QUOT, KC_SPC
 | 
			
		||||
  ),
 | 
			
		||||
  [SYMB] = KEYMAP(
 | 
			
		||||
    KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 | 
			
		||||
    KC_TRNS,       KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_TRNS,
 | 
			
		||||
    KC_TRNS,       KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,
 | 
			
		||||
    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_6,    KC_7,    KC_8,    KC_9,    KC_0,          KC_TRNS,
 | 
			
		||||
    /*-*/          /*-*/    KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,       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
 | 
			
		||||
  ),
 | 
			
		||||
  [PLVR] = KEYMAP(
 | 
			
		||||
    KC_NO,         KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_TRNS,
 | 
			
		||||
    KC_NO,         KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_TRNS,
 | 
			
		||||
    KC_NO,         KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,
 | 
			
		||||
    KC_NO,         KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_NO,
 | 
			
		||||
    KC_TRNS,       KC_TRNS, KC_TRNS, KC_NO,   KC_NO,
 | 
			
		||||
    /*-*/          /*-*/    /*-*/    /*-*/    /*-*/    KC_TRNS, KC_TRNS,
 | 
			
		||||
    /*-*/          /*-*/    /*-*/    /*-*/    /*-*/    /*-*/    KC_TRNS,
 | 
			
		||||
    /*-*/          /*-*/    /*-*/    /*-*/    KC_C,    KC_V,    KC_NO,
 | 
			
		||||
    //
 | 
			
		||||
    /*-*/          KC_TRNS, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,         KC_NO,
 | 
			
		||||
    /*-*/          KC_NO,   KC_6,    KC_7,    KC_8,    KC_9,    KC_0,          KC_NO,
 | 
			
		||||
    /*-*/          /*-*/    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,          KC_LBRC,
 | 
			
		||||
    /*-*/          KC_NO,   KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,       KC_QUOT,
 | 
			
		||||
    /*-*/          /*-*/    /*-*/    KC_NO,   KC_NO,   KC_NO,   KC_NO,         KC_NO,
 | 
			
		||||
    KC_TRNS,       KC_TRNS,
 | 
			
		||||
    KC_TRNS,
 | 
			
		||||
    KC_NO,         KC_N,    KC_M
 | 
			
		||||
  ),
 | 
			
		||||
  [ARRW] = KEYMAP(
 | 
			
		||||
    KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 | 
			
		||||
    KC_TRNS,       KC_TRNS, KC_BTN1, KC_MS_U, KC_BTN2, KC_TRNS, KC_TRNS,
 | 
			
		||||
    KC_TRNS,       KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, 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_UP,   KC_TRNS, KC_TRNS,       KC_TRNS,
 | 
			
		||||
    /*-*/          /*-*/    KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, 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
 | 
			
		||||
  ),
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
const uint16_t PROGMEM fn_actions[] = {
 | 
			
		||||
  [SYMB] = ACTION_LAYER_TAP_TOGGLE(SYMB), // FN1 - Momentary Symbols Layer
 | 
			
		||||
  [PLVR] = ACTION_LAYER_TAP_TOGGLE(PLVR), // FN2 - Momentary Plover Layer
 | 
			
		||||
  [ARRW] = ACTION_LAYER_TAP_TOGGLE(ARRW), // FN3 - Momentary Arrows Layer
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
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:
 | 
			
		||||
      if (record->event.pressed) {
 | 
			
		||||
        register_code(KC_RSFT);
 | 
			
		||||
      } else {
 | 
			
		||||
        unregister_code(KC_RSFT);
 | 
			
		||||
      }
 | 
			
		||||
      break;
 | 
			
		||||
  }
 | 
			
		||||
  return MACRO_NONE;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
// Runs just one time when the keyboard initializes.
 | 
			
		||||
void * matrix_init_user(void) {
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
// Runs constantly in the background, in a loop.
 | 
			
		||||
void * matrix_scan_user(void) {
 | 
			
		||||
  uint8_t layer = biton32(layer_state);
 | 
			
		||||
  ergodox_board_led_off();
 | 
			
		||||
  ergodox_right_led_1_off();
 | 
			
		||||
  ergodox_right_led_2_off();
 | 
			
		||||
  ergodox_right_led_3_off();
 | 
			
		||||
  switch (layer) {
 | 
			
		||||
    case SYMB:
 | 
			
		||||
      ergodox_right_led_1_on();
 | 
			
		||||
      break;
 | 
			
		||||
    case PLVR:
 | 
			
		||||
      ergodox_right_led_2_on();
 | 
			
		||||
      break;
 | 
			
		||||
    case ARRW:
 | 
			
		||||
      ergodox_right_led_3_on();
 | 
			
		||||
      break;
 | 
			
		||||
    default:
 | 
			
		||||
      break;
 | 
			
		||||
  }
 | 
			
		||||
};
 | 
			
		||||
| 
						 | 
				
			
			@ -0,0 +1,43 @@
 | 
			
		|||
# Roman's Layout
 | 
			
		||||
 | 
			
		||||
There are four layers:
 | 
			
		||||
 | 
			
		||||
- **BASE** is [Norman layout](https://normanlayout.info/).
 | 
			
		||||
- **SYMB** for numbers and symbols.
 | 
			
		||||
- **PLVR** is optimized for [Plover](http://www.openstenoproject.org).
 | 
			
		||||
- **ARRW** for navigation.
 | 
			
		||||
 | 
			
		||||
[](http://www.keyboard-layout-editor.com/#/gists/8ebcb701ecb763944417)
 | 
			
		||||
 | 
			
		||||
## Switching
 | 
			
		||||
 | 
			
		||||
- Tap `SYMB` to toggle **SYMB**.
 | 
			
		||||
- Tap `ARRW` to toggle **ARRW**.
 | 
			
		||||
- Hold `SYMB` (or `ARRW`) to activate **SYMB** (or **ARRW**) while holding.
 | 
			
		||||
- Tap `PLVR` to toggle **PLVR**.
 | 
			
		||||
 | 
			
		||||
## LEDs
 | 
			
		||||
 | 
			
		||||
- Red: SYMB is on.
 | 
			
		||||
- Green: PLVR is on.
 | 
			
		||||
- Blue: ARRW is on.
 | 
			
		||||
 | 
			
		||||
## Functional Keys
 | 
			
		||||
 | 
			
		||||
- Tap `F1` to mute microphone via [Shush](http://mizage.com/shush/).
 | 
			
		||||
- Tap `F2` to copy screenshot to the clipboard.
 | 
			
		||||
- Hold `SHIFT` and tap `F2` to save screenshot as a file.
 | 
			
		||||
- Tap `F3`, `F4`, `F5`, `F6` to resize a window via [Divvy](http://mizage.com/divvy/).
 | 
			
		||||
- Tap `F14`, `F15` to adjust display brightness.
 | 
			
		||||
 | 
			
		||||
## CTRL/ESC
 | 
			
		||||
 | 
			
		||||
Both of those keys are frequently used in Vim.
 | 
			
		||||
 | 
			
		||||
- Tap `CTRL/ESC` to send `ESC`.
 | 
			
		||||
- Hold `CTRL/ESC` to use as `CTRL`.
 | 
			
		||||
 | 
			
		||||
## Activate N-rollover
 | 
			
		||||
 | 
			
		||||
- While in **BASE** hold left `SHIFT` and right `SHIRT` and then tap `N`.
 | 
			
		||||
- Then you can activate **PLVR** and use ErgoDox EZ for steno.
 | 
			
		||||
										
											
												File diff suppressed because it is too large
												Load diff
											
										
									
								
							
										
											Binary file not shown.
										
									
								
							| 
		 After Width: | Height: | Size: 127 KiB  | 
| 
						 | 
				
			
			@ -17,6 +17,9 @@ Download the `cygwin` setup ([x86_64](https://cygwin.com/setup-x86_64.exe)) and
 | 
			
		|||
- devel/make
 | 
			
		||||
- devel/texinfo
 | 
			
		||||
- devel/gettext-devel
 | 
			
		||||
- devel/automake
 | 
			
		||||
- devel/autoconfig
 | 
			
		||||
- devel/libtool
 | 
			
		||||
- text/gettext
 | 
			
		||||
- libs/libgcc1
 | 
			
		||||
- interpreters/m4
 | 
			
		||||
| 
						 | 
				
			
			@ -60,7 +63,7 @@ These commands will set up the install directory and the `PATH` variable, which
 | 
			
		|||
$ PREFIX=$HOME/local/avr
 | 
			
		||||
$ export PREFIX
 | 
			
		||||
$ PATH=/usr/local/bin:/usr/local/lib:/usr/local/include:/bin:/lib:/cygdrive/c/WINDOWS/system32:/cygdrive/c/WINDOWS
 | 
			
		||||
$ PATH=$PATH:$PREFIX/bin
 | 
			
		||||
$ PATH=$PATH:$PREFIX/bin:$PREFIX/lib
 | 
			
		||||
$ export PATH
 | 
			
		||||
```
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -155,13 +158,13 @@ $ make install
 | 
			
		|||
We can either build our own, or use the precomplied binaries.  The precompiled binaries don't play well with `cygwin` so it is better to build them ourselves.  The procedure for the precompiled binaries is included at the end of this guide.
 | 
			
		||||
 | 
			
		||||
### Build and Install the `libusb`
 | 
			
		||||
The `dfu-programmer` requires `libusb` so that it can interact with the USB system.
 | 
			
		||||
The `dfu-programmer` requires `libusb` so that it can interact with the USB system. These repos must be bootstrapped in order to create an appropriate `./configure` and `Makefile` for your system.
 | 
			
		||||
```
 | 
			
		||||
$ cd ~/src
 | 
			
		||||
$ git clone https://github.com/libusb/libusb.git
 | 
			
		||||
$ cd libusb
 | 
			
		||||
$ ./bootstrap.sh
 | 
			
		||||
$ ./configure --prefix=$PREFIX
 | 
			
		||||
$ ./configure
 | 
			
		||||
$ make
 | 
			
		||||
$ make install
 | 
			
		||||
```
 | 
			
		||||
| 
						 | 
				
			
			@ -172,7 +175,7 @@ $ cd ~/src
 | 
			
		|||
$ git clone https://github.com/dfu-programmer/dfu-programmer.git
 | 
			
		||||
$ cd dfu-programmer
 | 
			
		||||
$ ./bootstrap.sh
 | 
			
		||||
$ ./configure --prefix=$PREFIX
 | 
			
		||||
$ ./configure
 | 
			
		||||
$ make
 | 
			
		||||
$ make install
 | 
			
		||||
```
 | 
			
		||||
| 
						 | 
				
			
			@ -180,7 +183,7 @@ $ make install
 | 
			
		|||
Verify the installation with:
 | 
			
		||||
```
 | 
			
		||||
$ which dfu-programmer
 | 
			
		||||
/home/Kevin/local/avr/bin/dfu-programmer
 | 
			
		||||
/usr/local/bin/dfu-programmer
 | 
			
		||||
 | 
			
		||||
$ dfu-programmer
 | 
			
		||||
dfu-programmer 0.7.2
 | 
			
		||||
| 
						 | 
				
			
			@ -315,7 +318,6 @@ These tools are for debugging your firmware, etc. before flashing. Theoretically
 | 
			
		|||
$ cd ~/src
 | 
			
		||||
$ git clone git://sourceware.org/git/binutils-gdb.git
 | 
			
		||||
$ cd binutils-gdb
 | 
			
		||||
$ ./bootstrap
 | 
			
		||||
$ mkdir obj-avr
 | 
			
		||||
$ cd obj-avr
 | 
			
		||||
$ ../configure --prefix=$PREFIX --target=avr --build=x86_64-unknown-cygwin --with-gmp=/usr/local --with-mpfr=/usr/local --with-mpc=/usr/local --disable-nls --enable-static
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue