diff options
author | James Young <18669334+noroadsleft@users.noreply.github.com> | 2021-09-19 18:52:54 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-19 11:52:54 -0700 |
commit | 53c2f677481f8531adc755e7f2c4163c6eb006b8 (patch) | |
tree | 483de63fbd66f686761fdb51758190f2a97943ec | |
parent | 4e7801d4fbcdf571bc7a73d5f5234321480affb0 (diff) | |
download | qmk_firmware-53c2f677481f8531adc755e7f2c4163c6eb006b8.tar.gz qmk_firmware-53c2f677481f8531adc755e7f2c4163c6eb006b8.zip |
cKeys theDora Refactor (#14495)
-rw-r--r-- | keyboards/ckeys/thedora/info.json | 34 | ||||
-rwxr-xr-x | keyboards/ckeys/thedora/keymaps/default/config.h | 3 | ||||
-rwxr-xr-x | keyboards/ckeys/thedora/keymaps/default/keymap.c | 278 | ||||
-rwxr-xr-x | keyboards/ckeys/thedora/keymaps/default/readme.md | 1 | ||||
-rwxr-xr-x | keyboards/ckeys/thedora/readme.md | 6 | ||||
-rwxr-xr-x | keyboards/ckeys/thedora/rules.mk | 23 | ||||
-rwxr-xr-x | keyboards/ckeys/thedora/thedora.c | 30 | ||||
-rwxr-xr-x | keyboards/ckeys/thedora/thedora.h | 38 |
8 files changed, 237 insertions, 176 deletions
diff --git a/keyboards/ckeys/thedora/info.json b/keyboards/ckeys/thedora/info.json index 4549ff61d..631da8f26 100644 --- a/keyboards/ckeys/thedora/info.json +++ b/keyboards/ckeys/thedora/info.json | |||
@@ -3,32 +3,32 @@ | |||
3 | "url": "https://ckeys.org/slides/exboard", | 3 | "url": "https://ckeys.org/slides/exboard", |
4 | "maintainer": "brandenbyers", | 4 | "maintainer": "brandenbyers", |
5 | "layouts": { | 5 | "layouts": { |
6 | "LAYOUT_ortho_4x5": { | 6 | "LAYOUT": { |
7 | "layout": [ | 7 | "layout": [ |
8 | {"label":"k00", "x":1, "y":0}, | 8 | {"label":"k00", "x":1, "y":0}, |
9 | {"label":"k01", "x":2, "y":0}, | 9 | {"label":"k01", "x":2, "y":0}, |
10 | {"label":"k02", "x":3, "y":0}, | 10 | {"label":"k02", "x":3, "y":0}, |
11 | {"label":"k03", "x":4, "y":0}, | 11 | {"label":"k03", "x":4, "y":0}, |
12 | {"label":"k04", "x":5, "y":0}, | 12 | {"label":"k04", "x":5, "y":0}, |
13 | {"label":"k05 (Rotary Push)", "x":0, "y":3}, | ||
14 | 13 | ||
15 | {"label":"k06", "x":1, "y":1}, | 14 | {"label":"k10", "x":1, "y":1}, |
16 | {"label":"k07", "x":2, "y":1}, | 15 | {"label":"k11", "x":2, "y":1}, |
17 | {"label":"k08", "x":3, "y":1}, | 16 | {"label":"k12", "x":3, "y":1}, |
18 | {"label":"k09", "x":4, "y":1}, | 17 | {"label":"k13", "x":4, "y":1}, |
19 | {"label":"k10", "x":5, "y":1}, | 18 | {"label":"k14", "x":5, "y":1}, |
20 | 19 | ||
21 | {"label":"k11", "x":1, "y":2}, | 20 | {"label":"k20", "x":1, "y":2}, |
22 | {"label":"k12", "x":2, "y":2}, | 21 | {"label":"k21", "x":2, "y":2}, |
23 | {"label":"k13", "x":3, "y":2}, | 22 | {"label":"k22", "x":3, "y":2}, |
24 | {"label":"k14", "x":4, "y":2}, | 23 | {"label":"k23", "x":4, "y":2}, |
25 | {"label":"k15", "x":5, "y":2}, | 24 | {"label":"k24", "x":5, "y":2}, |
26 | 25 | ||
27 | {"label":"k16", "x":1, "y":3}, | 26 | {"label":"k05 (Rotary Push)", "x":0, "y":3}, |
28 | {"label":"k17", "x":2, "y":3}, | 27 | {"label":"k30", "x":1, "y":3}, |
29 | {"label":"k18", "x":3, "y":3}, | 28 | {"label":"k31", "x":2, "y":3}, |
30 | {"label":"k19", "x":4, "y":3}, | 29 | {"label":"k32", "x":3, "y":3}, |
31 | {"label":"k20", "x":5, "y":3} | 30 | {"label":"k33", "x":4, "y":3}, |
31 | {"label":"k34", "x":5, "y":3} | ||
32 | ] | 32 | ] |
33 | } | 33 | } |
34 | } | 34 | } |
diff --git a/keyboards/ckeys/thedora/keymaps/default/config.h b/keyboards/ckeys/thedora/keymaps/default/config.h deleted file mode 100755 index 507a9ccdc..000000000 --- a/keyboards/ckeys/thedora/keymaps/default/config.h +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | #pragma once | ||
2 | |||
3 | // Add overrides here | ||
diff --git a/keyboards/ckeys/thedora/keymaps/default/keymap.c b/keyboards/ckeys/thedora/keymaps/default/keymap.c index 783475eb0..e2ce9b0d7 100755 --- a/keyboards/ckeys/thedora/keymaps/default/keymap.c +++ b/keyboards/ckeys/thedora/keymaps/default/keymap.c | |||
@@ -1,156 +1,172 @@ | |||
1 | /* Copyright 2019 Branden Byers (@brandenbyers) | ||
2 | * | ||
3 | * This program is free software: you can redistribute it and/or modify | ||
4 | * it under the terms of the GNU General Public License as published by | ||
5 | * the Free Software Foundation, either version 2 of the License, or | ||
6 | * (at your option) any later version. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
11 | * GNU General Public License for more details. | ||
12 | * | ||
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/>. | ||
15 | */ | ||
16 | |||
1 | #include QMK_KEYBOARD_H | 17 | #include QMK_KEYBOARD_H |
2 | 18 | ||
3 | enum layers { | 19 | enum layers { |
4 | _BASE, // base layer | 20 | _BASE, // base layer |
5 | _MUSIC, // music mode | 21 | _MUSIC, // music mode |
6 | _MIDI, // midi mode | 22 | _MIDI, // midi mode |
7 | _MOUSE, // mouse keys | 23 | _MOUSE, // mouse keys |
8 | _ADMIN // admin duties | 24 | _ADMIN // admin duties |
9 | }; | 25 | }; |
10 | 26 | ||
11 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 27 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
12 | 28 | ||
13 | // ┌─────────┬─────────┬─────────┬─────────┬─────────┐ | 29 | // ┌─────────┬─────────┬─────────┬─────────┬─────────┐ |
14 | // │ │ │ │ │ │ | 30 | // │ │ │ │ │ │ |
15 | // │ 7 │ 8 │ 9 │ / │ ADMIN │ | 31 | // │ 7 │ 8 │ 9 │ / │ ADMIN │ |
16 | // ROTORY │ │ │ │ │ │ | 32 | // ROTARY │ │ │ │ │ │ |
17 | // RIGHT: ├─────────┼─────────┼─────────┼─────────┼─────────┤ | 33 | // RIGHT: ├─────────┼─────────┼─────────┼─────────┼─────────┤ |
18 | // VOL UP │ │ │ │ │ │ | 34 | // PAGE DOWN│ │ │ │ │ │ |
19 | // │ 4 │ 5 │ 6 │ * │ MOUSE │ | 35 | // │ 4 │ 5 │ 6 │ * │ MOUSE │ |
20 | // ROTORY │ │ │ │ │ │ | 36 | // ROTARY │ │ │ │ │ │ |
21 | // LEFT: ├─────────┼─────────┼─────────┼─────────┼─────────┤ | 37 | // LEFT: ├─────────┼─────────┼─────────┼─────────┼─────────┤ |
22 | // VOL DOWN │ │ │ │ │ │ | 38 | // PAGE UP │ │ │ │ │ │ |
23 | // │ 1 │ 2 │ 3 │ - │ MIDI │ | 39 | // │ 1 │ 2 │ 3 │ - │ MIDI │ |
24 | // │ │ │ │ │ │ | 40 | // │ │ │ │ │ │ |
25 | // ┌─────────┼─────────┼─────────┼─────────┼─────────┼─────────┤ | 41 | // ┌─────────┼─────────┼─────────┼─────────┼─────────┼─────────┤ |
26 | // │ TOGGLE │ │ │ │ │ │ | 42 | // │ TOGGLE │ │ │ │ │ │ |
27 | // │ MUSIC │ 0 │ . │ = │ + │ MUSIC │ | 43 | // │ MUSIC │ 0 │ . │ = │ + │ MUSIC │ |
28 | // │ │ │ │ │ │ │ | 44 | // │ │ │ │ │ │ │ |
29 | // └─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ | 45 | // └─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ |
30 | 46 | ||
31 | [_BASE] = LAYOUT( | 47 | [_BASE] = LAYOUT( |
32 | KC_KP_7, KC_KP_8, KC_KP_9, KC_PSLS, MO(_ADMIN), MU_TOG, | 48 | KC_P7, KC_P8 , KC_P9 , KC_PSLS, MO(_ADMIN), |
33 | KC_KP_4, KC_KP_5, KC_KP_6, KC_PAST, TG(_MOUSE), | 49 | KC_P4, KC_P5 , KC_P6 , KC_PAST, TG(_MOUSE), |
34 | KC_KP_1, KC_KP_2, KC_KP_3, KC_PMNS, TG(_MIDI), | 50 | KC_P1, KC_P2 , KC_P3 , KC_PMNS, TG(_MIDI), |
35 | KC_KP_0, KC_KP_DOT, KC_KP_EQUAL, KC_PPLS, MO(_MUSIC) | 51 | MU_TOG, KC_P0, KC_PDOT, KC_PEQL, KC_PPLS, MO(_MUSIC) |
36 | ), | 52 | ), |
37 | 53 | ||
38 | // MUSIC LAYER | 54 | // MUSIC LAYER |
39 | // ┌─────────┬─────────┬─────────┬─────────┬─────────┐ | 55 | // ┌─────────┬─────────┬─────────┬─────────┬─────────┐ |
40 | // │ │ │ │ │ │ | 56 | // │ │ │ │ │ │ |
41 | // │ │ │ │ │ │ | 57 | // │ │ │ │ │ │ |
42 | // ROTORY │ │ │ │ │ │ | 58 | // ROTARY │ │ │ │ │ │ |
43 | // RIGHT: ├─────────┼─────────┼─────────┼─────────┼─────────┤ | 59 | // RIGHT: ├─────────┼─────────┼─────────┼─────────┼─────────┤ |
44 | // PAGE UP │ │ │ │ │ │ | 60 | // PAGE DOWN│ │ │ │ │ │ |
45 | // │ │ │ │ │ │ | 61 | // │ │ │ │ │ │ |
46 | // ROTORY │ │ │ │ │ │ | 62 | // ROTARY │ │ │ │ │ │ |
47 | // LEFT: ├─────────┼─────────┼─────────┼─────────┼─────────┤ | 63 | // LEFT: ├─────────┼─────────┼─────────┼─────────┼─────────┤ |
48 | // PAGE DOWN│ │ │ │ │ │ | 64 | // PAGE UP │ │ │ │ │ │ |
49 | // │ │ │ │ MODE │ │ | 65 | // │ │ │ │ MODE │ │ |
50 | // │ │ │ │ │ │ | 66 | // │ │ │ │ │ │ |
51 | //┌─────────┼─────────┼─────────┼─────────┼─────────┼─────────┤ | 67 | // ┌─────────┼─────────┼─────────┼─────────┼─────────┼─────────┤ |
52 | //│ │ │ │ │ │ │ | 68 | // │ │ │ │ │ │ │ |
53 | //│ │ RECORD │ STOP │ │ PLAY │ │ | 69 | // │ │ RECORD │ STOP │ │ PLAY │ │ |
54 | //│ │ │ │ │ │ │ | 70 | // │ │ │ │ │ │ │ |
55 | //└─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ | 71 | // └─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ |
56 | 72 | ||
57 | [_MUSIC] = LAYOUT( | 73 | [_MUSIC] = LAYOUT( |
58 | _______, _______, _______, _______, _______, _______, | 74 | _______, _______, _______, _______, _______, |
59 | _______, _______, _______, _______, _______, | 75 | _______, _______, _______, _______, _______, |
60 | _______, _______, _______, _______, MU_MOD, | 76 | _______, _______, _______, _______, MU_MOD, |
61 | KC_LCTL, KC_LALT, _______, KC_LGUI, _______ | 77 | _______, KC_LCTL, KC_LALT, _______, KC_LGUI, _______ |
62 | ), | 78 | ), |
63 | 79 | ||
64 | // MIDI LAYER | 80 | // MIDI LAYER |
65 | // ┌─────────┬─────────┬─────────┬─────────┬─────────┐ | 81 | // ┌─────────┬─────────┬─────────┬─────────┬─────────┐ |
66 | // │ │ │ │ │ │ | 82 | // │ │ │ │ │ │ |
67 | // │ D♯ │ E │ F │ F♯ │ G │ | 83 | // │ D♯ │ E │ F │ F♯ │ G │ |
68 | // ROTORY │ │ │ │ │ │ | 84 | // ROTARY │ │ │ │ │ │ |
69 | // RIGHT: ├─────────┼─────────┼─────────┼─────────┼─────────┤ | 85 | // RIGHT: ├─────────┼─────────┼─────────┼─────────┼─────────┤ |
70 | // PAGE UP │ │ │ │ │ │ | 86 | // PAGE DOWN│ │ │ │ │ │ |
71 | // │ A♯ │ B │ C │ C♯ │ D │ | 87 | // │ A♯ │ B │ C │ C♯ │ D │ |
72 | // ROTORY │ │ │ │ │ │ | 88 | // ROTARY │ │ │ │ │ │ |
73 | // LEFT: ├─────────┼─────────┼─────────┼─────────┼─────────┤ | 89 | // LEFT: ├─────────┼─────────┼─────────┼─────────┼─────────┤ |
74 | // PAGE DOWN│ │ │ │ │ │ | 90 | // PAGE UP │ │ │ │ │ │ |
75 | // │ F │ F♯ │ G │ G♯ │ A │ | 91 | // │ F │ F♯ │ G │ G♯ │ A │ |
76 | // │ │ │ │ │ │ | 92 | // │ │ │ │ │ │ |
77 | // ┌─────────┼─────────┼─────────┼─────────┼─────────┼─────────┤ | 93 | // ┌─────────┼─────────┼─────────┼─────────┼─────────┼─────────┤ |
78 | // │ │ │ │ │ │ │ | 94 | // │ │ │ │ │ │ │ |
79 | // │ │ C │ C♯ │ D │ D♯ │ E │ | 95 | // │ │ C │ C♯ │ D │ D♯ │ E │ |
80 | // │ │ │ │ │ │ │ | 96 | // │ │ │ │ │ │ │ |
81 | // └─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ | 97 | // └─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ |
82 | 98 | ||
83 | [_MIDI] = LAYOUT( | 99 | [_MIDI] = LAYOUT( |
84 | MI_Ds_3, MI_E_3, MI_F_3, MI_Fs_3, MI_G_3, _______, | 100 | MI_Ds_3, MI_E_3, MI_F_3, MI_Fs_3, MI_G_3, |
85 | MI_As_2, MI_B_2, MI_C_3, MI_Cs_3, MI_D_3, | 101 | MI_As_2, MI_B_2, MI_C_3, MI_Cs_3, MI_D_3, |
86 | MI_F_2, MI_Fs_2, MI_G_2, MI_Gs_2, TG(_MIDI), | 102 | MI_F_2, MI_Fs_2, MI_G_2, MI_Gs_2, TG(_MIDI), |
87 | MI_C_2, MI_Cs_2, MI_D_2, MI_Ds_2, MI_E_2 | 103 | _______, MI_C_2, MI_Cs_2, MI_D_2, MI_Ds_2, MI_E_2 |
88 | ), | 104 | ), |
89 | 105 | ||
90 | // MOUSE LAYER | 106 | // MOUSE LAYER |
91 | // ┌─────────┬─────────┬─────────┬─────────┬─────────┐ | 107 | // ┌─────────┬─────────┬─────────┬─────────┬─────────┐ |
92 | // │ │ │ │ │ │ | 108 | // │ │ │ │ │ │ |
93 | // │ BTN 5 │ │ WHEEL │ │ │ | 109 | // │ BTN 5 │ │ WHEEL │ │ │ |
94 | // ROTORY │ │ │ UP │ │ │ | 110 | // ROTARY │ │ │ UP │ │ │ |
95 | // RIGHT: ├─────────┼─────────┼─────────┼─────────┼─────────┤ | 111 | // RIGHT: ├─────────┼─────────┼─────────┼─────────┼─────────┤ |
96 | // PAGE DOWN│ │ │ │ │ │ | 112 | // PAGE DOWN│ │ │ │ │ │ |
97 | // │ │ LEFT │ MOUSE │ RIGHT │ │ | 113 | // │ │ LEFT │ MOUSE │ RIGHT │ │ |
98 | // ROTORY │ │ CLICK │ UP │ CLICK │ │ | 114 | // ROTARY │ │ CLICK │ UP │ CLICK │ │ |
99 | // LEFT: ├─────────┼─────────┼─────────┼─────────┼─────────┤ | 115 | // LEFT: ├─────────┼─────────┼─────────┼─────────┼─────────┤ |
100 | // PAGE UP │ │ │ │ │ │ | 116 | // PAGE UP │ │ │ │ │ │ |
101 | // │ BTN 4 │ MOUSE │ MOUSE │ MOUSE │ │ | 117 | // │ BTN 4 │ MOUSE │ MOUSE │ MOUSE │ │ |
102 | // │ │ LEFT │ DOWN │ RIGHT │ │ | 118 | // │ │ LEFT │ DOWN │ RIGHT │ │ |
103 | // ┌─────────┼─────────┼─────────┼─────────┼─────────┼─────────┤ | 119 | // ┌─────────┼─────────┼─────────┼─────────┼─────────┼─────────┤ |
104 | // │ │ │ │ │ │ │ | 120 | // │ │ │ │ │ │ │ |
105 | // │ │ BTN 3 │ WHEEL │ WHEEL │ WHEEL │ │ | 121 | // │ │ BTN 3 │ WHEEL │ WHEEL │ WHEEL │ │ |
106 | // │ │ │ LEFT │ DOWN │ RIGHT │ │ | 122 | // │ │ │ LEFT │ DOWN │ RIGHT │ │ |
107 | // └─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ | 123 | // └─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ |
108 | 124 | ||
109 | [_MOUSE] = LAYOUT( | 125 | [_MOUSE] = LAYOUT( |
110 | KC_MS_BTN5, _______, KC_MS_WH_UP, _______, _______, _______, | 126 | KC_BTN5, _______, KC_WH_U, _______, _______, |
111 | _______, KC_MS_BTN1, KC_MS_UP, KC_MS_BTN2, TG(_MOUSE), | 127 | _______, KC_BTN1, KC_MS_U, KC_BTN2, TG(_MOUSE), |
112 | KC_MS_BTN4, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, _______, | 128 | KC_BTN4, KC_MS_L, KC_MS_D, KC_MS_R, _______, |
113 | KC_MS_BTN3, KC_MS_WH_LEFT, KC_MS_WH_DOWN, KC_MS_WH_RIGHT, _______ | 129 | _______, KC_BTN3, KC_WH_L, KC_WH_D, KC_WH_R, _______ |
114 | ), | 130 | ), |
115 | 131 | ||
116 | // ADMIN LAYER | 132 | // ADMIN LAYER |
117 | // ┌─────────┬─────────┬─────────┬─────────┬─────────┐ | 133 | // ┌─────────┬─────────┬─────────┬─────────┬─────────┐ |
118 | // │ │ │ │ │ │ | 134 | // │ │ │ │ │ │ |
119 | // │ RESET │ │ │ │ │ | 135 | // │ RESET │ │ │ │ │ |
120 | // ROTORY │ │ │ │ │ │ | 136 | // ROTARY │ │ │ │ │ │ |
121 | // RIGHT: ├─────────┼─────────┼─────────┼─────────┼─────────┤ | 137 | // RIGHT: ├─────────┼─────────┼─────────┼─────────┼─────────┤ |
122 | // PAGE UP │ │ │ │ │ │ | 138 | // PAGE DOWN│ │ │ │ │ │ |
123 | // │ 4 │ 5 │ 6 │ * │ │ | 139 | // │ 4 │ 5 │ 6 │ * │ │ |
124 | // ROTORY │ │ │ │ │ │ | 140 | // ROTARY │ │ │ │ │ │ |
125 | // LEFT: ├─────────┼─────────┼─────────┼─────────┼─────────┤ | 141 | // LEFT: ├─────────┼─────────┼─────────┼─────────┼─────────┤ |
126 | // PAGE DOWN│ │ │ │ │ │ | 142 | // PAGE UP │ │ │ │ │ │ |
127 | // │ 1 │ 2 │ 3 │ │ │ | 143 | // │ 1 │ 2 │ 3 │ │ │ |
128 | // │ │ │ │ │ │ | 144 | // │ │ │ │ │ │ |
129 | // ┌─────────┼─────────┼─────────┼─────────┼─────────┼─────────┤ | 145 | // ┌─────────┼─────────┼─────────┼─────────┼─────────┼─────────┤ |
130 | // │ │ │ │ │ │ │ | 146 | // │ │ │ │ │ │ │ |
131 | // │ │ 0 │ . │ = │ │ │ | 147 | // │ │ 0 │ . │ = │ │ │ |
132 | // │ │ │ │ │ │ │ | 148 | // │ │ │ │ │ │ │ |
133 | // └─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ | 149 | // └─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ |
134 | 150 | ||
135 | [_ADMIN] = LAYOUT( | 151 | [_ADMIN] = LAYOUT( |
136 | RESET, _______, _______, _______, TG(_ADMIN), _______, | 152 | RESET, _______, _______, _______, TG(_ADMIN), |
137 | _______, _______, _______, _______, _______, | 153 | _______, _______, _______, _______, _______, |
138 | _______, _______, _______, _______, _______, | 154 | _______, _______, _______, _______, _______, |
139 | _______, _______, _______, _______, _______ | 155 | _______, _______, _______, _______, _______, _______ |
140 | ), | 156 | ), |
141 | }; | 157 | }; |
142 | 158 | ||
143 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | 159 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { |
144 | return true; | 160 | return true; |
145 | }; | 161 | }; |
146 | 162 | ||
147 | bool encoder_update_user(uint8_t index, bool clockwise) { | 163 | bool encoder_update_user(uint8_t index, bool clockwise) { |
148 | if (index == 0) { /* First encoder */ | 164 | if (index == 0) { /* First encoder */ |
149 | if (clockwise) { | 165 | if (clockwise) { |
150 | tap_code(KC_PGDN); | 166 | tap_code(KC_PGDN); |
151 | } else { | 167 | } else { |
152 | tap_code(KC_PGUP); | 168 | tap_code(KC_PGUP); |
169 | } | ||
153 | } | 170 | } |
154 | } | ||
155 | return true; | 171 | return true; |
156 | } | 172 | } |
diff --git a/keyboards/ckeys/thedora/keymaps/default/readme.md b/keyboards/ckeys/thedora/keymaps/default/readme.md deleted file mode 100755 index 4594bdfe3..000000000 --- a/keyboards/ckeys/thedora/keymaps/default/readme.md +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | # The default keymap for the cKeys Handwire 101 4x4 keyboard. \ No newline at end of file | ||
diff --git a/keyboards/ckeys/thedora/readme.md b/keyboards/ckeys/thedora/readme.md index 991b5df02..26233de3c 100755 --- a/keyboards/ckeys/thedora/readme.md +++ b/keyboards/ckeys/thedora/readme.md | |||
@@ -4,9 +4,9 @@ | |||
4 | 4 | ||
5 | A 4x5 keyboard with rotary encoder, QWIIC connector, and header pinouts for easy access to all pins on the Proton C. This keyboard was built for QMK exploration big and small. What will you discover next? | 5 | A 4x5 keyboard with rotary encoder, QWIIC connector, and header pinouts for easy access to all pins on the Proton C. This keyboard was built for QMK exploration big and small. What will you discover next? |
6 | 6 | ||
7 | Keyboard Maintainer: [brandenbyers](https://github.com/brandenbyers) | 7 | * Keyboard Maintainer: [brandenbyers](https://github.com/brandenbyers) |
8 | Hardware Supported: theDora | 8 | * Hardware Supported: theDora |
9 | Hardware Availability: [cKeys.org](https://ckeys.org) | 9 | * Hardware Availability: [cKeys.org](https://ckeys.org) |
10 | 10 | ||
11 | Make example for this keyboard (after setting up your build environment): | 11 | Make example for this keyboard (after setting up your build environment): |
12 | 12 | ||
diff --git a/keyboards/ckeys/thedora/rules.mk b/keyboards/ckeys/thedora/rules.mk index 3feda7540..3aabafc95 100755 --- a/keyboards/ckeys/thedora/rules.mk +++ b/keyboards/ckeys/thedora/rules.mk | |||
@@ -6,17 +6,20 @@ BOARD = QMK_PROTON_C | |||
6 | BOOTLOADER = stm32-dfu | 6 | BOOTLOADER = stm32-dfu |
7 | 7 | ||
8 | # Build Options | 8 | # Build Options |
9 | # comment out to disable the options. | 9 | # change yes to no to disable |
10 | # | 10 | # |
11 | BACKLIGHT_ENABLE = no | ||
12 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite | 11 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
13 | MOUSEKEY_ENABLE = yes # Mouse keys | 12 | MOUSEKEY_ENABLE = yes # Mouse keys |
14 | EXTRAKEY_ENABLE = yes # Audio control and System control | 13 | EXTRAKEY_ENABLE = yes # Audio control and System control |
15 | CONSOLE_ENABLE = no # Console for debug | 14 | CONSOLE_ENABLE = no # Console for debug |
16 | COMMAND_ENABLE = no # Commands for debug and configuration | 15 | COMMAND_ENABLE = no # Commands for debug and configuration |
17 | #SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend | 16 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE |
18 | NKRO_ENABLE = yes # USB Nkey Rollover | 17 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend |
19 | AUDIO_ENABLE = yes | 18 | # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work |
19 | NKRO_ENABLE = yes # USB Nkey Rollover | ||
20 | BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality | ||
21 | RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow | ||
22 | AUDIO_ENABLE = yes # Audio output | ||
23 | |||
20 | MIDI_ENABLE = yes # MIDI support | 24 | MIDI_ENABLE = yes # MIDI support |
21 | RGBLIGHT_ENABLE = no | ||
22 | ENCODER_ENABLE = yes | 25 | ENCODER_ENABLE = yes |
diff --git a/keyboards/ckeys/thedora/thedora.c b/keyboards/ckeys/thedora/thedora.c index 68d0a9af5..58953f743 100755 --- a/keyboards/ckeys/thedora/thedora.c +++ b/keyboards/ckeys/thedora/thedora.c | |||
@@ -1 +1,31 @@ | |||
1 | /* Copyright 2019 Branden Byers (@brandenbyers) | ||
2 | * | ||
3 | * This program is free software: you can redistribute it and/or modify | ||
4 | * it under the terms of the GNU General Public License as published by | ||
5 | * the Free Software Foundation, either version 2 of the License, or | ||
6 | * (at your option) any later version. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
11 | * GNU General Public License for more details. | ||
12 | * | ||
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/>. | ||
15 | */ | ||
16 | |||
1 | #include "thedora.h" | 17 | #include "thedora.h" |
18 | |||
19 | bool encoder_update_kb(uint8_t index, bool clockwise) { | ||
20 | if (!encoder_update_user(index, clockwise)) { | ||
21 | return false; | ||
22 | } | ||
23 | if (index == 0) { | ||
24 | if (clockwise) { | ||
25 | tap_code(KC_PGDN); | ||
26 | } else { | ||
27 | tap_code(KC_PGUP); | ||
28 | } | ||
29 | } | ||
30 | return true; | ||
31 | } | ||
diff --git a/keyboards/ckeys/thedora/thedora.h b/keyboards/ckeys/thedora/thedora.h index 2c4443c3a..5e66f6716 100755 --- a/keyboards/ckeys/thedora/thedora.h +++ b/keyboards/ckeys/thedora/thedora.h | |||
@@ -1,21 +1,37 @@ | |||
1 | /* Copyright 2019 Branden Byers (@brandenbyers) | ||
2 | * | ||
3 | * This program is free software: you can redistribute it and/or modify | ||
4 | * it under the terms of the GNU General Public License as published by | ||
5 | * the Free Software Foundation, either version 2 of the License, or | ||
6 | * (at your option) any later version. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
11 | * GNU General Public License for more details. | ||
12 | * | ||
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/>. | ||
15 | */ | ||
16 | |||
1 | #pragma once | 17 | #pragma once |
2 | 18 | ||
3 | #include "quantum.h" | 19 | #include "quantum.h" |
4 | 20 | ||
21 | #define XXX KC_NO | ||
22 | |||
5 | // This a shortcut to help you visually see your layout. | 23 | // This a shortcut to help you visually see your layout. |
6 | // The following is an example using the Planck MIT layout | 24 | // The first section contains all of the arguments |
7 | // The first section contains all of the arguements | ||
8 | // The second converts the arguments into a two-dimensional array | 25 | // The second converts the arguments into a two-dimensional array |
9 | #define LAYOUT( \ | 26 | #define LAYOUT( \ |
10 | k00, k01, k02, k03, k04, k05, \ | 27 | k00, k01, k02, k03, k04, \ |
11 | k06, k07, k08, k09, k10, \ | 28 | k10, k11, k12, k13, k14, \ |
12 | k11, k12, k13, k14, k15, \ | 29 | k20, k21, k22, k23, k24, \ |
13 | k16, k17, k18, k19, k20 \ | 30 | k05, k30, k31, k32, k33, k34 \ |
14 | ) \ | 31 | ) \ |
15 | { \ | 32 | { \ |
16 | { k00, k01, k02, k03, k04, k05, }, \ | 33 | { k00, k01, k02, k03, k04, k05 }, \ |
17 | { k06, k07, k08, k09, k10 }, \ | 34 | { k10, k11, k12, k13, k14, XXX }, \ |
18 | { k11, k12, k13, k14, k15 }, \ | 35 | { k20, k21, k22, k23, k24, XXX }, \ |
19 | { k16, k17, k18, k19, k20 } \ | 36 | { k30, k31, k32, k33, k34, XXX } \ |
20 | } | 37 | } |
21 | |||