aboutsummaryrefslogtreecommitdiff
path: root/keyboards/sofle/keymaps/default/keymap.c
diff options
context:
space:
mode:
authorJosef Adamcik <josef.adamcik@gmail.com>2020-04-29 17:11:16 +0200
committerJosef Adamcik <josef.adamcik@gmail.com>2020-04-29 17:18:14 +0200
commit41fd60d624c260d75de3d507bbbbaf9d8f977665 (patch)
tree3aa9f747b60a9146e34672dd892d2f5eda8d2a74 /keyboards/sofle/keymaps/default/keymap.c
parent168ba88ada31e9c70e39ee7a592595a7a771afe3 (diff)
downloadqmk_firmware-41fd60d624c260d75de3d507bbbbaf9d8f977665.tar.gz
qmk_firmware-41fd60d624c260d75de3d507bbbbaf9d8f977665.zip
Sofle: Remove LAYOUT_kc macro for default layout. Remove unnecessary code.
Diffstat (limited to 'keyboards/sofle/keymaps/default/keymap.c')
-rw-r--r--keyboards/sofle/keymaps/default/keymap.c138
1 files changed, 64 insertions, 74 deletions
diff --git a/keyboards/sofle/keymaps/default/keymap.c b/keyboards/sofle/keymaps/default/keymap.c
index 894cb33cd..23086bcd6 100644
--- a/keyboards/sofle/keymaps/default/keymap.c
+++ b/keyboards/sofle/keymaps/default/keymap.c
@@ -6,8 +6,7 @@ enum sofle_layers {
6 _W_QWERTY, 6 _W_QWERTY,
7 _M_COLEMAK, 7 _M_COLEMAK,
8 _W_COLEMAK, 8 _W_COLEMAK,
9 _M_LOWER, 9 _LOWER,
10 _W_LOWER,
11 _M_RAISE, 10 _M_RAISE,
12 _W_RAISE, 11 _W_RAISE,
13 _ADJUST, 12 _ADJUST,
@@ -47,9 +46,8 @@ enum custom_keycodes {
47#define KC_M_LEND LGUI(KC_RIGHT) 46#define KC_M_LEND LGUI(KC_RIGHT)
48#define KC_M_DLINE LGUI(KC_BSPC) 47#define KC_M_DLINE LGUI(KC_BSPC)
49 48
50#define KC_____ KC_TRNS 49#define ______ KC_TRNS
51#define KC_XXXX KC_NO 50#define XXXXXX KC_NO
52#define KC_RESET RESET
53 51
54const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 52const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
55/* 53/*
@@ -67,19 +65,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
67 * | | | | |/ / \ \ | | | | | 65 * | | | | |/ / \ \ | | | | |
68 * `----------------------------------' '------''---------------------------' 66 * `----------------------------------' '------''---------------------------'
69 */ 67 */
70[_M_QWERTY] = LAYOUT_kc( \ 68[_M_QWERTY] = LAYOUT( \
71 GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, GRV, \ 69 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV, \
72 ESC, Q, W, E, R, T, Y, U, I, O, P, BSPC, \ 70 KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \
73 TAB, A, S, D, F, G, H, J, K, L, SCLN, QUOT, \ 71 KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \
74 LSFT, Z, X, C, V, B, MUTE, XXXX, N, M, COMM, DOT, SLSH, RSFT, \ 72 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_MUTE, XXXXXX,KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \
75 LCTRL,LALT,LGUI,M_LOWER, ENT, SPC, M_RAISE, RGUI, RALT, RCTRL \ 73 KC_LCTRL,KC_LALT,KC_LGUI,KC_M_LOWER, KC_ENT, KC_SPC, KC_M_RAISE, KC_RGUI, KC_RALT, KC_RCTRL \
76), 74),
77[_W_QWERTY] = LAYOUT_kc( \ 75[_W_QWERTY] = LAYOUT( \
78 GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, GRV, \ 76 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV, \
79 ESC, Q, W, E, R, T, Y, U, I, O, P, BSPC, \ 77 KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \
80 TAB, A, S, D, F, G, H, J, K, L, SCLN, QUOT, \ 78 KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \
81 LSFT, Z, X, C, V, B, MUTE, XXXX, N, M, COMM, DOT, SLSH, RSFT, \ 79 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_MUTE, XXXXXX,KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \
82 LGUI, LALT,LCTRL,W_LOWER,ENT, SPC, W_RAISE, RCTRL,RALT, RGUI \ 80 KC_LGUI,KC_LALT,KC_LCTRL,KC_M_LOWER, KC_ENT, KC_SPC, KC_M_RAISE, KC_RCTRL, KC_RALT, KC_RGUI \
83), 81),
84/* 82/*
85 * COLEMAK 83 * COLEMAK
@@ -97,19 +95,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
97 * `----------------------------------' '------''---------------------------' 95 * `----------------------------------' '------''---------------------------'
98 */ 96 */
99 97
100[_M_COLEMAK] = LAYOUT_kc( \ 98[_M_COLEMAK] = LAYOUT( \
101 GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, GRV, \ 99 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV, \
102 ESC, Q, W, F, P, G, J, L, U, Y, SCLN, BSPC, \ 100 KC_ESC, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, \
103 TAB, A, R, S, T, D, H, N, E, I, O, QUOT, \ 101 KC_TAB, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, \
104 LSFT, Z, X, C, V, B, MUTE, XXXX, K, M, COMM, DOT, SLSH, RSFT, \ 102 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_MUTE, XXXXXX,KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \
105 LCTRL,LALT,LGUI,M_LOWER, ENT, SPC, M_RAISE, RGUI, RALT, RCTRL \ 103 KC_LCTRL,KC_LALT,KC_LGUI,KC_M_LOWER, KC_ENT, KC_SPC, KC_M_RAISE, KC_RGUI, KC_RALT, KC_RCTRL \
106), 104),
107[_W_COLEMAK] = LAYOUT_kc( \ 105[_W_COLEMAK] = LAYOUT( \
108 GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, GRV, \ 106 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV, \
109 ESC, Q, W, F, P, G, J, L, U, Y, SCLN, BSPC, \ 107 KC_ESC, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, \
110 TAB, A, R, S, T, D, H, N, E, I, O, QUOT, \ 108 KC_TAB, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, \
111 LSFT, Z, X, C, V, B, MUTE, XXXX, K, M, COMM, DOT, SLSH, RSFT, \ 109 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_MUTE, XXXXXX,KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \
112 LGUI, LALT,LCTRL,W_LOWER,ENT, SPC, W_RAISE, RCTRL,RALT, RGUI \ 110 KC_LGUI,KC_LALT,KC_LCTRL,KC_M_LOWER, KC_ENT, KC_SPC, KC_M_RAISE, KC_RCTRL, KC_RALT, KC_RGUI \
113), 111),
114/* LOWER 112/* LOWER
115 * ,-----------------------------------------. ,-----------------------------------------. 113 * ,-----------------------------------------. ,-----------------------------------------.
@@ -125,19 +123,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
125 * | | | | |/ / \ \ | | | | | 123 * | | | | |/ / \ \ | | | | |
126 * `----------------------------------' '------''---------------------------' 124 * `----------------------------------' '------''---------------------------'
127 */ 125 */
128[_M_LOWER] = LAYOUT_kc( \ 126[_LOWER] = LAYOUT( \
129 ____, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11,\ 127 ______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,\
130 GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, F12, \ 128 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_F12, \
131 ____, EXLM, AT, HASH, DLR, PERC, CIRC, AMPR, ASTR, LPRN, RPRN, PIPE, \ 129 ______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE, \
132 ____, EQL, MINS, PLUS, LCBR, RCBR, ____, ____, LBRC, RBRC, SCLN, COLN, BSLS, ____, \ 130 ______, KC_EQL, KC_MINS, KC_PLUS, KC_LCBR, KC_RCBR, ______, ______, KC_LBRC, KC_RBRC, KC_SCLN, KC_COLN, KC_BSLS, ______, \
133 ____, ____, ____, ____, ____, ____, ____, ____, ____, ____\ 131 ______, ______, ______, ______, ______, ______, ______, ______, ______, ______\
134),
135[_W_LOWER] = LAYOUT_kc( \
136 ____, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11,\
137 GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, F12, \
138 ____, EXLM, AT, HASH, DLR, PERC, CIRC, AMPR, ASTR, LPRN, RPRN, PIPE, \
139 ____, EQL, MINS, PLUS, LCBR, RCBR, ____, ____, LBRC, RBRC, SCLN, COLN, BSLS, ____, \
140 ____, ____, ____, ____, ____, ____, ____, ____, ____, ____\
141), 132),
142/* RAISE 133/* RAISE
143 * ,----------------------------------------. ,-----------------------------------------. 134 * ,----------------------------------------. ,-----------------------------------------.
@@ -153,19 +144,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
153 * | | | | |/ / \ \ | | | | | 144 * | | | | |/ / \ \ | | | | |
154 * `----------------------------------' '------''---------------------------' 145 * `----------------------------------' '------''---------------------------'
155 */ 146 */
156[_M_RAISE] = LAYOUT_kc( \ 147[_M_RAISE] = LAYOUT( \
157 ____, ____ , ____ , ____ , ____ , ____, ____, ____ , ____, ____ , ____ ,____, \ 148 ______, ______ , ______ , ______ , ______ , ______, ______, ______ , ______, ______ , ______ ,______, \
158 ____, INS, PSCR, APP, XXXX, XXXX, PGUP, M_PRVWD, UP,M_NXTWD,M_DLINE,BSPC, \ 149 ______, KC_INS, KC_PSCR, KC_APP, XXXXXX, XXXXXX, KC_PGUP, KC_M_PRVWD, KC_UP,KC_M_NXTWD,KC_M_DLINE,KC_BSPC, \
159 ____, LALT, LCTL, LSFT, XXXX, CAPS, PGDN, LEFT, DOWN, RGHT, DEL, BSPC, \ 150 ______, KC_LALT, KC_LCTL, KC_LSFT, XXXXXX, KC_CAPS, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL, KC_BSPC, \
160 ____,M_UNDO, M_CUT,M_COPY,M_PASTE,XXXX, ____, ____, XXXX, M_LSTRT, XXXX, M_LEND, XXXX, ____, \ 151 ______,KC_M_UNDO, KC_M_CUT,KC_M_COPY,KC_M_PASTE, XXXXXX,______, ______, XXXXXX, KC_M_LSTRT, XXXXXX, KC_M_LEND, XXXXXX, ______, \
161 ____, ____, ____, ____, ____, ____, ____, ____, ____, ____ \ 152 ______, ______, ______, ______, ______, ______, ______, ______, ______, ______ \
162), 153),
163[_W_RAISE] = LAYOUT_kc( \ 154[_W_RAISE] = LAYOUT( \
164 ____, ____ , ____ , ____ , ____ , ____, ____, ____ , ____, ____ , ____ , ____, \ 155 ______, ______ , ______ , ______ , ______ , ______, ______, ______ , ______, ______ , ______ ,______, \
165 ____, INS, PSCR, APP, XXXX, XXXX, PGUP, W_PRVWD, UP,W_NXTWD,W_DLINE, BSPC, \ 156 ______, KC_INS, KC_PSCR, KC_APP, XXXXXX, XXXXXX, KC_PGUP, KC_W_PRVWD, KC_UP,KC_W_NXTWD,KC_W_DLINE, KC_BSPC, \
166 ____, LALT, LCTL, LSFT, XXXX, CAPS, PGDN, LEFT, DOWN, RGHT, DEL, BSPC, \ 157 ______, KC_LALT, KC_LCTL, KC_LSFT, XXXXXX, KC_CAPS, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL, KC_BSPC, \
167 ____,W_UNDO, W_CUT,W_COPY,W_PASTE,XXXX, ____, ____, XXXX, W_LSTRT, XXXX, W_LEND, XXXX, ____, \ 158 ______,KC_W_UNDO,KC_W_CUT,KC_W_COPY,KC_W_PASTE,XXXXXX, ______, ______, XXXXXX, KC_W_LSTRT, XXXXXX, KC_W_LEND, XXXXXX, ______, \
168 ____, ____, ____, ____, ____, ____, ____, ____, ____, ____ \ 159 ______, ______, ______, ______, ______, ______, ______, ______, ______, ______ \
169), 160),
170/* ADJUST 161/* ADJUST
171 * ,-----------------------------------------. ,-----------------------------------------. 162 * ,-----------------------------------------. ,-----------------------------------------.
@@ -181,12 +172,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
181 * | | | | |/ / \ \ | | | | | 172 * | | | | |/ / \ \ | | | | |
182 * `----------------------------------' '------''---------------------------' 173 * `----------------------------------' '------''---------------------------'
183 */ 174 */
184 [_ADJUST] = LAYOUT_kc( \ 175 [_ADJUST] = LAYOUT( \
185 XXXX , XXXX, XXXX , XXXX , XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, \ 176 XXXXXX , XXXXXX, XXXXXX , XXXXXX , XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, \
186 RESET, XXXX,M_QWERTY,M_COLEMAK, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, \ 177 RESET , XXXXXX,KC_M_QWERTY,KC_M_COLEMAK,XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, \
187 XXXX , XXXX,W_QWERTY,W_COLEMAK, XXXX, XXXX, XXXX, VOLD, MUTE, VOLU, XXXX, XXXX, \ 178 XXXXXX , XXXXXX,KC_W_QWERTY,KC_W_COLEMAK,XXXXXX, XXXXXX, XXXXXX, KC_VOLD, KC_MUTE, KC_VOLU, XXXXXX, XXXXXX, \
188 XXXX , XXXX, XXXX , XXXX , XXXX, XXXX, XXXX, XXXX, XXXX, MPRV, MPLY, MNXT, XXXX, XXXX, \ 179 XXXXXX , XXXXXX, XXXXXX , XXXXXX , XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXX, XXXXXX, \
189 ____, ____, ____, ____, ____, ____, ____, ____, ____, ____ \ 180 ______, ______, ______, ______, ______, ______, ______, ______, ______, ______ \
190 ) 181 )
191}; 182};
192 183
@@ -237,8 +228,7 @@ static void print_status_narrow(void) {
237 case _W_RAISE: 228 case _W_RAISE:
238 oled_write_P(PSTR("Raise"), false); 229 oled_write_P(PSTR("Raise"), false);
239 break; 230 break;
240 case _M_LOWER: 231 case _LOWER:
241 case _W_LOWER:
242 oled_write_P(PSTR("Lower"), false); 232 oled_write_P(PSTR("Lower"), false);
243 break; 233 break;
244 case _ADJUST: 234 case _ADJUST:
@@ -297,41 +287,41 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
297 break; 287 break;
298 case KC_M_LOWER: 288 case KC_M_LOWER:
299 if (record->event.pressed) { 289 if (record->event.pressed) {
300 layer_on(_M_LOWER); 290 layer_on(_LOWER);
301 update_tri_layer(_M_LOWER, _M_RAISE, _ADJUST); 291 update_tri_layer(_LOWER, _M_RAISE, _ADJUST);
302 } else { 292 } else {
303 layer_off(_M_LOWER); 293 layer_off(_LOWER);
304 update_tri_layer(_M_LOWER, _M_RAISE, _ADJUST); 294 update_tri_layer(_LOWER, _M_RAISE, _ADJUST);
305 } 295 }
306 return false; 296 return false;
307 break; 297 break;
308 case KC_M_RAISE: 298 case KC_M_RAISE:
309 if (record->event.pressed) { 299 if (record->event.pressed) {
310 layer_on(_M_RAISE); 300 layer_on(_M_RAISE);
311 update_tri_layer(_M_LOWER, _M_RAISE, _ADJUST); 301 update_tri_layer(_LOWER, _M_RAISE, _ADJUST);
312 } else { 302 } else {
313 layer_off(_M_RAISE); 303 layer_off(_M_RAISE);
314 update_tri_layer(_M_LOWER, _M_RAISE, _ADJUST); 304 update_tri_layer(_LOWER, _M_RAISE, _ADJUST);
315 } 305 }
316 return false; 306 return false;
317 break; 307 break;
318 case KC_W_LOWER: 308 case KC_W_LOWER:
319 if (record->event.pressed) { 309 if (record->event.pressed) {
320 layer_on(_W_LOWER); 310 layer_on(_LOWER);
321 update_tri_layer(_W_LOWER, _W_RAISE, _ADJUST); 311 update_tri_layer(_LOWER, _W_RAISE, _ADJUST);
322 } else { 312 } else {
323 layer_off(_W_LOWER); 313 layer_off(_LOWER);
324 update_tri_layer(_W_LOWER, _W_RAISE, _ADJUST); 314 update_tri_layer(_LOWER, _W_RAISE, _ADJUST);
325 } 315 }
326 return false; 316 return false;
327 break; 317 break;
328 case KC_W_RAISE: 318 case KC_W_RAISE:
329 if (record->event.pressed) { 319 if (record->event.pressed) {
330 layer_on(_W_RAISE); 320 layer_on(_W_RAISE);
331 update_tri_layer(_W_LOWER, _W_RAISE, _ADJUST); 321 update_tri_layer(_LOWER, _W_RAISE, _ADJUST);
332 } else { 322 } else {
333 layer_off(_W_RAISE); 323 layer_off(_W_RAISE);
334 update_tri_layer(_W_LOWER, _W_RAISE, _ADJUST); 324 update_tri_layer(_LOWER, _W_RAISE, _ADJUST);
335 } 325 }
336 return false; 326 return false;
337 break; 327 break;