aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2020-11-03 11:55:22 +1100
committerGitHub <noreply@github.com>2020-11-02 16:55:22 -0800
commitc60cafae419f8fe409f9cdb3274bbf6d02973f7c (patch)
tree4836ddffa2ab16a14784bce601c5bf2a23f60df3
parent38162af5a70ced55f74019b75ed1e2f1e03ff62e (diff)
downloadqmk_firmware-c60cafae419f8fe409f9cdb3274bbf6d02973f7c.tar.gz
qmk_firmware-c60cafae419f8fe409f9cdb3274bbf6d02973f7c.zip
KC60 refactor (#10834)
-rw-r--r--keyboards/kc60/config.h92
-rw-r--r--keyboards/kc60/info.json394
-rw-r--r--keyboards/kc60/kc60.c21
-rw-r--r--keyboards/kc60/kc60.h72
-rw-r--r--keyboards/kc60/keymaps/default/keymap.c10
-rw-r--r--keyboards/kc60/keymaps/via/keymap.c10
-rw-r--r--keyboards/kc60/keymaps/ws2812/config.h4
-rw-r--r--keyboards/kc60/keymaps/ws2812/keymap.c12
-rw-r--r--keyboards/kc60/readme.md4
-rw-r--r--keyboards/kc60/rules.mk14
10 files changed, 338 insertions, 295 deletions
diff --git a/keyboards/kc60/config.h b/keyboards/kc60/config.h
index 7c6e695a4..c58aedd76 100644
--- a/keyboards/kc60/config.h
+++ b/keyboards/kc60/config.h
@@ -20,12 +20,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
20#include "config_common.h" 20#include "config_common.h"
21 21
22/* USB Device descriptor parameter */ 22/* USB Device descriptor parameter */
23#define VENDOR_ID 0x530A 23#define VENDOR_ID 0x530A
24#define PRODUCT_ID 0x6FFC 24#define PRODUCT_ID 0x6FFC
25#define DEVICE_VER 0x0001 25#define DEVICE_VER 0x0001
26#define MANUFACTURER NPKC 26#define MANUFACTURER NPKC
27#define PRODUCT KC60 27#define PRODUCT KC60
28#define DESCRIPTION QMK Firmware: KC60
29 28
30/* key matrix size */ 29/* key matrix size */
31#define MATRIX_ROWS 5 30#define MATRIX_ROWS 5
@@ -45,39 +44,39 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
45#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3 } 44#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3 }
46#define UNUSED_PINS 45#define UNUSED_PINS
47 46
48/* COL2ROW, ROW2COL*/ 47/* COL2ROW, ROW2COL */
49#define DIODE_DIRECTION COL2ROW 48#define DIODE_DIRECTION COL2ROW
50 49
51#define BACKLIGHT_PIN B6 50#define BACKLIGHT_PIN B6
52#define BACKLIGHT_BREATHING
53#define BACKLIGHT_LEVELS 5 51#define BACKLIGHT_LEVELS 5
52#define BACKLIGHT_BREATHING
54 53
55#ifdef RGBLIGHT_ENABLE 54#define RGB_DI_PIN F5
56# define RGB_DI_PIN F5 55#ifdef RGB_DI_PIN
57# define RGBLED_NUM 16 // Number of LEDs. Change this to match your use case. 56# define RGBLED_NUM 16
58# define RGBLIGHT_HUE_STEP 8 57# define RGBLIGHT_HUE_STEP 8
59# define RGBLIGHT_SAT_STEP 8 58# define RGBLIGHT_SAT_STEP 8
60# define RGBLIGHT_VAL_STEP 8 59# define RGBLIGHT_VAL_STEP 8
61# define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ 60# define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
62# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ 61# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
63/*== all animations enable ==*/ 62/*== all animations enable ==*/
64# define RGBLIGHT_ANIMATIONS 63# define RGBLIGHT_ANIMATIONS
65/*== or choose animations ==*/ 64/*== or choose animations ==*/
66// # define RGBLIGHT_EFFECT_BREATHING 65//# define RGBLIGHT_EFFECT_BREATHING
67// # define RGBLIGHT_EFFECT_RAINBOW_MOOD 66//# define RGBLIGHT_EFFECT_RAINBOW_MOOD
68// # define RGBLIGHT_EFFECT_RAINBOW_SWIRL 67//# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
69// # define RGBLIGHT_EFFECT_SNAKE 68//# define RGBLIGHT_EFFECT_SNAKE
70// # define RGBLIGHT_EFFECT_KNIGHT 69//# define RGBLIGHT_EFFECT_KNIGHT
71// # define RGBLIGHT_EFFECT_CHRISTMAS 70//# define RGBLIGHT_EFFECT_CHRISTMAS
72// # define RGBLIGHT_EFFECT_STATIC_GRADIENT 71//# define RGBLIGHT_EFFECT_STATIC_GRADIENT
73// # define RGBLIGHT_EFFECT_RGB_TEST 72//# define RGBLIGHT_EFFECT_RGB_TEST
74// # define RGBLIGHT_EFFECT_ALTERNATING 73//# define RGBLIGHT_EFFECT_ALTERNATING
75/*== customize breathing effect ==*/ 74/*== customize breathing effect ==*/
76/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ 75/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
77# define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 76# define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64
78/*==== use exp() and sin() ====*/ 77/*==== use exp() and sin() ====*/
79// # define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 78//# define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7
80// # define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 79//# define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255
81#endif 80#endif
82 81
83/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ 82/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
@@ -91,9 +90,52 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
91/* Locking resynchronize hack */ 90/* Locking resynchronize hack */
92#define LOCKING_RESYNC_ENABLE 91#define LOCKING_RESYNC_ENABLE
93 92
93/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
94 * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
95 */
96//#define GRAVE_ESC_CTRL_OVERRIDE
97
98/*
99 * Force NKRO
100 *
101 * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
102 * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
103 * makefile for this to work.)
104 *
105 * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
106 * until the next keyboard reset.
107 *
108 * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
109 * fully operational during normal computer usage.
110 *
111 * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
112 * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
113 * bootmagic, NKRO mode will always be enabled until it is toggled again during a
114 * power-up.
115 *
116 */
117//#define FORCE_NKRO
118
119/*
120 * Feature disable options
121 * These options are also useful to firmware size reduction.
122 */
123
124/* disable debug print */
125//#define NO_DEBUG
126
127/* disable print */
128//#define NO_PRINT
129
94/* disable action features */ 130/* disable action features */
95//#define NO_ACTION_LAYER 131//#define NO_ACTION_LAYER
96//#define NO_ACTION_TAPPING 132//#define NO_ACTION_TAPPING
97//#define NO_ACTION_ONESHOT 133//#define NO_ACTION_ONESHOT
98//#define NO_ACTION_MACRO 134
99//#define NO_ACTION_FUNCTION 135/* disable these deprecated features by default */
136#define NO_ACTION_MACRO
137#define NO_ACTION_FUNCTION
138
139/* Bootmagic Lite key configuration */
140//#define BOOTMAGIC_LITE_ROW 0
141//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/kc60/info.json b/keyboards/kc60/info.json
index bd21b6a6c..b6bdfe870 100644
--- a/keyboards/kc60/info.json
+++ b/keyboards/kc60/info.json
@@ -7,205 +7,217 @@
7 "layouts": { 7 "layouts": {
8 "LAYOUT_all": { 8 "LAYOUT_all": {
9 "layout": [ 9 "layout": [
10 {"label":"Esc", "x":0, "y":0}, 10 {"x": 0, "y": 0},
11 {"label":"1", "x":1, "y":0}, 11 {"x": 1, "y": 0},
12 {"label":"2", "x":2, "y":0}, 12 {"x": 2, "y": 0},
13 {"label":"3", "x":3, "y":0}, 13 {"x": 3, "y": 0},
14 {"label":"4", "x":4, "y":0}, 14 {"x": 4, "y": 0},
15 {"label":"5", "x":5, "y":0}, 15 {"x": 5, "y": 0},
16 {"label":"6", "x":6, "y":0}, 16 {"x": 6, "y": 0},
17 {"label":"7", "x":7, "y":0}, 17 {"x": 7, "y": 0},
18 {"label":"8", "x":8, "y":0}, 18 {"x": 8, "y": 0},
19 {"label":"9", "x":9, "y":0}, 19 {"x": 9, "y": 0},
20 {"label":"0", "x":10, "y":0}, 20 {"x": 10, "y": 0},
21 {"label":"-", "x":11, "y":0}, 21 {"x": 11, "y": 0},
22 {"label":"=", "x":12, "y":0}, 22 {"x": 12, "y": 0},
23 {"label":"Backspace", "x":13, "y":0}, 23 {"x": 13, "y": 0},
24 {"label":"`", "x":14, "y":0}, 24 {"x": 14, "y": 0},
25 {"label":"Tab", "x":0, "y":1, "w":1.5}, 25
26 {"label":"Q", "x":1.5, "y":1}, 26 {"x": 0, "y": 1, "w": 1.5},
27 {"label":"W", "x":2.5, "y":1}, 27 {"x": 1.5, "y": 1},
28 {"label":"E", "x":3.5, "y":1}, 28 {"x": 2.5, "y": 1},
29 {"label":"R", "x":4.5, "y":1}, 29 {"x": 3.5, "y": 1},
30 {"label":"T", "x":5.5, "y":1}, 30 {"x": 4.5, "y": 1},
31 {"label":"Y", "x":6.5, "y":1}, 31 {"x": 5.5, "y": 1},
32 {"label":"U", "x":7.5, "y":1}, 32 {"x": 6.5, "y": 1},
33 {"label":"I", "x":8.5, "y":1}, 33 {"x": 7.5, "y": 1},
34 {"label":"O", "x":9.5, "y":1}, 34 {"x": 8.5, "y": 1},
35 {"label":"P", "x":10.5, "y":1}, 35 {"x": 9.5, "y": 1},
36 {"label":"[", "x":11.5, "y":1}, 36 {"x": 10.5, "y": 1},
37 {"label":"]", "x":12.5, "y":1}, 37 {"x": 11.5, "y": 1},
38 {"label":"\\", "x":13.5, "y":1, "w":1.5}, 38 {"x": 12.5, "y": 1},
39 {"label":"CapsLock", "x":0, "y":2, "w":1.75}, 39 {"x": 13.5, "y": 1, "w": 1.5},
40 {"label":"A", "x":1.75, "y":2}, 40
41 {"label":"S", "x":2.75, "y":2}, 41 {"x": 0, "y": 2, "w": 1.75},
42 {"label":"D", "x":3.75, "y":2}, 42 {"x": 1.75, "y": 2},
43 {"label":"F", "x":4.75, "y":2}, 43 {"x": 2.75, "y": 2},
44 {"label":"G", "x":5.75, "y":2}, 44 {"x": 3.75, "y": 2},
45 {"label":"H", "x":6.75, "y":2}, 45 {"x": 4.75, "y": 2},
46 {"label":"J", "x":7.75, "y":2}, 46 {"x": 5.75, "y": 2},
47 {"label":"K", "x":8.75, "y":2}, 47 {"x": 6.75, "y": 2},
48 {"label":"L", "x":9.75, "y":2}, 48 {"x": 7.75, "y": 2},
49 {"label":";", "x":10.75, "y":2}, 49 {"x": 8.75, "y": 2},
50 {"label":"'", "x":11.75, "y":2}, 50 {"x": 9.75, "y": 2},
51 {"label":"ISO#", "x":12.75, "y":2}, 51 {"x": 10.75, "y": 2},
52 {"label":"Enter", "x":13.75, "y":2, "w":1.25}, 52 {"x": 11.75, "y": 2},
53 {"label":"Shift", "x":0, "y":3, "w":1.25}, 53 {"x": 12.75, "y": 2},
54 {"label":"ISO\\", "x":1.25, "y":3}, 54 {"x": 13.75, "y": 2, "w": 1.25},
55 {"label":"Z", "x":2.25, "y":3}, 55
56 {"label":"X", "x":3.25, "y":3}, 56 {"x": 0, "y": 3, "w": 1.25},
57 {"label":"C", "x":4.25, "y":3}, 57 {"x": 1.25, "y": 3},
58 {"label":"V", "x":5.25, "y":3}, 58 {"x": 2.25, "y": 3},
59 {"label":"B", "x":6.25, "y":3}, 59 {"x": 3.25, "y": 3},
60 {"label":"N", "x":7.25, "y":3}, 60 {"x": 4.25, "y": 3},
61 {"label":"M", "x":8.25, "y":3}, 61 {"x": 5.25, "y": 3},
62 {"label":",", "x":9.25, "y":3}, 62 {"x": 6.25, "y": 3},
63 {"label":".", "x":10.25, "y":3}, 63 {"x": 7.25, "y": 3},
64 {"label":"/", "x":11.25, "y":3}, 64 {"x": 8.25, "y": 3},
65 {"label":"Shift", "x":12.25, "y":3, "w":1.75}, 65 {"x": 9.25, "y": 3},
66 {"label":"HHKBFn", "x":14, "y":3}, 66 {"x": 10.25, "y": 3},
67 {"label":"Ctrl", "x":0, "y":4, "w":1.25}, 67 {"x": 11.25, "y": 3},
68 {"label":"GUI", "x":1.25, "y":4, "w":1.25}, 68 {"x": 12.25, "y": 3, "w": 1.75},
69 {"label":"Alt", "x":2.5, "y":4, "w":1.25}, 69 {"x": 14, "y": 3},
70 {"label":"Space", "x":3.75, "y":4, "w":6.25}, 70
71 {"label":"Alt", "x":10, "y":4, "w":1.25}, 71 {"x": 0, "y": 4, "w": 1.25},
72 {"label":"GUI", "x":11.25, "y":4, "w":1.25}, 72 {"x": 1.25, "y": 4, "w": 1.25},
73 {"label":"Menu", "x":12.5, "y":4, "w":1.25}, 73 {"x": 2.5, "y": 4, "w": 1.25},
74 {"label":"Ctrl", "x":13.75, "y":4, "w":1.25} 74 {"x": 3.75, "y": 4, "w": 6.25},
75 {"x": 10, "y": 4, "w": 1.25},
76 {"x": 11.25, "y": 4, "w": 1.25},
77 {"x": 12.5, "y": 4, "w": 1.25},
78 {"x": 13.75, "y": 4, "w": 1.25}
75 ] 79 ]
76 }, 80 },
77 "LAYOUT": { 81 "LAYOUT": {
78 "layout": [ 82 "layout": [
79 {"label":"K00", "x":0, "y":0}, 83 {"x": 0, "y": 0},
80 {"label":"K01", "x":1, "y":0}, 84 {"x": 1, "y": 0},
81 {"label":"K02", "x":2, "y":0}, 85 {"x": 2, "y": 0},
82 {"label":"K03", "x":3, "y":0}, 86 {"x": 3, "y": 0},
83 {"label":"K04", "x":4, "y":0}, 87 {"x": 4, "y": 0},
84 {"label":"K05", "x":5, "y":0}, 88 {"x": 5, "y": 0},
85 {"label":"K06", "x":6, "y":0}, 89 {"x": 6, "y": 0},
86 {"label":"K07", "x":7, "y":0}, 90 {"x": 7, "y": 0},
87 {"label":"K08", "x":8, "y":0}, 91 {"x": 8, "y": 0},
88 {"label":"K09", "x":9, "y":0}, 92 {"x": 9, "y": 0},
89 {"label":"K0A", "x":10, "y":0}, 93 {"x": 10, "y": 0},
90 {"label":"K0B", "x":11, "y":0}, 94 {"x": 11, "y": 0},
91 {"label":"K0C", "x":12, "y":0}, 95 {"x": 12, "y": 0},
92 {"label":"K0D", "x":13, "y":0}, 96 {"x": 13, "y": 0},
93 {"label":"K10", "x":0, "y":1, "w":1.5}, 97
94 {"label":"K11", "x":1.5, "y":1}, 98 {"x": 0, "y": 1, "w": 1.5},
95 {"label":"K12", "x":2.5, "y":1}, 99 {"x": 1.5, "y": 1},
96 {"label":"K13", "x":3.5, "y":1}, 100 {"x": 2.5, "y": 1},
97 {"label":"K14", "x":4.5, "y":1}, 101 {"x": 3.5, "y": 1},
98 {"label":"K15", "x":5.5, "y":1}, 102 {"x": 4.5, "y": 1},
99 {"label":"K16", "x":6.5, "y":1}, 103 {"x": 5.5, "y": 1},
100 {"label":"K17", "x":7.5, "y":1}, 104 {"x": 6.5, "y": 1},
101 {"label":"K18", "x":8.5, "y":1}, 105 {"x": 7.5, "y": 1},
102 {"label":"K19", "x":9.5, "y":1}, 106 {"x": 8.5, "y": 1},
103 {"label":"K1A", "x":10.5, "y":1}, 107 {"x": 9.5, "y": 1},
104 {"label":"K1B", "x":11.5, "y":1}, 108 {"x": 10.5, "y": 1},
105 {"label":"K1C", "x":12.5, "y":1}, 109 {"x": 11.5, "y": 1},
106 {"label":"K1D", "x":13.5, "y":1, "w":1.5}, 110 {"x": 12.5, "y": 1},
107 {"label":"K20", "x":0, "y":2, "w":1.75}, 111 {"x": 13.5, "y": 1, "w": 1.5},
108 {"label":"K21", "x":1.75, "y":2}, 112
109 {"label":"K22", "x":2.75, "y":2}, 113 {"x": 0, "y": 2, "w": 1.75},
110 {"label":"K23", "x":3.75, "y":2}, 114 {"x": 1.75, "y": 2},
111 {"label":"K24", "x":4.75, "y":2}, 115 {"x": 2.75, "y": 2},
112 {"label":"K25", "x":5.75, "y":2}, 116 {"x": 3.75, "y": 2},
113 {"label":"K26", "x":6.75, "y":2}, 117 {"x": 4.75, "y": 2},
114 {"label":"K27", "x":7.75, "y":2}, 118 {"x": 5.75, "y": 2},
115 {"label":"K28", "x":8.75, "y":2}, 119 {"x": 6.75, "y": 2},
116 {"label":"K29", "x":9.75, "y":2}, 120 {"x": 7.75, "y": 2},
117 {"label":"K2A", "x":10.75, "y":2}, 121 {"x": 8.75, "y": 2},
118 {"label":"K2B", "x":11.75, "y":2}, 122 {"x": 9.75, "y": 2},
119 {"label":"K2C", "x":12.75, "y":2}, 123 {"x": 10.75, "y": 2},
120 {"label":"K2D", "x":13.75, "y":2, "w":1.25}, 124 {"x": 11.75, "y": 2},
121 {"label":"K30", "x":0, "y":3, "w":1.25}, 125 {"x": 12.75, "y": 2},
122 {"label":"K31", "x":1.25, "y":3}, 126 {"x": 13.75, "y": 2, "w": 1.25},
123 {"label":"K32", "x":2.25, "y":3}, 127
124 {"label":"K33", "x":3.25, "y":3}, 128 {"x": 0, "y": 3, "w": 1.25},
125 {"label":"K34", "x":4.25, "y":3}, 129 {"x": 1.25, "y": 3},
126 {"label":"K35", "x":5.25, "y":3}, 130 {"x": 2.25, "y": 3},
127 {"label":"K36", "x":6.25, "y":3}, 131 {"x": 3.25, "y": 3},
128 {"label":"K37", "x":7.25, "y":3}, 132 {"x": 4.25, "y": 3},
129 {"label":"K38", "x":8.25, "y":3}, 133 {"x": 5.25, "y": 3},
130 {"label":"K39", "x":9.25, "y":3}, 134 {"x": 6.25, "y": 3},
131 {"label":"K3A", "x":10.25, "y":3}, 135 {"x": 7.25, "y": 3},
132 {"label":"K3B", "x":11.25, "y":3}, 136 {"x": 8.25, "y": 3},
133 {"label":"K3C", "x":12.25, "y":3, "w":1.75}, 137 {"x": 9.25, "y": 3},
134 {"label":"K3D", "x":14, "y":3}, 138 {"x": 10.25, "y": 3},
135 {"label":"K40", "x":0, "y":4, "w":1.25}, 139 {"x": 11.25, "y": 3},
136 {"label":"K41", "x":1.25, "y":4, "w":1.25}, 140 {"x": 12.25, "y": 3, "w": 1.75},
137 {"label":"K42", "x":2.5, "y":4, "w":1.25}, 141 {"x": 14, "y": 3},
138 {"label":"K45", "x":3.75, "y":4, "w":6.25}, 142
139 {"label":"K49", "x":14, "y":0}, 143 {"x": 0, "y": 4, "w": 1.25},
140 {"label":"K4A", "x":10, "y":4, "w":1.25}, 144 {"x": 1.25, "y": 4, "w": 1.25},
141 {"label":"K4B", "x":11.25, "y":4, "w":1.25}, 145 {"x": 2.5, "y": 4, "w": 1.25},
142 {"label":"K4C", "x":12.5, "y":4, "w":1.25}, 146 {"x": 3.75, "y": 4, "w": 6.25},
143 {"label":"K4D", "x":13.75, "y":4, "w":1.25} 147 {"x": 14, "y": 0},
148 {"x": 10, "y": 4, "w": 1.25},
149 {"x": 11.25, "y": 4, "w": 1.25},
150 {"x": 12.5, "y": 4, "w": 1.25},
151 {"x": 13.75, "y": 4, "w": 1.25}
144 ] 152 ]
145 }, 153 },
146 "LAYOUT_60_ansi": { 154 "LAYOUT_60_ansi": {
147 "layout": [ 155 "layout": [
148 {"label":"~", "x":0, "y":0}, 156 {"x": 0, "y": 0},
149 {"label":"1", "x":1, "y":0}, 157 {"x": 1, "y": 0},
150 {"label":"2", "x":2, "y":0}, 158 {"x": 2, "y": 0},
151 {"label":"3", "x":3, "y":0}, 159 {"x": 3, "y": 0},
152 {"label":"4", "x":4, "y":0}, 160 {"x": 4, "y": 0},
153 {"label":"5", "x":5, "y":0}, 161 {"x": 5, "y": 0},
154 {"label":"6", "x":6, "y":0}, 162 {"x": 6, "y": 0},
155 {"label":"7", "x":7, "y":0}, 163 {"x": 7, "y": 0},
156 {"label":"8", "x":8, "y":0}, 164 {"x": 8, "y": 0},
157 {"label":"9", "x":9, "y":0}, 165 {"x": 9, "y": 0},
158 {"label":"0", "x":10, "y":0}, 166 {"x": 10, "y": 0},
159 {"label":"-", "x":11, "y":0}, 167 {"x": 11, "y": 0},
160 {"label":"=", "x":12, "y":0}, 168 {"x": 12, "y": 0},
161 {"label":"Backspace", "x":13, "y":0, "w":2}, 169 {"x": 13, "y": 0, "w": 2},
162 {"label":"Tab", "x":0, "y":1, "w":1.5}, 170
163 {"label":"Q", "x":1.5, "y":1}, 171 {"x": 0, "y": 1, "w": 1.5},
164 {"label":"W", "x":2.5, "y":1}, 172 {"x": 1.5, "y": 1},
165 {"label":"E", "x":3.5, "y":1}, 173 {"x": 2.5, "y": 1},
166 {"label":"R", "x":4.5, "y":1}, 174 {"x": 3.5, "y": 1},
167 {"label":"T", "x":5.5, "y":1}, 175 {"x": 4.5, "y": 1},
168 {"label":"Y", "x":6.5, "y":1}, 176 {"x": 5.5, "y": 1},
169 {"label":"U", "x":7.5, "y":1}, 177 {"x": 6.5, "y": 1},
170 {"label":"I", "x":8.5, "y":1}, 178 {"x": 7.5, "y": 1},
171 {"label":"O", "x":9.5, "y":1}, 179 {"x": 8.5, "y": 1},
172 {"label":"P", "x":10.5, "y":1}, 180 {"x": 9.5, "y": 1},
173 {"label":"[", "x":11.5, "y":1}, 181 {"x": 10.5, "y": 1},
174 {"label":"]", "x":12.5, "y":1}, 182 {"x": 11.5, "y": 1},
175 {"label":"\\", "x":13.5, "y":1, "w":1.5}, 183 {"x": 12.5, "y": 1},
176 {"label":"CapsLock", "x":0, "y":2, "w":1.75}, 184 {"x": 13.5, "y": 1, "w": 1.5},
177 {"label":"A", "x":1.75, "y":2}, 185
178 {"label":"S", "x":2.75, "y":2}, 186 {"x": 0, "y": 2, "w": 1.75},
179 {"label":"D", "x":3.75, "y":2}, 187 {"x": 1.75, "y": 2},
180 {"label":"F", "x":4.75, "y":2}, 188 {"x": 2.75, "y": 2},
181 {"label":"G", "x":5.75, "y":2}, 189 {"x": 3.75, "y": 2},
182 {"label":"H", "x":6.75, "y":2}, 190 {"x": 4.75, "y": 2},
183 {"label":"J", "x":7.75, "y":2}, 191 {"x": 5.75, "y": 2},
184 {"label":"K", "x":8.75, "y":2}, 192 {"x": 6.75, "y": 2},
185 {"label":"L", "x":9.75, "y":2}, 193 {"x": 7.75, "y": 2},
186 {"label":";", "x":10.75, "y":2}, 194 {"x": 8.75, "y": 2},
187 {"label":"'", "x":11.75, "y":2}, 195 {"x": 9.75, "y": 2},
188 {"label":"Enter", "x":12.75, "y":2, "w":2.25}, 196 {"x": 10.75, "y": 2},
189 {"label":"Shift", "x":0, "y":3, "w":2.25}, 197 {"x": 11.75, "y": 2},
190 {"label":"Z", "x":2.25, "y":3}, 198 {"x": 12.75, "y": 2, "w": 2.25},
191 {"label":"X", "x":3.25, "y":3}, 199
192 {"label":"C", "x":4.25, "y":3}, 200 {"x": 0, "y": 3, "w": 2.25},
193 {"label":"V", "x":5.25, "y":3}, 201 {"x": 2.25, "y": 3},
194 {"label":"B", "x":6.25, "y":3}, 202 {"x": 3.25, "y": 3},
195 {"label":"N", "x":7.25, "y":3}, 203 {"x": 4.25, "y": 3},
196 {"label":"M", "x":8.25, "y":3}, 204 {"x": 5.25, "y": 3},
197 {"label":",", "x":9.25, "y":3}, 205 {"x": 6.25, "y": 3},
198 {"label":".", "x":10.25, "y":3}, 206 {"x": 7.25, "y": 3},
199 {"label":"/", "x":11.25, "y":3}, 207 {"x": 8.25, "y": 3},
200 {"label":"Shift", "x":12.25, "y":3, "w":2.75}, 208 {"x": 9.25, "y": 3},
201 {"label":"Ctrl", "x":0, "y":4, "w":1.25}, 209 {"x": 10.25, "y": 3},
202 {"label":"Win", "x":1.25, "y":4, "w":1.25}, 210 {"x": 11.25, "y": 3},
203 {"label":"Alt", "x":2.5, "y":4, "w":1.25}, 211 {"x": 12.25, "y": 3, "w": 2.75},
204 {"label":"Space", "x":3.75, "y":4, "w":6.25}, 212
205 {"label":"Alt", "x":10, "y":4, "w":1.25}, 213 {"x": 0, "y": 4, "w": 1.25},
206 {"label":"Win", "x":11.25, "y":4, "w":1.25}, 214 {"x": 1.25, "y": 4, "w": 1.25},
207 {"label":"Menu", "x":12.5, "y":4, "w":1.25}, 215 {"x": 2.5, "y": 4, "w": 1.25},
208 {"label":"Ctrl", "x":13.75, "y":4, "w":1.25} 216 {"x": 3.75, "y": 4, "w": 6.25},
217 {"x": 10, "y": 4, "w": 1.25},
218 {"x": 11.25, "y": 4, "w": 1.25},
219 {"x": 12.5, "y": 4, "w": 1.25},
220 {"x": 13.75, "y": 4, "w": 1.25}
209 ] 221 ]
210 } 222 }
211 } 223 }
diff --git a/keyboards/kc60/kc60.c b/keyboards/kc60/kc60.c
index 09b924b28..52059a8c4 100644
--- a/keyboards/kc60/kc60.c
+++ b/keyboards/kc60/kc60.c
@@ -1,16 +1,13 @@
1#include "kc60.h" 1#include "kc60.h"
2 2
3void led_set_kb(uint8_t usb_led) 3bool led_update_kb(led_t led_state) {
4{ 4 if (led_update_user(led_state)) {
5 if (usb_led & (1<<USB_LED_CAPS_LOCK)) { 5 if (led_state.caps_lock) {
6 // output low 6 setPinOutput(B2);
7 DDRB |= (1<<2); 7 } else {
8 PORTB &= ~(1<<2); 8 setPinInput(B2);
9 } else { 9 }
10 // Hi-Z
11 DDRB &= ~(1<<2);
12 PORTB &= ~(1<<2);
13 } 10 }
14 11
15 led_set_user(usb_led); 12 return true;
16} \ No newline at end of file 13}
diff --git a/keyboards/kc60/kc60.h b/keyboards/kc60/kc60.h
index 2f26b2c0e..79bdbd2a1 100644
--- a/keyboards/kc60/kc60.h
+++ b/keyboards/kc60/kc60.h
@@ -2,6 +2,8 @@
2 2
3#include "quantum.h" 3#include "quantum.h"
4 4
5#define XXX KC_NO
6
5/* LAYOUT_all 7/* LAYOUT_all
6 * ,-----------------------------------------------------------. 8 * ,-----------------------------------------------------------.
7 * |00 |01 |02 |03 |04 |05 |06 |07 |08 |09 |0A |0B |0C |0D |49 | 9 * |00 |01 |02 |03 |04 |05 |06 |07 |08 |09 |0A |0B |0C |0D |49 |
@@ -14,22 +16,22 @@
14 * |-----------------------------------------------------------| 16 * |-----------------------------------------------------------|
15 * |40 |41 |42 | 45 |4A |4B |4C |4D | 17 * |40 |41 |42 | 45 |4A |4B |4C |4D |
16 * `-----------------------------------------------------------' 18 * `-----------------------------------------------------------'
17 * 2u Backspace = K0D 19 * 2u Backspace = k0D
18 * 2.25u left Shift = K30 20 * 2.25u left Shift = k30
19 * 2.75u right Shift = K3D 21 * 2.75u right Shift = k3D
20 */ 22 */
21#define LAYOUT_all( \ 23#define LAYOUT_all( \
22 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K49, \ 24 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k49, \
23 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ 25 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \
24 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \ 26 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \
25 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3C, \ 27 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3C, \
26 K40, K41, K42, K45, K4A, K4B, K4C, K4D \ 28 k40, k41, k42, k45, k4A, k4B, k4C, k4D \
27) { \ 29) { \
28 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ 30 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \
29 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \ 31 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \
30 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \ 32 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D }, \
31 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \ 33 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D }, \
32 { K40, K41, K42, KC_NO, KC_NO, K45, KC_NO, KC_NO, KC_NO, K49, K4A, K4B, K4C, K4D } \ 34 { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, k4A, k4B, k4C, k4D } \
33} 35}
34 36
35/* LAYOUT 37/* LAYOUT
@@ -50,18 +52,18 @@
50 * `-----------------------------------------------------------' 52 * `-----------------------------------------------------------'
51 */ 53 */
52#define LAYOUT( \ 54#define LAYOUT( \
53 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ 55 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \
54 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ 56 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \
55 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \ 57 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \
56 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ 58 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, \
57 K40, K41, K42, K45, K49, K4A, K4B, K4C, K4D \ 59 k40, k41, k42, k45, k49, k4A, k4B, k4C, k4D \
58) LAYOUT_all( \ 60) { \
59 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K49, \ 61 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \
60 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ 62 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \
61 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \ 63 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D }, \
62 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3C, \ 64 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D }, \
63 K40, K41, K42, K45, K4A, K4B, K4C, K4D \ 65 { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, k4A, k4B, k4C, k4D } \
64) 66}
65 67
66/* LAYOUT_60_ansi 68/* LAYOUT_60_ansi
67 * ,-----------------------------------------------------------. 69 * ,-----------------------------------------------------------.
@@ -77,15 +79,15 @@
77 * `-----------------------------------------------------------' 79 * `-----------------------------------------------------------'
78 */ 80 */
79#define LAYOUT_60_ansi( \ 81#define LAYOUT_60_ansi( \
80 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ 82 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \
81 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ 83 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \
82 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \ 84 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, \
83 K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \ 85 k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, \
84 K40, K41, K42, K45, K4A, K4B, K4C, K4D \ 86 k40, k41, k42, k45, k4A, k4B, k4C, k4D \
85) { \ 87) { \
86 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ 88 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \
87 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \ 89 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \
88 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D }, \ 90 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D }, \
89 { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D }, \ 91 { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D }, \
90 { K40, K41, K42, KC_NO, KC_NO, K45, KC_NO, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D } \ 92 { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4A, k4B, k4C, k4D } \
91} 93}
diff --git a/keyboards/kc60/keymaps/default/keymap.c b/keyboards/kc60/keymaps/default/keymap.c
index d5286e351..d7d6d6eaf 100644
--- a/keyboards/kc60/keymaps/default/keymap.c
+++ b/keyboards/kc60/keymaps/default/keymap.c
@@ -2,11 +2,11 @@
2 2
3const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 3const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
4 [0] = LAYOUT_all( 4 [0] = LAYOUT_all(
5 KC_ESC, 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_BSLS, KC_GRV, 5 KC_ESC, 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_BSLS, KC_GRV,
6 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, 6 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
7 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_NUHS, KC_ENT, 7 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_NUHS, KC_ENT,
8 KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, LT(1,KC_APP), 8 KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, LT(1, KC_APP),
9 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, LT(1,KC_APP), KC_RCTL 9 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, LT(1, KC_APP), KC_RCTL
10 ), 10 ),
11 [1] = LAYOUT_all( 11 [1] = LAYOUT_all(
12 RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, XXXXXXX, XXXXXXX, 12 RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, XXXXXXX, XXXXXXX,
diff --git a/keyboards/kc60/keymaps/via/keymap.c b/keyboards/kc60/keymaps/via/keymap.c
index 5623f2333..eefa81e15 100644
--- a/keyboards/kc60/keymaps/via/keymap.c
+++ b/keyboards/kc60/keymaps/via/keymap.c
@@ -2,11 +2,11 @@
2 2
3const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 3const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
4 [0] = LAYOUT_all( 4 [0] = LAYOUT_all(
5 KC_ESC, 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_BSLS, KC_GRV, 5 KC_ESC, 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_BSLS, KC_GRV,
6 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, 6 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
7 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_NUHS, KC_ENT, 7 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_NUHS, KC_ENT,
8 KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, LT(1,KC_APP), 8 KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, LT(1, KC_APP),
9 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, LT(1,KC_APP), KC_RCTL 9 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, LT(1, KC_APP), KC_RCTL
10 ), 10 ),
11 [1] = LAYOUT_all( 11 [1] = LAYOUT_all(
12 RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, XXXXXXX, XXXXXXX, 12 RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, XXXXXXX, XXXXXXX,
diff --git a/keyboards/kc60/keymaps/ws2812/config.h b/keyboards/kc60/keymaps/ws2812/config.h
deleted file mode 100644
index ef39965b3..000000000
--- a/keyboards/kc60/keymaps/ws2812/config.h
+++ /dev/null
@@ -1,4 +0,0 @@
1#pragma once
2
3#undef RGBLED_NUM
4#define RGBLED_NUM 16 // Number of LEDs. Change this to match your use case.
diff --git a/keyboards/kc60/keymaps/ws2812/keymap.c b/keyboards/kc60/keymaps/ws2812/keymap.c
index aaefb61ca..e0a5f600e 100644
--- a/keyboards/kc60/keymaps/ws2812/keymap.c
+++ b/keyboards/kc60/keymaps/ws2812/keymap.c
@@ -2,11 +2,11 @@
2 2
3const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 3const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
4 [0] = LAYOUT_all( 4 [0] = LAYOUT_all(
5 KC_ESC, 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_BSLS, KC_GRV, 5 KC_ESC, 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_BSLS, KC_GRV,
6 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, 6 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
7 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_NUHS, KC_ENT, 7 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_NUHS, KC_ENT,
8 KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, LT(1,KC_APP), 8 KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, LT(1, KC_APP),
9 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, LT(1,KC_APP), KC_RCTL 9 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, LT(1, KC_APP), KC_RCTL
10 ), 10 ),
11 [1] = LAYOUT_all( 11 [1] = LAYOUT_all(
12 RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, XXXXXXX, XXXXXXX, 12 RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, XXXXXXX, XXXXXXX,
@@ -14,5 +14,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
14 XXXXXXX, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, KC_DEL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, XXXXXXX, XXXXXXX, XXXXXXX, 14 XXXXXXX, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, KC_DEL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, XXXXXXX, XXXXXXX, XXXXXXX,
15 _______, XXXXXXX, XXXXXXX, BL_DEC, BL_TOGG, BL_INC, BL_BRTG, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, _______, _______, 15 _______, XXXXXXX, XXXXXXX, BL_DEC, BL_TOGG, BL_INC, BL_BRTG, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, _______, _______,
16 _______, _______, _______, XXXXXXX, _______, _______, _______, _______ 16 _______, _______, _______, XXXXXXX, _______, _______, _______, _______
17 ), 17 )
18}; 18};
diff --git a/keyboards/kc60/readme.md b/keyboards/kc60/readme.md
index 71888e750..e1a999c00 100644
--- a/keyboards/kc60/readme.md
+++ b/keyboards/kc60/readme.md
@@ -12,6 +12,10 @@ Make example for this keyboard (after setting up your build environment):
12 12
13 make kc60:default 13 make kc60:default
14 14
15Flashing example for this keyboard:
16
17 make kc60:default:flash
18
15## RGB Underglow Support 19## RGB Underglow Support
16 20
17To add RGB Underglow to the KC60, see [Adding RGB Underglow to the KC60](mod_rgb_underglow.md). 21To add RGB Underglow to the KC60, see [Adding RGB Underglow to the KC60](mod_rgb_underglow.md).
diff --git a/keyboards/kc60/rules.mk b/keyboards/kc60/rules.mk
index 044233e44..8f3ab9eb5 100644
--- a/keyboards/kc60/rules.mk
+++ b/keyboards/kc60/rules.mk
@@ -2,13 +2,6 @@
2MCU = atmega32u4 2MCU = atmega32u4
3 3
4# Bootloader selection 4# Bootloader selection
5# Teensy halfkay
6# Pro Micro caterina
7# Atmel DFU atmel-dfu
8# LUFA DFU lufa-dfu
9# QMK DFU qmk-dfu
10# ATmega32A bootloadHID
11# ATmega328P USBasp
12BOOTLOADER = atmel-dfu 5BOOTLOADER = atmel-dfu
13 6
14# Build Options 7# Build Options
@@ -25,11 +18,8 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
25NKRO_ENABLE = no # USB Nkey Rollover 18NKRO_ENABLE = no # USB Nkey Rollover
26BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality 19BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
27RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow 20RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
28MIDI_ENABLE = no # MIDI support 21BLUETOOTH_ENABLE = no # Enable Bluetooth
29BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID 22AUDIO_ENABLE = no # Audio output
30AUDIO_ENABLE = no # Audio output on port C6
31FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches
32HD44780_ENABLE = no # Enable support for HD44780 based LCDs
33KEYBOARD_LOCK_ENABLE = yes # Allow locking of keyboard via magic key 23KEYBOARD_LOCK_ENABLE = yes # Allow locking of keyboard via magic key
34 24
35LAYOUTS = 60_ansi 25LAYOUTS = 60_ansi