aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjotix <47826561+jotix@users.noreply.github.com>2019-05-26 14:47:54 -0300
committerDrashna Jaelre <drashna@live.com>2019-05-26 10:47:54 -0700
commit2f961265a147dbf568dcc86fad8123b2d02656bc (patch)
tree08910c7e4161341f750fdaa4ef5cda5f56dcdc8c
parent0d12627f0b7fb3ea6438234b775b0c63a656891a (diff)
downloadqmk_firmware-2f961265a147dbf568dcc86fad8123b2d02656bc.tar.gz
qmk_firmware-2f961265a147dbf568dcc86fad8123b2d02656bc.zip
[Keymap] jotix ortho_4x12 layout change (#5979)
* jotix ortho_4x12 layout change * simplifying things * simplifying things
-rw-r--r--layouts/community/ortho_4x12/jotix/config.h1
-rw-r--r--layouts/community/ortho_4x12/jotix/keymap.c166
-rw-r--r--layouts/community/ortho_4x12/jotix/rules.mk1
3 files changed, 12 insertions, 156 deletions
diff --git a/layouts/community/ortho_4x12/jotix/config.h b/layouts/community/ortho_4x12/jotix/config.h
deleted file mode 100644
index cdc202d5f..000000000
--- a/layouts/community/ortho_4x12/jotix/config.h
+++ /dev/null
@@ -1 +0,0 @@
1#define UNICODE_SELECTED_MODES UC_LNX
diff --git a/layouts/community/ortho_4x12/jotix/keymap.c b/layouts/community/ortho_4x12/jotix/keymap.c
index 16120e7d8..cf8c9e9d5 100644
--- a/layouts/community/ortho_4x12/jotix/keymap.c
+++ b/layouts/community/ortho_4x12/jotix/keymap.c
@@ -2,121 +2,22 @@
2 2
3extern keymap_config_t keymap_config; 3extern keymap_config_t keymap_config;
4 4
5// Each layer gets a name for readability, which is then used in the keymap matrix below.
6// The underscores don't mean anything - you can have a layer called STUFF or any other name.
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.
9
10enum layers { 5enum layers {
11 _QWERTY, 6 _QWERTY,
12 _LOWER, 7 _LOWER,
13 _RAISE, 8 _RAISE,
14 _UNICODE,
15 _ADJUST, 9 _ADJUST,
16}; 10};
17 11
18#define LOWER MO(_LOWER) 12#define LOWER MO(_LOWER)
19#define RAISE MO(_RAISE) 13#define RAISE MO(_RAISE)
20#define UNICODE MO(_UNICODE)
21
22enum unicode_names {
23 AACUTE,
24 AACUTE_M,
25 EACUTE,
26 EACUTE_M,
27 IACUTE,
28 IACUTE_M,
29 OACUTE,
30 OACUTE_M,
31 UACUTE,
32 UACUTE_M,
33 UDIER,
34 UDIER_M,
35 NTILDE,
36 NTILDE_M,
37 POUN,
38 COPY,
39 ORDF,
40 ORDM,
41 QUAD,
42 CUBE,
43 DEGR,
44 QUAR,
45 HALF,
46 NOT,
47 LDQU,
48 RDQU,
49 QUES,
50 EXCL,
51 ARRL,
52 ARRU,
53 ARRR,
54 ARRD,
55 EURO,
56 SMIL,
57 NEUT,
58 SMIH,
59 ANGR,
60 WORR,
61 DIZY,
62 TONG,
63 DISS,
64 SCRE,
65};
66 14
67const uint32_t PROGMEM unicode_map[] = { 15#define FN_LAYER LAYOUT_ortho_4x12 (\
68 [AACUTE] = 0xe1, // á 16 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL,\
69 [AACUTE_M] = 0xc1, // Á 17 KC_CAPS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,\
70 [EACUTE] = 0xe9, // é 18 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TILD, _______, _______, _______, _______,\
71 [EACUTE_M] = 0xc9, // É 19 _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END\
72 [IACUTE] = 0xed, // í 20),
73 [IACUTE_M] = 0xcd, // Í
74 [OACUTE] = 0xf3, // ó
75 [OACUTE_M] = 0xd3, // Ó
76 [UACUTE] = 0xfa, // ú
77 [UACUTE_M] = 0xda, // Ú
78 [UDIER] = 0xfc, // ü
79 [UDIER_M] = 0xdc, // Ü
80 [NTILDE] = 0xf1, // ñ
81 [NTILDE_M] = 0xd1, // Ñ
82 [POUN] = 0xa3, // £
83 [COPY] = 0xa9, // ©
84 [ORDF] = 0xaa, // ª
85 [ORDM] = 0xba, // º
86 [QUAD] = 0xb2, // ²
87 [CUBE] = 0xb3, // ³
88 [DEGR] = 0xb0, // °
89 [QUAR] = 0xbc, // ¼
90 [HALF] = 0xbd, // ½
91 [NOT] = 0xac, // ¬
92 [LDQU] = 0xab, // «
93 [RDQU] = 0xbb, // »
94 [QUES] = 0xbf, // ¿
95 [EXCL] = 0xa1, // ¡
96 [ARRL] = 0x2190, // ←
97 [ARRU] = 0x2191, // ↑
98 [ARRR] = 0x2192, // →
99 [ARRD] = 0x2193, // ↓
100 [EURO] = 0x20ac, // €
101 [SMIL] = 0x1f603, // 😃
102 [NEUT] = 0x1f610, // 😐
103 [SMIH] = 0x1f608, // 😈
104 [ANGR] = 0x1f620, // 😠
105 [WORR] = 0x1f61f, // 😟
106 [DIZY] = 0x1f635, // 😵
107 [TONG] = 0x1f61d, // 😝
108 [DISS] = 0x1f61e, // 😝
109 [SCRE] = 0x1f631, // 😱
110};
111
112#define A_UNIC XP(AACUTE, AACUTE_M)
113#define E_UNIC XP(EACUTE, EACUTE_M)
114#define I_UNIC XP(IACUTE, IACUTE_M)
115#define O_UNIC XP(OACUTE, OACUTE_M)
116#define U_UNIC XP(UACUTE, UACUTE_M)
117#define Y_UNIC XP(UDIER, UDIER_M )
118#define N_UNIC XP(NTILDE, NTILDE_M)
119#define ORD_UN XP(ORDF, ORDM)
120 21
121const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 22const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
122 23
@@ -124,65 +25,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
124 * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ 25 * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
125 * | esc | Q | W | E | R | T | Y | U | I | O | P | bksp | 26 * | esc | Q | W | E | R | T | Y | U | I | O | P | bksp |
126 * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ 27 * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
127 * | tab | A | S | D | F | G | H | J | K | L | ; | del | 28 * | tab | A | S | D | F | G | H | J | K | L | ; | ' |
128 * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ 29 * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
129 * | lshift | Z | X | C | V | B | N | M | , | . | / | enter | 30 * | lshift | Z | X | C | V | B | N | M | , | . | / | enter |
130 * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ 31 * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
131 * | lctrl | lalt | lower | unic | lgui | space | space | raise | left | down | up | right | 32 * | lctrl | lgui | lalt | ralt | lower | space | space | raise | left | down | up | right |
132 * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ 33 * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
133 */ 34 */
134[_QWERTY] = LAYOUT_ortho_4x12 ( 35[_QWERTY] = LAYOUT_ortho_4x12 (
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, 36 KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
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, 37 KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
137 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, 38 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT,
138 KC_LCTL, KC_LALT, LOWER, UNICODE, KC_LGUI, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT 39 KC_LCTL, KC_LGUI, KC_LALT, KC_RALT, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
139), 40),
140 41
141/* Lower 42[_LOWER] = FN_LAYER
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
157),
158 43
159/* Raise 44[_RAISE] = FN_LAYER
160 * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
161 * | | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | |
162 * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
163 * | caps | | | | | | \ | - | = | [ | ] | |
164 * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
165 * | | | | | | | ` | | | | | |
166 * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
167 * | | | | | | | | | home | pgdn | pgup | end |
168 * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
169 */
170[_RAISE] = LAYOUT_ortho_4x12 (
171 _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______,
172 KC_CAPS, _______, _______, _______, _______, _______, KC_BSLS, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, _______,
173 _______, _______, _______, _______, _______, _______, KC_GRV, KC_QUOT, _______, _______, _______, _______,
174 _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
175),
176
177/*
178 * unicode
179 */
180[_UNICODE] = LAYOUT_ortho_4x12 (
181 _______, X(EXCL), X(WORR), E_UNIC, X(EURO), X(TONG), Y_UNIC, U_UNIC, I_UNIC, O_UNIC, X(POUN), _______,
182 _______, A_UNIC, X(SMIL), X(DISS), X(SCRE), X(DEGR), X(SMIH), X(NOT), X(QUAR), X(HALF), ORD_UN, _______,
183 _______, X(DIZY), X(ANGR), X(COPY), X(QUAD), X(CUBE), N_UNIC, X(NEUT), X(LDQU), X(RDQU), X(QUES), _______,
184 _______, _______, _______, _______, _______, _______, _______, _______, X(ARRU), X(ARRL), X(ARRD), X(ARRR)
185),
186 45
187/* 46/*
188 * Adjust 47 * Adjust
@@ -201,4 +60,3 @@ uint32_t layer_state_set_user(uint32_t state) {
201 60
202void matrix_init_user(void) { 61void matrix_init_user(void) {
203} 62}
204
diff --git a/layouts/community/ortho_4x12/jotix/rules.mk b/layouts/community/ortho_4x12/jotix/rules.mk
deleted file mode 100644
index 502b2def7..000000000
--- a/layouts/community/ortho_4x12/jotix/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
1UNICODEMAP_ENABLE = yes