aboutsummaryrefslogtreecommitdiff
path: root/keyboards/orthocode
diff options
context:
space:
mode:
authorJordan Blackbourn <blackbournj@gmail.com>2021-12-27 16:44:01 +1300
committerGitHub <noreply@github.com>2021-12-27 14:44:01 +1100
commit4d1ed37bdcb3641e35dc2324592a1f7fa0509bd2 (patch)
treeba82e59a4393976b9a617be68cf120fe57d4c54a /keyboards/orthocode
parente91070401d0eda5e25210e9f4155fa70d0d61912 (diff)
downloadqmk_firmware-4d1ed37bdcb3641e35dc2324592a1f7fa0509bd2.tar.gz
qmk_firmware-4d1ed37bdcb3641e35dc2324592a1f7fa0509bd2.zip
Orthocode update default keymap, and fix encoder function for keymaps built in configurator (#15161)
* Updated default keymap to match one shipping with the boards * Fix encoder function so it works for users of the online configurator * Updated Info.json to match default keymap * Changes as per review
Diffstat (limited to 'keyboards/orthocode')
-rw-r--r--keyboards/orthocode/info.json12
-rw-r--r--keyboards/orthocode/keymaps/default/keymap.c139
-rw-r--r--keyboards/orthocode/orthocode.c15
3 files changed, 36 insertions, 130 deletions
diff --git a/keyboards/orthocode/info.json b/keyboards/orthocode/info.json
index 058ec8557..c193ab44f 100644
--- a/keyboards/orthocode/info.json
+++ b/keyboards/orthocode/info.json
@@ -5,9 +5,9 @@
5 "layouts": { 5 "layouts": {
6 "LAYOUT": { 6 "LAYOUT": {
7 "layout": [ 7 "layout": [
8 {"label":"Rotary", "x":0.5, "y":0}, 8 {"label":"Mute", "x":0.5, "y":0},
9 9
10 {"label":"Game", "x":0.5, "y":1}, 10 {"label":"RGB Tog", "x":0.5, "y":1},
11 {"label":"Esc", "x":1.75, "y":1}, 11 {"label":"Esc", "x":1.75, "y":1},
12 {"label":"1", "x":3, "y":1}, 12 {"label":"1", "x":3, "y":1},
13 {"label":"2", "x":4, "y":1}, 13 {"label":"2", "x":4, "y":1},
@@ -23,7 +23,7 @@
23 {"label":"+", "x":16.5, "y":1}, 23 {"label":"+", "x":16.5, "y":1},
24 {"label":"Home", "x":17.5, "y":1}, 24 {"label":"Home", "x":17.5, "y":1},
25 25
26 {"label":"M1", "x":0.25, "y":2}, 26 {"label":"RGB Mode", "x":0.25, "y":2},
27 {"label":"Tab", "x":1.5, "y":2, "w":1.5}, 27 {"label":"Tab", "x":1.5, "y":2, "w":1.5},
28 {"label":"Q", "x":3, "y":2}, 28 {"label":"Q", "x":3, "y":2},
29 {"label":"W", "x":4, "y":2}, 29 {"label":"W", "x":4, "y":2},
@@ -39,8 +39,8 @@
39 {"label":"Delete", "x":17, "y":2}, 39 {"label":"Delete", "x":17, "y":2},
40 {"label":"End", "x":18, "y":2}, 40 {"label":"End", "x":18, "y":2},
41 41
42 {"label":"M2", "x":0, "y":3}, 42 {"label":"RGB RMode", "x":0, "y":3},
43 {"label":"Ctrl", "x":1.25, "y":3, "w":1.75}, 43 {"label":"Caps", "x":1.25, "y":3, "w":1.75},
44 {"label":"A", "x":3, "y":3}, 44 {"label":"A", "x":3, "y":3},
45 {"label":"S", "x":4, "y":3}, 45 {"label":"S", "x":4, "y":3},
46 {"label":"D", "x":5, "y":3}, 46 {"label":"D", "x":5, "y":3},
@@ -54,7 +54,7 @@
54 {"label":"\"", "x":15.5, "y":3}, 54 {"label":"\"", "x":15.5, "y":3},
55 {"label":"Enter", "x":16.5, "y":3, "w":2.25}, 55 {"label":"Enter", "x":16.5, "y":3, "w":2.25},
56 56
57 {"label":"Layer", "x":0.75, "y":4, "w":2.25}, 57 {"label":"Shift", "x":0.75, "y":4, "w":2.25},
58 {"label":"Z", "x":3, "y":4}, 58 {"label":"Z", "x":3, "y":4},
59 {"label":"X", "x":4, "y":4}, 59 {"label":"X", "x":4, "y":4},
60 {"label":"C", "x":5, "y":4}, 60 {"label":"C", "x":5, "y":4},
diff --git a/keyboards/orthocode/keymaps/default/keymap.c b/keyboards/orthocode/keymaps/default/keymap.c
index ea69d0133..800886a63 100644
--- a/keyboards/orthocode/keymaps/default/keymap.c
+++ b/keyboards/orthocode/keymaps/default/keymap.c
@@ -17,43 +17,36 @@
17 17
18enum custom_keycodes { 18enum custom_keycodes {
19 QWERTY = SAFE_RANGE, 19 QWERTY = SAFE_RANGE,
20 SHIFTSPACE,
21 ILIKEFROG
22}; 20};
23 21
24#define KC_SHSP SHIFTSPACE
25#define KC_FROG ILIKEFROG
26
27
28
29const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 22const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
30 [0] = LAYOUT( 23 [0] = LAYOUT(
31 /* Rotary */ 24 /* Rotary */
32 KC__MUTE, 25 KC__MUTE,
33 /* esc 1 2 3 4 5 6 7 8 9 0 - = home */ 26 /* esc 1 2 3 4 5 6 7 8 9 0 - = home */
34 TG(2), KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_HOME, 27 RGB_TOG, KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_HOME,
35 /* tab Q W E R T Y U I O P \ delete end */ 28 /* tab Q W E R T Y U I O P \ delete end */
36 RGB_TOG, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, KC_DEL, KC_END, 29 RGB_MOD, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, KC_DEL, KC_END,
37 /* caps A S D F G H J K L ; ' enter */ 30 /* caps A S D F G H J K L ; ' enter */
38 RGB_MOD, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, 31 RGB_RMOD, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
39 /* shift Z X C V B N M , . / up */ 32 /* shift Z X C V B N M , . / up */
40 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, 33 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP,
41 /* ctrl win alt fn th1 th2 th3 th4 fn alt ctrl left down right */ 34 /* ctrl win alt fn th1 th2 th3 th4 fn alt ctrl left down right */
42 KC_LCTL, KC_LGUI, KC_LALT, MO(1), KC_RSFT, KC_ENT, KC_BSPC, KC_SHSP, MO(1), KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT 35 KC_LCTL, KC_LGUI, KC_LALT, MO(1), KC_RSFT, KC_ENT, KC_BSPC, KC_SPC, MO(1), KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
43 ), 36 ),
44 [1] = LAYOUT( 37 [1] = LAYOUT(
45 /* Rotary */ 38 /* Rotary */
46 KC_TRNS, 39 TG(2),
47 /* esc 1 2 3 4 5 6 7 8 9 0 - = home */ 40 /* esc 1 2 3 4 5 6 7 8 9 0 - = home */
48 TG(3), KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, 41 KC_TRNS, KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS,
49 /* tab Q W E R T Y U I O P \ delete end */ 42 /* tab Q W E R T Y U I O P \ delete end */
50 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, LSFT(KC_LBRC), LSFT(KC_RBRC), KC_TRNS, KC_TRNS, KC_PAUS, KC_TRNS, 43 RGB_HUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS,KC_TRNS, KC_TRNS, LSFT(KC_LBRC), LSFT(KC_RBRC), KC_TRNS, KC_TRNS, KC_PAUS, KC_TRNS,
51 /* caps A S D F G H J K L ; ' enter */ 44 /* caps A S D F G H J K L ; ' enter */
52 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_TRNS, KC_TRNS, KC_TRNS, 45 RGB_HUD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_TRNS, KC_TRNS, KC_TRNS,
53 /* shift Z X C V B N M , . / up */ 46 /* shift Z X C V B N M , . / up */
54 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_EQL, LSFT(KC_EQL), LSFT(KC_9), LSFT(KC_0), KC_TRNS, KC_VOLU, 47 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, LSFT(KC_EQL), LSFT(KC_9), LSFT(KC_0), KC_TRNS, KC_VOLU,
55 /* ctrl win alt fn th1 th2 th3 th4 fn alt ctrl left down right */ 48 /* ctrl win alt fn th1 th2 th3 th4 fn alt ctrl left down right*/
56 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS 49 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_VOLD, KC_TRNS
57 ), 50 ),
58 [2] = LAYOUT( 51 [2] = LAYOUT(
59 /* Rotary */ 52 /* Rotary */
@@ -69,107 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
69 /* ctrl win alt fn th1 th2 th3 th4 fn alt ctrl left down right */ 62 /* ctrl win alt fn th1 th2 th3 th4 fn alt ctrl left down right */
70 KC_TRNS, KC_NO, KC_TRNS, KC_TRNS, KC_SPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS 63 KC_TRNS, KC_NO, KC_TRNS, KC_TRNS, KC_SPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
71 64
72 ),
73 [3] = LAYOUT(
74 /* Rotary */
75 KC_FROG,
76 /* esc 1 2 3 4 5 6 7 8 9 0 - = home */
77 TG(3), KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG,
78 /* tab Q W E R T Y U I O P \ delete end */
79 KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG,
80 /* caps A S D F G H J K L ; ' enter */
81 KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG,
82 /* shift Z X C V B N M , . / up */
83 KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG,
84 /* ctrl win alt fn th1 th2 th3 th4 fn alt ctrl left down right */
85 KC_FROG, KC_FROG, KC_FROG, MO(1), KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG
86 ) 65 )
87}; 66};
88 67
89 68
90
91
92bool process_record_user(uint16_t keycode, keyrecord_t *record) {
93 static bool shiftspace_mods = false;
94 static int frogchar = 0;
95 switch (keycode) {
96 case SHIFTSPACE:
97 if (record->event.pressed) {
98 if(get_mods() & MOD_BIT(KC_RSFT)) {
99 register_code(KC_MINS);
100 shiftspace_mods = true;
101 }
102 else {
103 register_code(KC_SPC);
104 }
105 } else {
106 if (shiftspace_mods) {
107 unregister_code(KC_MINS);
108 shiftspace_mods = false;
109 } else {
110 unregister_code(KC_SPC);
111 }
112 }
113 return false;
114 break;
115 case ILIKEFROG:
116 if (record->event.pressed) {
117 switch (frogchar)
118 {
119 case 0:
120 SEND_STRING("I");
121 break;
122 case 1:
123 SEND_STRING(" ");
124 break;
125 case 2:
126 SEND_STRING("L");
127 break;
128 case 3:
129 SEND_STRING("i");
130 break;
131 case 4:
132 SEND_STRING("k");
133 break;
134 case 5:
135 SEND_STRING("e");
136 break;
137 case 6:
138 SEND_STRING(" ");
139 break;
140 case 7:
141 SEND_STRING("F");
142 break;
143 case 8:
144 SEND_STRING("r");
145 break;
146 case 9:
147 SEND_STRING("o");
148 break;
149 case 10:
150 SEND_STRING("g");
151 break;
152 case 11:
153 SEND_STRING(" ");
154 break;
155 }
156 frogchar = (frogchar + 1) % 12;
157 }
158 break;
159 }
160 return true;
161
162}
163
164
165#ifdef ENCODER_ENABLE
166bool encoder_update_user(uint8_t index, bool clockwise) {
167 // Volume control
168 if (clockwise) {
169 tap_code(KC_VOLD);
170 } else {
171 tap_code(KC_VOLU);
172 }
173 return true;
174}
175#endif
diff --git a/keyboards/orthocode/orthocode.c b/keyboards/orthocode/orthocode.c
index 8de13e2ab..23596d3e5 100644
--- a/keyboards/orthocode/orthocode.c
+++ b/keyboards/orthocode/orthocode.c
@@ -13,4 +13,17 @@
13 * You should have received a copy of the GNU General Public License 13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>. 14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */ 15 */
16#include "orthocode.h" \ No newline at end of file 16#include "orthocode.h"
17
18#ifdef ENCODER_ENABLE
19bool encoder_update_kb(uint8_t index, bool clockwise) {
20 if (!encoder_update_user(index, clockwise)) { return false; }
21 // Volume control
22 if (clockwise) {
23 tap_code(KC_VOLU);
24 } else {
25 tap_code(KC_VOLD);
26 }
27 return true;
28}
29#endif