diff options
author | Jack Humbert <jack.humb@gmail.com> | 2017-08-23 22:29:07 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-23 22:29:07 -0400 |
commit | d2ff66a985b938e87fffe55c1d9f1dc55e356f91 (patch) | |
tree | 561b3e203033849573a17f5ac6248077ab687676 /keyboards/lets_split | |
parent | 7260fc3eef98fb7b0e2ed24d3d0d14cf2e613000 (diff) | |
download | qmk_firmware-d2ff66a985b938e87fffe55c1d9f1dc55e356f91.tar.gz qmk_firmware-d2ff66a985b938e87fffe55c1d9f1dc55e356f91.zip |
Creates a layouts/ folder for keymaps shared between keyboards (#1609)
* include variables and .h files as pp directives
* start layout compilation
* split ergodoxes up
* don't compile all layouts for everything
* might seg fault
* reset layouts variable
* actually reset layouts
* include rules.mk instead
* remove includes from rules.mk
* update variable setting
* load visualizer from path
* adds some more examples
* adds more layouts
* more boards added
* more boards added
* adds documentation for layouts
* use lowercase names for LAYOUT_
* add layout.json files for each layout
* add community folder, default keymaps for layouts
* touch-up default layouts
* touch-up layouts, some keyboard rules.mk
* update documentation for layouts
* fix up serial/i2c switches
Diffstat (limited to 'keyboards/lets_split')
-rw-r--r-- | keyboards/lets_split/keymaps/ergodoxish/Makefile | 3 | ||||
-rw-r--r-- | keyboards/lets_split/keymaps/ergodoxish/config.h | 37 | ||||
-rw-r--r-- | keyboards/lets_split/keymaps/ergodoxish/keymap.c | 214 | ||||
-rw-r--r-- | keyboards/lets_split/lets_split.h | 12 | ||||
-rw-r--r-- | keyboards/lets_split/rev1/rules.mk | 6 | ||||
-rw-r--r-- | keyboards/lets_split/rev2/rules.mk | 4 | ||||
-rw-r--r-- | keyboards/lets_split/rules.mk | 2 | ||||
-rw-r--r-- | keyboards/lets_split/serial.c | 2 |
8 files changed, 9 insertions, 271 deletions
diff --git a/keyboards/lets_split/keymaps/ergodoxish/Makefile b/keyboards/lets_split/keymaps/ergodoxish/Makefile deleted file mode 100644 index 457a3d01d..000000000 --- a/keyboards/lets_split/keymaps/ergodoxish/Makefile +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | ifndef QUANTUM_DIR | ||
2 | include ../../../../Makefile | ||
3 | endif | ||
diff --git a/keyboards/lets_split/keymaps/ergodoxish/config.h b/keyboards/lets_split/keymaps/ergodoxish/config.h deleted file mode 100644 index 7f33a4363..000000000 --- a/keyboards/lets_split/keymaps/ergodoxish/config.h +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | /* | ||
2 | This is the c configuration file for the keymap | ||
3 | |||
4 | Copyright 2012 Jun Wako <wakojun@gmail.com> | ||
5 | Copyright 2015 Jack Humbert | ||
6 | |||
7 | This program is free software: you can redistribute it and/or modify | ||
8 | it under the terms of the GNU General Public License as published by | ||
9 | the Free Software Foundation, either version 2 of the License, or | ||
10 | (at your option) any later version. | ||
11 | |||
12 | This program is distributed in the hope that it will be useful, | ||
13 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
15 | GNU General Public License for more details. | ||
16 | |||
17 | You should have received a copy of the GNU General Public License | ||
18 | along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
19 | */ | ||
20 | |||
21 | #ifndef CONFIG_USER_H | ||
22 | #define CONFIG_USER_H | ||
23 | |||
24 | #include "../../config.h" | ||
25 | |||
26 | /* Use I2C or Serial, not both */ | ||
27 | |||
28 | #define USE_SERIAL | ||
29 | // #define USE_I2C | ||
30 | |||
31 | /* Select hand configuration */ | ||
32 | |||
33 | #define MASTER_LEFT | ||
34 | // #define _MASTER_RIGHT | ||
35 | // #define EE_HANDS | ||
36 | |||
37 | #endif \ No newline at end of file | ||
diff --git a/keyboards/lets_split/keymaps/ergodoxish/keymap.c b/keyboards/lets_split/keymaps/ergodoxish/keymap.c deleted file mode 100644 index 42f81a0eb..000000000 --- a/keyboards/lets_split/keymaps/ergodoxish/keymap.c +++ /dev/null | |||
@@ -1,214 +0,0 @@ | |||
1 | #include "lets_split.h" | ||
2 | #include "action_layer.h" | ||
3 | #include "eeconfig.h" | ||
4 | |||
5 | extern keymap_config_t keymap_config; | ||
6 | |||
7 | // Each layer gets a name for readability, which is then used in the keymap matrix below. | ||
8 | // The underscores don't mean anything - you can have a layer called STUFF or any other name. | ||
9 | // Layer names don't all need to be of the same length, obviously, and you can also skip them | ||
10 | // entirely and just use numbers. | ||
11 | #define _QWERTY 0 | ||
12 | #define _COLEMAK 1 | ||
13 | #define _DVORAK 2 | ||
14 | #define _LOWER 3 | ||
15 | #define _RAISE 4 | ||
16 | #define _ADJUST 16 | ||
17 | |||
18 | enum custom_keycodes { | ||
19 | QWERTY = SAFE_RANGE, | ||
20 | COLEMAK, | ||
21 | DVORAK, | ||
22 | LOWER, | ||
23 | RAISE, | ||
24 | ADJUST, | ||
25 | }; | ||
26 | |||
27 | // Fillers to make layering more clear | ||
28 | #define _______ KC_TRNS | ||
29 | #define XXXXXXX KC_NO | ||
30 | |||
31 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
32 | |||
33 | /* Qwerty | ||
34 | * ,-----------------------------------------------------------------------------------. | ||
35 | * | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp | | ||
36 | * |------+------+------+------+------+-------------+------+------+------+------+------| | ||
37 | * | Esc | A | S | D | F | G | H | J | K | L | ; | " | | ||
38 | * |------+------+------+------+------+------|------+------+------+------+------+------| | ||
39 | * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | | ||
40 | * |------+------+------+------+------+------+------+------+------+------+------+------| | ||
41 | * |Adjust| Ctrl | Alt | GUI |Lower |Space |Space |Raise | Left | Down | Up |Right | | ||
42 | * `-----------------------------------------------------------------------------------' | ||
43 | */ | ||
44 | [_QWERTY] = KEYMAP( \ | ||
45 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ | ||
46 | KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ | ||
47 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , \ | ||
48 | ADJUST, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ | ||
49 | ), | ||
50 | |||
51 | /* Colemak | ||
52 | * ,-----------------------------------------------------------------------------------. | ||
53 | * | Tab | Q | W | F | P | G | J | L | U | Y | ; | Bksp | | ||
54 | * |------+------+------+------+------+-------------+------+------+------+------+------| | ||
55 | * | Esc | A | R | S | T | D | H | N | E | I | O | " | | ||
56 | * |------+------+------+------+------+------|------+------+------+------+------+------| | ||
57 | * | Shift| Z | X | C | V | B | K | M | , | . | / |Enter | | ||
58 | * |------+------+------+------+------+------+------+------+------+------+------+------| | ||
59 | * |Adjust| Ctrl | Alt | GUI |Lower |Space |Space |Raise | Left | Down | Up |Right | | ||
60 | * `-----------------------------------------------------------------------------------' | ||
61 | */ | ||
62 | [_COLEMAK] = KEYMAP( \ | ||
63 | KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, \ | ||
64 | KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, \ | ||
65 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , \ | ||
66 | ADJUST, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ | ||
67 | ), | ||
68 | |||
69 | /* Dvorak | ||
70 | * ,-----------------------------------------------------------------------------------. | ||
71 | * | Tab | " | , | . | P | Y | F | G | C | R | L | Bksp | | ||
72 | * |------+------+------+------+------+-------------+------+------+------+------+------| | ||
73 | * | Esc | A | O | E | U | I | D | H | T | N | S | / | | ||
74 | * |------+------+------+------+------+------|------+------+------+------+------+------| | ||
75 | * | Shift| ; | Q | J | K | X | B | M | W | V | Z |Enter | | ||
76 | * |------+------+------+------+------+------+------+------+------+------+------+------| | ||
77 | * |Adjust| Ctrl | Alt | GUI |Lower |Space |Space |Raise | Left | Down | Up |Right | | ||
78 | * `-----------------------------------------------------------------------------------' | ||
79 | */ | ||
80 | [_DVORAK] = KEYMAP( \ | ||
81 | KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC, \ | ||
82 | KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH, \ | ||
83 | KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_ENT , \ | ||
84 | ADJUST, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ | ||
85 | ), | ||
86 | |||
87 | /* Lower | ||
88 | * ,-----------------------------------------------------------------------------------. | ||
89 | * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp | | ||
90 | * |------+------+------+------+------+-------------+------+------+------+------+------| | ||
91 | * | Del | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | | \ | | | | ||
92 | * |------+------+------+------+------+------|------+------+------+------+------+------| | ||
93 | * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO ~ |ISO | | | |Enter | | ||
94 | * |------+------+------+------+------+------+------+------+------+------+------+------| | ||
95 | * | | | | | | | | Next | Vol- | Vol+ | Play | | ||
96 | * `-----------------------------------------------------------------------------------' | ||
97 | */ | ||
98 | [_LOWER] = KEYMAP( \ | ||
99 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \ | ||
100 | KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \ | ||
101 | _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______, \ | ||
102 | _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ | ||
103 | ), | ||
104 | |||
105 | /* Raise | ||
106 | * ,-----------------------------------------------------------------------------------. | ||
107 | * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | | ||
108 | * |------+------+------+------+------+-------------+------+------+------+------+------| | ||
109 | * | Del | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ | | ||
110 | * |------+------+------+------+------+------|------+------+------+------+------+------| | ||
111 | * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO # |ISO / | | |Enter | | ||
112 | * |------+------+------+------+------+------+------+------+------+------+------+------| | ||
113 | * | | | | | | | | Next | Vol- | Vol+ | Play | | ||
114 | * `-----------------------------------------------------------------------------------' | ||
115 | */ | ||
116 | [_RAISE] = KEYMAP( \ | ||
117 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ | ||
118 | KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \ | ||
119 | _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, _______, _______, _______, \ | ||
120 | _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ | ||
121 | ), | ||
122 | |||
123 | /* Adjust (Lower + Raise) | ||
124 | * ,-----------------------------------------------------------------------------------. | ||
125 | * | | Reset| | | | | | | | | | Del | | ||
126 | * |------+------+------+------+------+-------------+------+------+------+------+------| | ||
127 | * | | | |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak| | | | ||
128 | * |------+------+------+------+------+------|------+------+------+------+------+------| | ||
129 | * | | | | | | | | | | | | | | ||
130 | * |------+------+------+------+------+------+------+------+------+------+------+------| | ||
131 | * | | | | | | | | | | | | | ||
132 | * `-----------------------------------------------------------------------------------' | ||
133 | */ | ||
134 | [_ADJUST] = KEYMAP( \ | ||
135 | _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \ | ||
136 | _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, \ | ||
137 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ | ||
138 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ | ||
139 | ) | ||
140 | |||
141 | |||
142 | }; | ||
143 | |||
144 | #ifdef AUDIO_ENABLE | ||
145 | float tone_qwerty[][2] = SONG(QWERTY_SOUND); | ||
146 | float tone_dvorak[][2] = SONG(DVORAK_SOUND); | ||
147 | float tone_colemak[][2] = SONG(COLEMAK_SOUND); | ||
148 | #endif | ||
149 | |||
150 | void persistent_default_layer_set(uint16_t default_layer) { | ||
151 | eeconfig_update_default_layer(default_layer); | ||
152 | default_layer_set(default_layer); | ||
153 | } | ||
154 | |||
155 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | ||
156 | switch (keycode) { | ||
157 | case QWERTY: | ||
158 | if (record->event.pressed) { | ||
159 | #ifdef AUDIO_ENABLE | ||
160 | PLAY_SONG(tone_qwerty); | ||
161 | #endif | ||
162 | persistent_default_layer_set(1UL<<_QWERTY); | ||
163 | } | ||
164 | return false; | ||
165 | break; | ||
166 | case COLEMAK: | ||
167 | if (record->event.pressed) { | ||
168 | #ifdef AUDIO_ENABLE | ||
169 | PLAY_SONG(tone_colemak); | ||
170 | #endif | ||
171 | persistent_default_layer_set(1UL<<_COLEMAK); | ||
172 | } | ||
173 | return false; | ||
174 | break; | ||
175 | case DVORAK: | ||
176 | if (record->event.pressed) { | ||
177 | #ifdef AUDIO_ENABLE | ||
178 | PLAY_SONG(tone_dvorak); | ||
179 | #endif | ||
180 | persistent_default_layer_set(1UL<<_DVORAK); | ||
181 | } | ||
182 | return false; | ||
183 | break; | ||
184 | case LOWER: | ||
185 | if (record->event.pressed) { | ||
186 | layer_on(_LOWER); | ||
187 | update_tri_layer(_LOWER, _RAISE, _ADJUST); | ||
188 | } else { | ||
189 | layer_off(_LOWER); | ||
190 | update_tri_layer(_LOWER, _RAISE, _ADJUST); | ||
191 | } | ||
192 | return false; | ||
193 | break; | ||
194 | case RAISE: | ||
195 | if (record->event.pressed) { | ||
196 | layer_on(_RAISE); | ||
197 | update_tri_layer(_LOWER, _RAISE, _ADJUST); | ||
198 | } else { | ||
199 | layer_off(_RAISE); | ||
200 | update_tri_layer(_LOWER, _RAISE, _ADJUST); | ||
201 | } | ||
202 | return false; | ||
203 | break; | ||
204 | case ADJUST: | ||
205 | if (record->event.pressed) { | ||
206 | layer_on(_ADJUST); | ||
207 | } else { | ||
208 | layer_off(_ADJUST); | ||
209 | } | ||
210 | return false; | ||
211 | break; | ||
212 | } | ||
213 | return true; | ||
214 | } \ No newline at end of file | ||
diff --git a/keyboards/lets_split/lets_split.h b/keyboards/lets_split/lets_split.h index f7dc24a44..476e7fd2a 100644 --- a/keyboards/lets_split/lets_split.h +++ b/keyboards/lets_split/lets_split.h | |||
@@ -1,12 +1,9 @@ | |||
1 | #ifndef LETS_SPLIT_H | 1 | #ifndef LETS_SPLIT_H |
2 | #define LETS_SPLIT_H | 2 | #define LETS_SPLIT_H |
3 | 3 | ||
4 | #ifdef SUBPROJECT_rev1 | 4 | #include "quantum.h" |
5 | #include "rev1.h" | 5 | |
6 | #endif | 6 | #include QMK_SUBPROJECT_H |
7 | #ifdef SUBPROJECT_rev2 | ||
8 | #include "rev2.h" | ||
9 | #endif | ||
10 | 7 | ||
11 | // Used to create a keymap using only KC_ prefixed keys | 8 | // Used to create a keymap using only KC_ prefixed keys |
12 | #define KC_KEYMAP( \ | 9 | #define KC_KEYMAP( \ |
@@ -22,6 +19,7 @@ | |||
22 | KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35 \ | 19 | KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35 \ |
23 | ) | 20 | ) |
24 | 21 | ||
25 | #include "quantum.h" | 22 | #define LAYOUT_ortho_4x12 KEYMAP |
23 | #define KC_LAYOUT_ortho_4x12 KC_KEYMAP | ||
26 | 24 | ||
27 | #endif \ No newline at end of file | 25 | #endif \ No newline at end of file |
diff --git a/keyboards/lets_split/rev1/rules.mk b/keyboards/lets_split/rev1/rules.mk index a0825b4ef..f84561674 100644 --- a/keyboards/lets_split/rev1/rules.mk +++ b/keyboards/lets_split/rev1/rules.mk | |||
@@ -1,5 +1 @@ | |||
1 | BACKLIGHT_ENABLE = no | BACKLIGHT_ENABLE = no \ No newline at end of file | |
2 | |||
3 | ifndef QUANTUM_DIR | ||
4 | include ../../../Makefile | ||
5 | endif \ No newline at end of file | ||
diff --git a/keyboards/lets_split/rev2/rules.mk b/keyboards/lets_split/rev2/rules.mk index 80a942d06..7b30c0bef 100644 --- a/keyboards/lets_split/rev2/rules.mk +++ b/keyboards/lets_split/rev2/rules.mk | |||
@@ -1,5 +1 @@ | |||
1 | BACKLIGHT_ENABLE = no | BACKLIGHT_ENABLE = no | |
2 | |||
3 | ifndef QUANTUM_DIR | ||
4 | include ../../../Makefile | ||
5 | endif | ||
diff --git a/keyboards/lets_split/rules.mk b/keyboards/lets_split/rules.mk index c2b7d556e..7b7224fd4 100644 --- a/keyboards/lets_split/rules.mk +++ b/keyboards/lets_split/rules.mk | |||
@@ -74,3 +74,5 @@ USE_I2C = yes | |||
74 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | 74 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend |
75 | 75 | ||
76 | CUSTOM_MATRIX = yes | 76 | CUSTOM_MATRIX = yes |
77 | |||
78 | LAYOUTS = ortho_4x12 \ No newline at end of file | ||
diff --git a/keyboards/lets_split/serial.c b/keyboards/lets_split/serial.c index 6faed09ce..74bcbb6bf 100644 --- a/keyboards/lets_split/serial.c +++ b/keyboards/lets_split/serial.c | |||
@@ -12,7 +12,7 @@ | |||
12 | #include <stdbool.h> | 12 | #include <stdbool.h> |
13 | #include "serial.h" | 13 | #include "serial.h" |
14 | 14 | ||
15 | #ifdef USE_SERIAL | 15 | #ifndef USE_I2C |
16 | 16 | ||
17 | // Serial pulse period in microseconds. Its probably a bad idea to lower this | 17 | // Serial pulse period in microseconds. Its probably a bad idea to lower this |
18 | // value. | 18 | // value. |