diff options
author | jotix <47826561+jotix@users.noreply.github.com> | 2019-05-19 13:49:23 -0300 |
---|---|---|
committer | Drashna Jaelre <drashna@live.com> | 2019-05-19 09:49:23 -0700 |
commit | 11c7cd47aee697ac73bf7ec5704086e2a15d7dca (patch) | |
tree | 0054bd3d47d2c3786656af130a22bc32ba84f059 | |
parent | e0ecc53f4e0852796e16b170851fa396ab9ae854 (diff) | |
download | qmk_firmware-11c7cd47aee697ac73bf7ec5704086e2a15d7dca.tar.gz qmk_firmware-11c7cd47aee697ac73bf7ec5704086e2a15d7dca.zip |
[Keymap] jotix ortho_4x12_layout tweakings (#5904)
* jotix ortho_4x12_layout tweakings
* jotix ortho_4x12_layout tweakings
-rw-r--r-- | layouts/community/ortho_4x12/jotix/keymap.c | 71 |
1 files changed, 46 insertions, 25 deletions
diff --git a/layouts/community/ortho_4x12/jotix/keymap.c b/layouts/community/ortho_4x12/jotix/keymap.c index cd5413da7..faaa0d0ee 100644 --- a/layouts/community/ortho_4x12/jotix/keymap.c +++ b/layouts/community/ortho_4x12/jotix/keymap.c | |||
@@ -7,12 +7,16 @@ extern keymap_config_t keymap_config; | |||
7 | // Layer names don't all need to be of the same length, obviously, and you can also skip them | 7 | // Layer names don't all need to be of the same length, obviously, and you can also skip them |
8 | // entirely and just use numbers. | 8 | // entirely and just use numbers. |
9 | 9 | ||
10 | #define _QWERTY 0 | 10 | enum layers { |
11 | #define _FN 1 | 11 | _QWERTY, |
12 | #define _UNICODE 2 | 12 | _LOWER, |
13 | #define _ADJUST 3 | 13 | _RAISE, |
14 | _UNICODE, | ||
15 | _ADJUST, | ||
16 | }; | ||
14 | 17 | ||
15 | #define FN MO(_FN) | 18 | #define LOWER MO(_LOWER) |
19 | #define RAISE MO(_RAISE) | ||
16 | #define UNICODE MO(_UNICODE) | 20 | #define UNICODE MO(_UNICODE) |
17 | 21 | ||
18 | enum unicode_names { | 22 | enum unicode_names { |
@@ -112,8 +116,7 @@ const uint32_t PROGMEM unicode_map[] = { | |||
112 | #define U_UNIC XP(UACUTE, UACUTE_M) | 116 | #define U_UNIC XP(UACUTE, UACUTE_M) |
113 | #define Y_UNIC XP(UDIER, UDIER_M ) | 117 | #define Y_UNIC XP(UDIER, UDIER_M ) |
114 | #define N_UNIC XP(NTILDE, NTILDE_M) | 118 | #define N_UNIC XP(NTILDE, NTILDE_M) |
115 | 119 | #define ORD_UN XP(ORDF, ORDM) | |
116 | #define TAB_UNI LT(_UNICODE, KC_TAB) | ||
117 | 120 | ||
118 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 121 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
119 | 122 | ||
@@ -121,36 +124,54 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
121 | * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ | 124 | * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ |
122 | * | esc | Q | W | E | R | T | Y | U | I | O | P | bksp | | 125 | * | esc | Q | W | E | R | T | Y | U | I | O | P | bksp | |
123 | * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ | 126 | * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ |
124 | * |tab/unic| A | S | D | F | G | H | J | K | L | ; | ' | | 127 | * | tab | A | S | D | F | G | H | J | K | L | ; | del | |
125 | * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ | 128 | * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ |
126 | * | lshift | Z | X | C | V | B | N | M | , | . | / | enter | | 129 | * | lshift | Z | X | C | V | B | N | M | , | . | up | enter | |
127 | * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ | 130 | * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ |
128 | * | lctrl | lalt | caps | del | lgui | space | space | fn | left | down | up | right | | 131 | * | lctrl | lalt | lower | unic | lgui | space | space | raise | / | left | down | right | |
129 | * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ | 132 | * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ |
130 | */ | 133 | */ |
131 | [_QWERTY] = LAYOUT_ortho_4x12 ( | 134 | [_QWERTY] = LAYOUT_ortho_4x12 ( |
132 | KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, | 135 | KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, |
133 | TAB_UNI, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, | 136 | KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_DEL, |
134 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, | 137 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_ENT, |
135 | KC_LCTL, KC_LALT, KC_CAPS, KC_DEL, KC_LGUI, KC_SPC, KC_SPC, FN, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT | 138 | KC_LCTL, KC_LALT, LOWER, UNICODE, KC_LGUI, KC_SPC, KC_SPC, RAISE, KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT |
139 | ), | ||
140 | |||
141 | /* Lower | ||
142 | * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ | ||
143 | * | | F1 | F2 | F3 | F4 | | | 7 | 8 | 9 | - | | | ||
144 | * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ | ||
145 | * | | F5 | F6 | F7 | F8 | | | 4 | 5 | 6 | + | | | ||
146 | * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ | ||
147 | * | | F9 | F10 | F11 | F12 | | nlck | 1 | 2 | 3 | / | pent | | ||
148 | * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ | ||
149 | * | | | | | | | | | 0 | . | * | ; | | ||
150 | * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ | ||
151 | */ | ||
152 | [_LOWER] = LAYOUT_ortho_4x12 ( | ||
153 | _______, KC_F1, KC_F2, KC_F3, KC_F4, _______, _______, KC_P7, KC_P8, KC_P9, KC_PMNS, _______, | ||
154 | _______, KC_F5, KC_F6, KC_F7, KC_F8, _______, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______, | ||
155 | _______, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_NLCK, KC_P1, KC_P2, KC_P3, KC_PSLS, _______, | ||
156 | _______, _______, _______, _______, _______, _______, _______, _______, KC_P0, KC_PDOT, KC_PAST, KC_SCLN | ||
136 | ), | 157 | ), |
137 | 158 | ||
138 | /* fn | 159 | /* Raise |
139 | * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ | 160 | * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ |
140 | * | | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | | | 161 | * | | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | | |
141 | * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ | 162 | * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ |
142 | * | | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ | | 163 | * | caps | | | | | | \ | - | = | [ | ] | | |
143 | * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ | 164 | * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ |
144 | * | | F7 | F8 | F9 | F10 | F11 | F12 | ` | | | | | | 165 | * | | | | | | | ` | | | | pgup | | |
145 | * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ | 166 | * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ |
146 | * | | | | | | | | | home | pgdn | pgun | end | | 167 | * | | | | | | | | | | home | pgdn | end | |
147 | * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ | 168 | * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ |
148 | */ | 169 | */ |
149 | [_FN] = LAYOUT_ortho_4x12 ( | 170 | [_RAISE] = LAYOUT_ortho_4x12 ( |
150 | _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, | 171 | _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, |
151 | _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, | 172 | KC_CAPS, _______, _______, _______, _______, _______, KC_BSLS, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, _______, |
152 | _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_GRV, _______, _______, _______, _______, | 173 | _______, _______, _______, _______, _______, _______, KC_GRV, KC_QUOT, _______, _______, KC_PGUP, _______, |
153 | _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END | 174 | _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END |
154 | ), | 175 | ), |
155 | 176 | ||
156 | /* | 177 | /* |
@@ -158,9 +179,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
158 | */ | 179 | */ |
159 | [_UNICODE] = LAYOUT_ortho_4x12 ( | 180 | [_UNICODE] = LAYOUT_ortho_4x12 ( |
160 | _______, X(EXCL), X(WORR), E_UNIC, X(EURO), X(TONG), Y_UNIC, U_UNIC, I_UNIC, O_UNIC, X(POUN), _______, | 181 | _______, X(EXCL), X(WORR), E_UNIC, X(EURO), X(TONG), Y_UNIC, U_UNIC, I_UNIC, O_UNIC, X(POUN), _______, |
161 | _______, A_UNIC, X(SMIL), X(DISS), X(SCRE), X(DEGR), X(SMIH), X(NOT), X(QUAR), X(HALF), X(ORDF), X(ORDM), | 182 | _______, A_UNIC, X(SMIL), X(DISS), X(SCRE), X(DEGR), X(SMIH), X(NOT), X(QUAR), X(HALF), ORD_UN, _______, |
162 | _______, X(DIZY), X(ANGR), X(COPY), X(QUAD), X(CUBE), N_UNIC, X(NEUT), X(LDQU), X(RDQU), X(QUES), _______, | 183 | _______, X(DIZY), X(ANGR), X(COPY), X(QUAD), X(CUBE), N_UNIC, X(NEUT), X(LDQU), X(RDQU), X(ARRU), _______, |
163 | _______, _______, _______, _______, _______, _______, _______, _______, X(ARRL), X(ARRD), X(ARRU), X(ARRR) | 184 | _______, _______, _______, _______, _______, _______, _______, _______, X(QUES), X(ARRL), X(ARRD), X(ARRR) |
164 | ), | 185 | ), |
165 | 186 | ||
166 | /* | 187 | /* |
@@ -175,7 +196,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
175 | }; | 196 | }; |
176 | 197 | ||
177 | uint32_t layer_state_set_user(uint32_t state) { | 198 | uint32_t layer_state_set_user(uint32_t state) { |
178 | return update_tri_layer_state(state, _FN, _UNICODE, _ADJUST); | 199 | return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); |
179 | } | 200 | } |
180 | 201 | ||
181 | void matrix_init_user(void) { | 202 | void matrix_init_user(void) { |