Skip to content

Commit ab0a535

Browse files
jackhumbertyamad
jackhumbert
authored and
yamad
committed
Adds support for Planck Rev 6 (qmk#2666)
* initial files for rev 6 with encoder * music map init, dip scan added * adds ws2812 driver for arm * flesh out dip and encoder support * adds default encoder res * adds default encoder res * start muse implementation * muse working with encoder as control * flip direction * try mouse wheel again * dont break other revs * dont break other revs * conditional autio * pwm ws driver (not working) * update build includes for chibios * update ws2812 driver/config * last commit for glasser code * working example * remove rgb for now * finish up rev6 * working encoder keycodes * add warnings to planck keymaps about the LAYOUT
1 parent f325683 commit ab0a535

File tree

122 files changed

+4105
-653
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+4105
-653
lines changed

‎common.mk

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ include message.mk
33
# Directory common source files exist
44
TOP_DIR = .
55
TMK_DIR = tmk_core
6-
TMK_PATH = $(TOP_DIR)/$(TMK_DIR)
7-
LIB_PATH = $(TOP_DIR)/lib
6+
TMK_PATH = $(TMK_DIR)
7+
LIB_PATH = lib
88

99
QUANTUM_DIR = quantum
10-
QUANTUM_PATH = $(TOP_DIR)/$(QUANTUM_DIR)
10+
QUANTUM_PATH = $(QUANTUM_DIR)
1111

1212
DRIVER_DIR = drivers
13-
DRIVER_PATH = $(TOP_DIR)/$(DRIVER_DIR)
13+
DRIVER_PATH = $(DRIVER_DIR)
1414

15-
BUILD_DIR := $(TOP_DIR)/.build
15+
BUILD_DIR := .build
1616

1717
COMMON_VPATH := $(TOP_DIR)
1818
COMMON_VPATH += $(TMK_PATH)
@@ -21,4 +21,4 @@ COMMON_VPATH += $(QUANTUM_PATH)/keymap_extras
2121
COMMON_VPATH += $(QUANTUM_PATH)/audio
2222
COMMON_VPATH += $(QUANTUM_PATH)/process_keycode
2323
COMMON_VPATH += $(QUANTUM_PATH)/api
24-
COMMON_VPATH += $(DRIVER_PATH)
24+
COMMON_VPATH += $(DRIVER_PATH)

‎keyboards/planck/keymaps/ab/keymap.c

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11

2+
#pragma message "You may need to add LAYOUT_planck_grid to your keymap layers - see default for an example"
23
#include "planck.h"
34
#include "action_layer.h"
45
#include "eeconfig.h"

‎keyboards/planck/keymaps/ajp10304/keymap.c

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#pragma message "You may need to add LAYOUT_planck_grid to your keymap layers - see default for an example"
12
#include "planck.h"
23
#include "action_layer.h"
34
#include "eeconfig.h"

‎keyboards/planck/keymaps/alexey/keymap.c

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "keymap.h"
2+
#pragma message "You may need to add LAYOUT_planck_grid to your keymap layers - see default for an example"
23
#include "planck.h"
34
#include "backlight.h"
45

‎keyboards/planck/keymaps/altgr/keymap.c

+1
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767

6868

6969
#include "config.h"
70+
#pragma message "You may need to add LAYOUT_planck_grid to your keymap layers - see default for an example"
7071
#include "planck.h"
7172
#include "action_layer.h"
7273
#ifdef STENO_ENABLE

‎keyboards/planck/keymaps/andylikescandy/keymap.c

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1515
*/
1616

17+
#pragma message "You may need to add LAYOUT_planck_grid to your keymap layers - see default for an example"
1718
#include "planck.h"
1819
#include "action_layer.h"
1920

‎keyboards/planck/keymaps/aviator/keymap.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
* Designed for aeronautical data entry on the OLKB Planck.
55
*/
66

7-
#include "planck.h"
7+
#pragma message "You may need to add LAYOUT_planck_grid to your keymap layers - see default for an example"
8+
#include "planck.h"
89
#include "action_layer.h"
910

1011
extern keymap_config_t keymap_config;

‎keyboards/planck/keymaps/basic/keymap.c

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#pragma message "You may need to add LAYOUT_planck_grid to your keymap layers - see default for an example"
12
#include "planck.h"
23

34
// Each layer gets a name for readability, which is then used in the keymap matrix below.

‎keyboards/planck/keymaps/bbaserdem/keymap.c

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
* Check qmk_firmware/users/bbaserdem for the main part of the code
77
*/
88

9+
#pragma message "You may need to add LAYOUT_planck_grid to your keymap layers - see default for an example"
910
#include "planck.h"
1011
#include "bbaserdem.h"
1112

‎keyboards/planck/keymaps/bone2planck/keymap.c

+40-39
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#include "planck.h"
1+
#pragma message "You may need to add LAYOUT_planck_grid to your keymap layers - see default for an example"
2+
#include "planck.h"
23
#ifdef BACKLIGHT_ENABLE
34
#include "backlight.h"
45
#endif
@@ -36,11 +37,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
3637
* `-----------------------------------------------------------------------------------'
3738
*/
3839
[0] = {
39-
{ DE_SS, DE_J, DE_D, DE_U, DE_A, DE_X, DE_P, DE_H, DE_L, DE_M, DE_W, DE_Q },
40-
//{ LT(1,KC_TAB), DE_C, DE_T, DE_I, DE_E, DE_O, DE_B, DE_N, DE_R, DE_S, DE_G, LT(1,KC_ENT) },
41-
{ MO(1), DE_C, DE_T, DE_I, DE_E, DE_O, DE_B, DE_N, DE_R, DE_S, DE_G, LT(1,KC_ENT) },
42-
{ KC_LSFT, DE_F, DE_V, DE_UE, DE_AE, DE_OE, DE_Y, DE_Z, DE_COMM, DE_DOT, DE_K, KC_LSFT },
43-
{ KC_LCTL, KC_LGUI, KC_LALT, MO(4), MO(2), KC_SPC, KC_SPC, MO(2), MO(4), KC_RALT, KC_ESC, KC_RCTL }
40+
{ DE_SS, DE_J, DE_D, DE_U, DE_A, DE_X, DE_P, DE_H, DE_L, DE_M, DE_W, DE_Q },
41+
//{ LT(1,KC_TAB), DE_C, DE_T, DE_I, DE_E, DE_O, DE_B, DE_N, DE_R, DE_S, DE_G, LT(1,KC_ENT) },
42+
{ MO(1), DE_C, DE_T, DE_I, DE_E, DE_O, DE_B, DE_N, DE_R, DE_S, DE_G, LT(1,KC_ENT) },
43+
{ KC_LSFT, DE_F, DE_V, DE_UE, DE_AE, DE_OE, DE_Y, DE_Z, DE_COMM, DE_DOT, DE_K, KC_LSFT },
44+
{ KC_LCTL, KC_LGUI, KC_LALT, MO(4), MO(2), KC_SPC, KC_SPC, MO(2), MO(4), KC_RALT, KC_ESC, KC_RCTL }
4445
},
4546

4647
/* M1 Special Characters
@@ -56,10 +57,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
5657
* `-----------------------------------------------------------------------------------'
5758
*/
5859
[1] = {
59-
{ DE_RING, DE_AT, DE_UNDS, DE_LBRC, DE_RBRC, DE_CIRC, DE_EXLM, DE_LESS, DE_MORE, DE_EQL, DE_AMPR, DE_ACUT },
60-
{ _______, DE_BSLS, DE_SLSH, DE_LCBR, DE_RCBR, DE_ASTR, DE_QST, DE_LPRN, DE_RPRN, DE_MINS, DE_COLN, _______ },
61-
{ _______, DE_HASH, DE_TILD, DE_PIPE, DE_DLR, DE_EURO, DE_PLUS, DE_PERC, DE_DQOT, DE_QUOT, DE_SCLN, _______ },
62-
{ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ }
60+
{ DE_RING, DE_AT, DE_UNDS, DE_LBRC, DE_RBRC, DE_CIRC, DE_EXLM, DE_LESS, DE_MORE, DE_EQL, DE_AMPR, DE_ACUT },
61+
{ _______, DE_BSLS, DE_SLSH, DE_LCBR, DE_RCBR, DE_ASTR, DE_QST, DE_LPRN, DE_RPRN, DE_MINS, DE_COLN, _______ },
62+
{ _______, DE_HASH, DE_TILD, DE_PIPE, DE_DLR, DE_EURO, DE_PLUS, DE_PERC, DE_DQOT, DE_QUOT, DE_SCLN, _______ },
63+
{ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ }
6364
},
6465

6566
/* M2 Navigation & Number Blocks
@@ -75,10 +76,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
7576
* `-----------------------------------------------------------------------------------'
7677
*/
7778
[2] = {
78-
{ XXXXXXX, KC_PGUP, KC_BSPC, KC_UP, KC_DEL, KC_PGDN, XXXXXXX, DE_7, DE_8, DE_9, XXXXXXX, KC_INS },
79-
{ KC_TAB, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, XXXXXXX, DE_4, DE_5, DE_6, DE_DOT, KC_ENT },
80-
{ _______, XXXXXXX, KC_TAB, XXXXXXX, KC_ENT, XXXXXXX, DE_0, DE_1, DE_2, DE_3, DE_COMM, _______ },
81-
{ _______, _______, _______, MO(3), _______, _______, _______, _______, MO(3), _______, _______, _______ }
79+
{ XXXXXXX, KC_PGUP, KC_BSPC, KC_UP, KC_DEL, KC_PGDN, XXXXXXX, DE_7, DE_8, DE_9, XXXXXXX, KC_INS },
80+
{ KC_TAB, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, XXXXXXX, DE_4, DE_5, DE_6, DE_DOT, KC_ENT },
81+
{ _______, XXXXXXX, KC_TAB, XXXXXXX, KC_ENT, XXXXXXX, DE_0, DE_1, DE_2, DE_3, DE_COMM, _______ },
82+
{ _______, _______, _______, MO(3), _______, _______, _______, _______, MO(3), _______, _______, _______ }
8283
},
8384

8485
/* M3 Switched Navigation & Number Blocks for one handed use
@@ -95,10 +96,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
9596
*/
9697

9798
[3] = {
98-
{ KC_INS, XXXXXXX, DE_7, DE_8, DE_9, XXXXXXX, KC_PGUP, KC_BSPC, KC_UP, KC_DEL, KC_PGDN, XXXXXXX },
99-
{ _______, XXXXXXX, DE_4, DE_5, DE_6, DE_DOT, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, _______ },
100-
{ _______, DE_0, DE_1, DE_2, DE_3, DE_COMM, XXXXXXX, KC_TAB, XXXXXXX, KC_ENT, XXXXXXX, _______ },
101-
{ _______, _______, _______, _______, XXXXXXX, _______, _______, XXXXXXX, _______, _______, _______, _______ }
99+
{ KC_INS, XXXXXXX, DE_7, DE_8, DE_9, XXXXXXX, KC_PGUP, KC_BSPC, KC_UP, KC_DEL, KC_PGDN, XXXXXXX },
100+
{ _______, XXXXXXX, DE_4, DE_5, DE_6, DE_DOT, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, _______ },
101+
{ _______, DE_0, DE_1, DE_2, DE_3, DE_COMM, XXXXXXX, KC_TAB, XXXXXXX, KC_ENT, XXXXXXX, _______ },
102+
{ _______, _______, _______, _______, XXXXXXX, _______, _______, XXXXXXX, _______, _______, _______, _______ }
102103
},
103104

104105

@@ -114,10 +115,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
114115
* `-----------------------------------------------------------------------------------'
115116
*/
116117
[4] = {
117-
{ XXXXXXX, XXXXXXX, KC_PSCR, KC_SLCK, KC_PAUS, XXXXXXX, XXXXXXX, KC_F7, KC_F8, KC_F9, KC_F12, XXXXXXX },
118-
{ KC_TAB, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, DE_SQ3, KC_F4, KC_F5, KC_F6, KC_F11, KC_ENT },
119-
{ _______, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, DE_SQ2, KC_F1, KC_F2, KC_F3, KC_F10, _______ },
120-
{ _______, _______, _______, _______, MO(5), _______, _______, MO(5), _______, _______, _______, _______ }
118+
{ XXXXXXX, XXXXXXX, KC_PSCR, KC_SLCK, KC_PAUS, XXXXXXX, XXXXXXX, KC_F7, KC_F8, KC_F9, KC_F12, XXXXXXX },
119+
{ KC_TAB, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, DE_SQ3, KC_F4, KC_F5, KC_F6, KC_F11, KC_ENT },
120+
{ _______, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, DE_SQ2, KC_F1, KC_F2, KC_F3, KC_F10, _______ },
121+
{ _______, _______, _______, _______, MO(5), _______, _______, MO(5), _______, _______, _______, _______ }
121122
},
122123

123124

@@ -134,10 +135,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
134135
* `-----------------------------------------------------------------------------------'
135136
*/
136137
[5] = {
137-
{ XXXXXXX, XXXXXXX, KC_F7, KC_F8, KC_F9, KC_F12, XXXXXXX, KC_PSCR, KC_SLCK, KC_PAUS, XXXXXXX, XXXXXXX },
138-
{ _______, DE_SQ3, KC_F4, KC_F5, KC_F6, KC_F11, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, _______ },
139-
{ _______, DE_SQ2, KC_F1, KC_F2, KC_F3, KC_F10, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, _______ },
140-
{ _______, _______, _______, XXXXXXX, _______, _______, _______, _______, XXXXXXX, _______, _______, _______ }
138+
{ XXXXXXX, XXXXXXX, KC_F7, KC_F8, KC_F9, KC_F12, XXXXXXX, KC_PSCR, KC_SLCK, KC_PAUS, XXXXXXX, XXXXXXX },
139+
{ _______, DE_SQ3, KC_F4, KC_F5, KC_F6, KC_F11, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, _______ },
140+
{ _______, DE_SQ2, KC_F1, KC_F2, KC_F3, KC_F10, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, _______ },
141+
{ _______, _______, _______, XXXXXXX, _______, _______, _______, _______, XXXXXXX, _______, _______, _______ }
141142
}
142143
};
143144

@@ -148,19 +149,19 @@ const uint16_t PROGMEM fn_actions[] = {
148149

149150
const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
150151
{
151-
// MACRODOWN only works in this function
152-
switch (id) {
153-
case 0:
154-
if (record->event.pressed) {
155-
register_code(KC_RSFT);
152+
// MACRODOWN only works in this function
153+
switch (id) {
154+
case 0:
155+
if (record->event.pressed) {
156+
register_code(KC_RSFT);
156157
#ifdef BACKLIGHT_ENABLE
157-
backlight_step();
158+
backlight_step();
158159
#endif
159-
}
160-
else {
161-
unregister_code(KC_RSFT);
162-
}
163-
break;
164-
}
165-
return MACRO_NONE;
160+
}
161+
else {
162+
unregister_code(KC_RSFT);
163+
}
164+
break;
165+
}
166+
return MACRO_NONE;
166167
};

‎keyboards/planck/keymaps/brandon/keymap.c

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#pragma message "You may need to add LAYOUT_planck_grid to your keymap layers - see default for an example"
12
#include "planck.h"
23
#include "action_layer.h"
34
#include "eeconfig.h"

‎keyboards/planck/keymaps/callum/keymap.c

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#pragma message "You may need to add LAYOUT_planck_grid to your keymap layers - see default for an example"
12
#include "planck.h"
23
#include "action_layer.h"
34

‎keyboards/planck/keymaps/cbbrowne/keymap.c

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#pragma message "You may need to add LAYOUT_planck_grid to your keymap layers - see default for an example"
12
#include "planck.h"
23
#ifdef BACKLIGHT_ENABLE
34
#include "backlight.h"
@@ -7,7 +8,7 @@
78
#include "version.h"
89

910
/* Each layer is given a name to aid in readability, which is then
10-
used in the keymap matrix below. The underscores do not denote
11+
used in the keymap matrix below. The underscores do not denote
1112
anything - you can have a layer called STUFF or any other name.
1213
1314
Layer names don't all need to be of the same length, obviously, and
@@ -20,7 +21,7 @@
2021
/* This was originally based on planck/keymaps/default/default.c, and
2122
then cbbrowne has revised things */
2223

23-
/* Things I did not like about the default mapping
24+
/* Things I did not like about the default mapping
2425
2526
- I found control too hard to get to. I use it more than Tab, so
2627
switched it there.
@@ -33,7 +34,7 @@
3334
3435
- All of the above are done :-)
3536
36-
- Dropped out support for Dvorak and friends. They aren't
37+
- Dropped out support for Dvorak and friends. They aren't
3738
improvements to me
3839
*/
3940

@@ -177,7 +178,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
177178
} else {
178179
unregister_code(KC_RSFT);
179180
}
180-
break;
181+
break;
181182
case M_USERNAME:
182183
if (record->event.pressed) {
183184
SEND_STRING("cbbrowne");
@@ -195,7 +196,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
195196
if (record->event.pressed) {
196197
/* Here, we mix the LCRNG with low bits from one of the system
197198
clocks via XOR in the theory that this may be more random
198-
than either separately */
199+
than either separately */
199200
rval = (random_value ^ clockbyte) % 10;
200201
/* Note that KC_1 thru KC_0 are a contiguous range */
201202
register_code (KC_1 + rval);
@@ -207,7 +208,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
207208
a letter chosen at random */
208209
/* Here, we mix the LCRNG with low bits from one of the system
209210
clocks via XOR in the theory that this may be more random
210-
than either separately */
211+
than either separately */
211212
random_value = ((random_value + randadd) * randmul) % randmod;
212213
if (record->event.pressed) {
213214
rval = (random_value ^ clockbyte) % 26;
@@ -247,7 +248,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
247248
update_tri_layer(_LOWER, _RAISE, _ADJUST);
248249
}
249250
break;
250-
251+
251252
}
252253
return MACRO_NONE;
253254
};
@@ -366,4 +367,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
366367

367368
return true;
368369
}
369-

‎keyboards/planck/keymaps/chance/keymap.c

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11

2+
#pragma message "You may need to add LAYOUT_planck_grid to your keymap layers - see default for an example"
23
#include "planck.h"
34
#include "action_layer.h"
45
#ifdef AUDIO_ENABLE

0 commit comments

Comments
 (0)