aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Gérard <1322081+GreatWizard@users.noreply.github.com>2020-06-28 23:47:33 +0200
committerGitHub <noreply@github.com>2020-06-28 22:47:33 +0100
commitb215bc3aba9bb5feb7edfc7166afdc30cb1a0b1d (patch)
tree2d7d140f5f6b66edc9238705e4e2ceace56c14bf
parent092849622017fcd32c1b3e4708030b1cf2fd6ade (diff)
downloadqmk_firmware-b215bc3aba9bb5feb7edfc7166afdc30cb1a0b1d.tar.gz
qmk_firmware-b215bc3aba9bb5feb7edfc7166afdc30cb1a0b1d.zip
Add workman layout in JJ50 default keymap (#9574)
-rw-r--r--keyboards/jj50/keymaps/default/README.md26
-rw-r--r--keyboards/jj50/keymaps/default/keymap.c48
2 files changed, 59 insertions, 15 deletions
diff --git a/keyboards/jj50/keymaps/default/README.md b/keyboards/jj50/keymaps/default/README.md
index 49622dd29..15a480ae1 100644
--- a/keyboards/jj50/keymaps/default/README.md
+++ b/keyboards/jj50/keymaps/default/README.md
@@ -18,6 +18,22 @@
18`-----------------------------------------------------------------------------------' 18`-----------------------------------------------------------------------------------'
19``` 19```
20 20
21### Workman
22
23```
24,-----------------------------------------------------------------------------------.
25| ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp |
26|------+------+------+------+------+------+------+------+------+------+------+------|
27| Tab | Q | D | R | W | B | J | F | U | P | ; | Del |
28|------+------+------+------+------+-------------+------+------+------+------+------|
29| Esc | A | S | H | T | G | Y | N | E | O | I | ' |
30|------+------+------+------+------+------|------+------+------+------+------+------|
31| Shift| Z | X | M | C | V | K | L | , | . | / |Enter |
32|------+------+------+------+------+------+------+------+------+------+------+------|
33| Num | Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right |
34`-----------------------------------------------------------------------------------'
35```
36
21### Colemak 37### Colemak
22 38
23``` 39```
@@ -56,9 +72,9 @@
56 72
57``` 73```
58,-----------------------------------------------------------------------------------. 74,-----------------------------------------------------------------------------------.
59| ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp | 75| ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | |
60|------+------+------+------+------+-------------+------+------+------+------+------| 76|------+------+------+------+------+-------------+------+------+------+------+------|
61| ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Del | 77| ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | |
62|------+------+------+------+------+-------------+------+------+------+------+------| 78|------+------+------+------+------+-------------+------+------+------+------+------|
63| Del | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | { | } | | | 79| Del | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | { | } | | |
64|------+------+------+------+------+------|------+------+------+------+------+------| 80|------+------+------+------+------+------|------+------+------+------+------+------|
@@ -72,9 +88,9 @@
72 88
73``` 89```
74,-----------------------------------------------------------------------------------. 90,-----------------------------------------------------------------------------------.
75| ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | 91| ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | |
76|------+------+------+------+------+------+------+------+------+------+------+------| 92|------+------+------+------+------+------+------+------+------+------+------+------|
77| ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Del | 93| ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | |
78|------+------+------+------+------+-------------+------+------+------+------+------| 94|------+------+------+------+------+-------------+------+------+------+------+------|
79| Del | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ | 95| Del | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ |
80|------+------+------+------+------+------|------+------+------+------+------+------| 96|------+------+------+------+------+------|------+------+------+------+------+------|
@@ -92,7 +108,7 @@
92|------+------+------+------+------+------+------+------+------+------+------+------| 108|------+------+------+------+------+------+------+------+------+------+------+------|
93| | Reset| | | | | | | | | | Del | 109| | Reset| | | | | | | | | | Del |
94|------+------+------+------+------+-------------+------+------+------+------+------| 110|------+------+------+------+------+-------------+------+------+------+------+------|
95| | | | | | | |Qwerty|Colemk|Dvorak| | | 111|CPSLCK| | | | | | |Qwerty|Workmn|Colemk|Dvorak| |
96|------+------+------+------+------+------|------+------+------+------+------+------| 112|------+------+------+------+------+------|------+------+------+------+------+------|
97| | | | | | | | | | | | | 113| | | | | | | | | | | | |
98|------+------+------+------+------+------+------+------+------+------+------+------| 114|------+------+------+------+------+------+------+------+------+------+------+------|
diff --git a/keyboards/jj50/keymaps/default/keymap.c b/keyboards/jj50/keymaps/default/keymap.c
index 29db0e265..96a308f82 100644
--- a/keyboards/jj50/keymaps/default/keymap.c
+++ b/keyboards/jj50/keymaps/default/keymap.c
@@ -19,6 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
19 19
20enum layers { 20enum layers {
21 _QWERTY, 21 _QWERTY,
22 _WORKMAN,
22 _COLEMAK, 23 _COLEMAK,
23 _DVORAK, 24 _DVORAK,
24 _LOWER, 25 _LOWER,
@@ -29,6 +30,7 @@ enum layers {
29 30
30enum keycodes { 31enum keycodes {
31 QWERTY = SAFE_RANGE, 32 QWERTY = SAFE_RANGE,
33 WORKMAN,
32 COLEMAK, 34 COLEMAK,
33 DVORAK 35 DVORAK
34}; 36};
@@ -60,6 +62,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
60 FN, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT 62 FN, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
61 ), 63 ),
62 64
65 /* Workman
66 * ,-----------------------------------------------------------------------------------.
67 * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp |
68 * |------+------+------+------+------+------+------+------+------+------+------+------|
69 * | Tab | Q | D | R | W | B | J | F | U | P | ; | Del |
70 * |------+------+------+------+------+-------------+------+------+------+------+------|
71 * | Esc | A | S | H | T | G | Y | N | E | O | I | ' |
72 * |------+------+------+------+------+------|------+------+------+------+------+------|
73 * | Shift| Z | X | M | C | V | K | L | , | . | / |Enter |
74 * |------+------+------+------+------+------+------+------+------+------+------+------|
75 * | Num | Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right |
76 * `-----------------------------------------------------------------------------------'
77 */
78 [_WORKMAN] = LAYOUT(
79 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
80 KC_TAB, KC_Q, KC_D, KC_R, KC_W, KC_B, KC_J, KC_F, KC_U, KC_P, KC_SCLN, KC_DEL,
81 KC_ESC, KC_A, KC_S, KC_H, KC_T, KC_G, KC_Y, KC_N, KC_E, KC_O, KC_I, KC_QUOT,
82 KC_LSFT, KC_Z, KC_X, KC_M, KC_C, KC_V, KC_K, KC_L, KC_COMM, KC_DOT, KC_SLSH, KC_ENT,
83 FN, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
84 ),
85
63 /* Colemak 86 /* Colemak
64 * ,-----------------------------------------------------------------------------------. 87 * ,-----------------------------------------------------------------------------------.
65 * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | 88 * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp |
@@ -104,9 +127,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
104 127
105 /* Lower 128 /* Lower
106 * ,-----------------------------------------------------------------------------------. 129 * ,-----------------------------------------------------------------------------------.
107 * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp | 130 * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | |
108 * |------+------+------+------+------+-------------+------+------+------+------+------| 131 * |------+------+------+------+------+-------------+------+------+------+------+------|
109 * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Del | 132 * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | |
110 * |------+------+------+------+------+-------------+------+------+------+------+------| 133 * |------+------+------+------+------+-------------+------+------+------+------+------|
111 * | Del | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | { | } | | | 134 * | Del | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | { | } | | |
112 * |------+------+------+------+------+------|------+------+------+------+------+------| 135 * |------+------+------+------+------+------|------+------+------+------+------+------|
@@ -116,8 +139,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
116 * `-----------------------------------------------------------------------------------' 139 * `-----------------------------------------------------------------------------------'
117 */ 140 */
118 [_LOWER] = LAYOUT( 141 [_LOWER] = LAYOUT(
119 KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, 142 KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
120 KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL, 143 KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
121 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, 144 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
122 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),KC_HOME, KC_END, _______, 145 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),KC_HOME, KC_END, _______,
123 _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY 146 _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
@@ -125,9 +148,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
125 148
126 /* Raise 149 /* Raise
127 * ,-----------------------------------------------------------------------------------. 150 * ,-----------------------------------------------------------------------------------.
128 * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | 151 * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | |
129 * |------+------+------+------+------+------+------+------+------+------+------+------| 152 * |------+------+------+------+------+------+------+------+------+------+------+------|
130 * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Del | 153 * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | |
131 * |------+------+------+------+------+-------------+------+------+------+------+------| 154 * |------+------+------+------+------+-------------+------+------+------+------+------|
132 * | Del | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ | 155 * | Del | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ |
133 * |------+------+------+------+------+------|------+------+------+------+------+------| 156 * |------+------+------+------+------+------|------+------+------+------+------+------|
@@ -137,8 +160,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
137 * `-----------------------------------------------------------------------------------' 160 * `-----------------------------------------------------------------------------------'
138 */ 161 */
139 [_RAISE] = LAYOUT( 162 [_RAISE] = LAYOUT(
140 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, 163 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______,
141 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, 164 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______,
142 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, 165 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
143 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______, 166 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______,
144 _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY 167 _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
@@ -150,7 +173,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
150 * |------+------+------+------+------+------+------+------+------+------+------+------| 173 * |------+------+------+------+------+------+------+------+------+------+------+------|
151 * | | Reset| | | | | | | | | | Del | 174 * | | Reset| | | | | | | | | | Del |
152 * |------+------+------+------+------+-------------+------+------+------+------+------| 175 * |------+------+------+------+------+-------------+------+------+------+------+------|
153 * | | | | | | | |Qwerty|Colemk|Dvorak| | | 176 * |CPSLCK| | | | | | |Qwerty|Workmn|Colemk|Dvorak| |
154 * |------+------+------+------+------+------|------+------+------+------+------+------| 177 * |------+------+------+------+------+------|------+------+------+------+------+------|
155 * | | | | | | | | | | | | | 178 * | | | | | | | | | | | | |
156 * |------+------+------+------+------+------+------+------+------+------+------+------| 179 * |------+------+------+------+------+------+------+------+------+------+------+------|
@@ -160,7 +183,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
160 [_ADJUST] = LAYOUT( 183 [_ADJUST] = LAYOUT(
161 KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, 184 KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
162 _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, 185 _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
163 _______, _______, _______, _______, _______, _______, _______, QWERTY, COLEMAK, DVORAK, _______, _______, 186 KC_CAPS, _______, _______, _______, _______, _______, _______, QWERTY, WORKMAN, COLEMAK, DVORAK, _______,
164 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 187 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
165 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ 188 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
166 ), 189 ),
@@ -198,6 +221,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
198 set_single_persistent_default_layer(_QWERTY); 221 set_single_persistent_default_layer(_QWERTY);
199 } 222 }
200 return false; 223 return false;
224 case WORKMAN:
225 if (record->event.pressed) {
226 set_single_persistent_default_layer(_WORKMAN);
227 }
228 return false;
201 case COLEMAK: 229 case COLEMAK:
202 if (record->event.pressed) { 230 if (record->event.pressed) {
203 set_single_persistent_default_layer(_COLEMAK); 231 set_single_persistent_default_layer(_COLEMAK);