diff options
34 files changed, 274 insertions, 171 deletions
diff --git a/keyboards/40percentclub/25/rules.mk b/keyboards/40percentclub/25/rules.mk index d01803957..8d32d2c3f 100644 --- a/keyboards/40percentclub/25/rules.mk +++ b/keyboards/40percentclub/25/rules.mk | |||
@@ -32,5 +32,3 @@ AUDIO_ENABLE = no # Audio output on port C6 | |||
32 | 32 | ||
33 | # Enable generic behavior for split boards | 33 | # Enable generic behavior for split boards |
34 | SPLIT_KEYBOARD = yes | 34 | SPLIT_KEYBOARD = yes |
35 | |||
36 | LAYOUTS = ortho_5x5 ortho_5x10 | ||
diff --git a/keyboards/40percentclub/4x4/rules.mk b/keyboards/40percentclub/4x4/rules.mk index 91b609103..f51e98ff3 100644 --- a/keyboards/40percentclub/4x4/rules.mk +++ b/keyboards/40percentclub/4x4/rules.mk | |||
@@ -29,7 +29,7 @@ UNICODE_ENABLE = no # Unicode | |||
29 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | 29 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID |
30 | AUDIO_ENABLE = no # Audio output on port C6 | 30 | AUDIO_ENABLE = no # Audio output on port C6 |
31 | 31 | ||
32 | LAYOUTS = ortho_4x4 ortho_4x8 ortho_4x12 ortho_4x16 | 32 | LAYOUTS = ortho_4x4 ortho_4x12 |
33 | 33 | ||
34 | # Disable unsupported hardware | 34 | # Disable unsupported hardware |
35 | RGBLIGHT_SUPPORTED = no | 35 | RGBLIGHT_SUPPORTED = no |
diff --git a/keyboards/40percentclub/5x5/rules.mk b/keyboards/40percentclub/5x5/rules.mk index ae36f660e..97c63a856 100644 --- a/keyboards/40percentclub/5x5/rules.mk +++ b/keyboards/40percentclub/5x5/rules.mk | |||
@@ -29,4 +29,4 @@ UNICODE_ENABLE = no # Unicode | |||
29 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | 29 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID |
30 | AUDIO_ENABLE = no # Audio output on port C6 | 30 | AUDIO_ENABLE = no # Audio output on port C6 |
31 | 31 | ||
32 | LAYOUTS = ortho_5x5 ortho_5x10 ortho_5x15 | 32 | LAYOUTS = ortho_5x15 |
diff --git a/keyboards/40percentclub/nori/rules.mk b/keyboards/40percentclub/nori/rules.mk index 1b9766581..3056c606c 100644 --- a/keyboards/40percentclub/nori/rules.mk +++ b/keyboards/40percentclub/nori/rules.mk | |||
@@ -30,7 +30,7 @@ UNICODE_ENABLE = no # Unicode | |||
30 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | 30 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID |
31 | AUDIO_ENABLE = no # Audio output on port C6 | 31 | AUDIO_ENABLE = no # Audio output on port C6 |
32 | 32 | ||
33 | LAYOUTS = ortho_4x4 ortho_4x8 ortho_4x12 | 33 | LAYOUTS = ortho_4x4 ortho_4x12 |
34 | 34 | ||
35 | # Disable unsupported hardware | 35 | # Disable unsupported hardware |
36 | AUDIO_SUPPORTED = no | 36 | AUDIO_SUPPORTED = no |
diff --git a/keyboards/barracuda/rules.mk b/keyboards/barracuda/rules.mk index 7233e7c00..09a21e9e0 100644 --- a/keyboards/barracuda/rules.mk +++ b/keyboards/barracuda/rules.mk | |||
@@ -20,5 +20,3 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality | |||
20 | RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow | 20 | RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow |
21 | BLUETOOTH_ENABLE = no # Enable Bluetooth | 21 | BLUETOOTH_ENABLE = no # Enable Bluetooth |
22 | AUDIO_ENABLE = no # Audio output | 22 | AUDIO_ENABLE = no # Audio output |
23 | |||
24 | LAYOUTS = ortho_3x11 | ||
diff --git a/keyboards/bpiphany/frosty_flake/frosty_flake.h b/keyboards/bpiphany/frosty_flake/frosty_flake.h index cc870c277..f4f69f1a3 100644 --- a/keyboards/bpiphany/frosty_flake/frosty_flake.h +++ b/keyboards/bpiphany/frosty_flake/frosty_flake.h | |||
@@ -111,12 +111,26 @@ | |||
111 | KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6, KB1, \ | 111 | KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6, KB1, \ |
112 | KN2, KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0, KN3, KO6, \ | 112 | KN2, KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0, KN3, KO6, \ |
113 | KA4, KP2, KC6, KK6, KC0, KM3, KD0, KA1, KO0, KK0, KL0 \ | 113 | KA4, KP2, KC6, KK6, KC0, KM3, KD0, KA1, KO0, KK0, KL0 \ |
114 | ) LAYOUT_tkl( \ | 114 | ) \ |
115 | KJ6, KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0, KC7, KC5, KA5, \ | 115 | { \ |
116 | KJ4, KJ7, KI7, KH7, KG7, KG4, KF4, KF7, KE7, KD7, KR7, KR4, KE4, KB2, KL4, KO4, KQ4, \ | 116 | /* 0 1 2 3 4 5 6 7 */ \ |
117 | KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2, KB3, KK4, KO7, KQ7, \ | 117 | /* A */ { KC_NO, KA1, KC_NO, KC_NO, KA4, KA5, KC_NO, KA7, }, \ |
118 | KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6, KB1, \ | 118 | /* B */ { KB0, KB1, KB2, KB3, KB4, KC_NO, KB6, KB7, }, \ |
119 | KN2, KC_NO, KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0, KN3, KO6, \ | 119 | /* C */ { KC0, KC_NO, KC_NO, KC_NO, KC_NO, KC5, KC6, KC7, }, \ |
120 | KA4, KP2, KC6, KK6, KC0, KM3, KD0, KA1, KO0, KK0, KL0 \ | 120 | /* D */ { KD0, KD1, KD2, KD3, KD4, KD5, KC_NO, KD7, }, \ |
121 | ) | 121 | /* E */ { KC_NO, KE1, KE2, KE3, KE4, KE5, KE6, KE7, }, \ |
122 | /* F */ { KF0, KF1, KF2, KF3, KF4, KF5, KF6, KF7, }, \ | ||
123 | /* G */ { KG0, KG1, KG2, KG3, KG4, KG5, KG6, KG7, }, \ | ||
124 | /* H */ { KC_NO, KH1, KH2, KH3, KH4, KH5, KH6, KH7, }, \ | ||
125 | /* I */ { KC_NO, KI1, KI2, KI3, KI4, KI5, KC_NO, KI7, }, \ | ||
126 | /* J */ { KC_NO, KJ1, KJ2, KJ3, KJ4, KJ5, KJ6, KJ7, }, \ | ||
127 | /* K */ { KK0, KC_NO, KC_NO, KC_NO, KK4, KC_NO, KK6, KC_NO, }, \ | ||
128 | /* L */ { KL0, KC_NO, KC_NO, KC_NO, KL4, KC_NO, KC_NO, KC_NO, }, \ | ||
129 | /* M */ { KC_NO, KC_NO, KC_NO, KM3, KC_NO, KC_NO, KC_NO, KC_NO, }, \ | ||
130 | /* N */ { KC_NO, KC_NO, KN2, KN3, KC_NO, KC_NO, KC_NO, KC_NO, }, \ | ||
131 | /* O */ { KO0, KC_NO, KC_NO, KC_NO, KO4, KC_NO, KO6, KO7, }, \ | ||
132 | /* P */ { KC_NO, KC_NO, KP2, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, }, \ | ||
133 | /* Q */ { KC_NO, KC_NO, KC_NO, KC_NO, KQ4, KC_NO, KC_NO, KQ7, }, \ | ||
134 | /* R */ { KR0, KC_NO, KR2, KR3, KR4, KR5, KR6, KR7, }, \ | ||
135 | } | ||
122 | 136 | ||
diff --git a/keyboards/bpiphany/pegasushoof/2013/2013.h b/keyboards/bpiphany/pegasushoof/2013/2013.h index b3e911ab4..7a4d7f0b5 100644 --- a/keyboards/bpiphany/pegasushoof/2013/2013.h +++ b/keyboards/bpiphany/pegasushoof/2013/2013.h | |||
@@ -45,14 +45,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
45 | KH2, KG3, KH3, KI3, KJ3, KJ6, KK6, KK3, KL3, KM3, KF3, KF6, KO1, \ | 45 | KH2, KG3, KH3, KI3, KJ3, KJ6, KK6, KK3, KL3, KM3, KF3, KF6, KO1, \ |
46 | KB2, KG1, KH1, KI1, KJ1, KJ0, KK0, KK1, KL1, KM1, KF0, KB3, KC6, \ | 46 | KB2, KG1, KH1, KI1, KJ1, KJ0, KK0, KK1, KL1, KM1, KF0, KB3, KC6, \ |
47 | KP4, KD2, KN6, KQ6, KN0, KA3, KM0, KP1, KC0, KQ0, KR0 \ | 47 | KP4, KD2, KN6, KQ6, KN0, KA3, KM0, KP1, KC0, KQ0, KR0 \ |
48 | ) LAYOUT( \ | 48 | ) { /* 00-A 01-B 02-C 03-D 04-E 05-F 06-G 07-H 08-I 09-J 10-K 11-L 12-M 13-N 14-O 15-P 16-Q 17-R */ \ |
49 | KG6, KH4, KI4, KI2, KI6, KP5, KL6, KM2, KM4, KO4, KO5, KO6, KO0, KN5, KN7, KP7, \ | 49 | /* 0 */ { KC_NO , KC_NO , KC0 , KC_NO , KC_NO , KF0 , KC_NO , KC_NO , KC_NO , KJ0 , KK0 , KC_NO , KM0 , KN0 , KO0 , KC_NO , KQ0 , KR0 }, \ |
50 | KG4, KG5, KH5, KI5, KJ5, KJ4, KK4, KK5, KL5, KM5, KF5, KF4, KL4, KO2, KR4, KC4, KE4, \ | 50 | /* 1 */ { KC_NO , KC_NO , KC_NO , KC_NO , KC_NO , KC_NO , KG1 , KH1 , KI1 , KJ1 , KK1 , KL1 , KM1 , KC_NO , KO1 , KP1 , KC_NO , KC_NO }, \ |
51 | KG2, KG7, KH7, KI7, KJ7, KJ2, KK2, KK7, KL7, KM7, KF7, KF2, KL2, KO3, KQ4, KC5, KE5, \ | 51 | /* 2 */ { KC_NO , KB2 , KC_NO , KD2 , KC_NO , KF2 , KG2 , KH2 , KI2 , KJ2 , KK2 , KL2 , KM2 , KC_NO , KO2 , KC_NO , KC_NO , KC_NO }, \ |
52 | KH2, KG3, KH3, KI3, KJ3, KJ6, KK6, KK3, KL3, KM3, KF3, KF6, KO1, \ | 52 | /* 3 */ { KA3 , KB3 , KC_NO , KC_NO , KC_NO , KF3 , KG3 , KH3 , KI3 , KJ3 , KK3 , KL3 , KM3 , KC_NO , KO3 , KC_NO , KC_NO , KC_NO }, \ |
53 | KB2,KC_NO,KG1, KH1, KI1, KJ1, KJ0, KK0, KK1, KL1, KM1, KF0, KB3, KC6, \ | 53 | /* 4 */ { KC_NO , KC_NO , KC4 , KC_NO , KE4 , KF4 , KG4 , KH4 , KI4 , KJ4 , KK4 , KL4 , KM4 , KC_NO , KO4 , KP4 , KQ4 , KR4 }, \ |
54 | KP4, KD2, KN6, KQ6, KN0, KA3, KM0, KP1, KC0, KQ0, KR0 \ | 54 | /* 5 */ { KC_NO , KC_NO , KC5 , KC_NO , KE5 , KF5 , KG5 , KH5 , KI5 , KJ5 , KK5 , KL5 , KM5 , KN5 , KO5 , KP5 , KC_NO , KC_NO }, \ |
55 | ) | 55 | /* 6 */ { KC_NO , KC_NO , KC6 , KC_NO , KC_NO , KF6 , KG6 , KC_NO , KI6 , KJ6 , KK6 , KL6 , KC_NO , KN6 , KO6 , KC_NO , KQ6 , KC_NO }, \ |
56 | /* 7 */ { KC_NO , KC_NO , KC_NO , KC_NO , KC_NO , KF7 , KG7 , KH7 , KI7 , KJ7 , KK7 , KL7 , KM7 , KN7 , KC_NO , KP7 , KC_NO , KC_NO } \ | ||
57 | } | ||
56 | 58 | ||
57 | #define LAYOUT_tkl_jis( \ | 59 | #define LAYOUT_tkl_jis( \ |
58 | KG6, KH4, KI4, KI2, KI6, KP5, KL6, KM2, KM4, KO4, KO5, KO6, KO0, KN5, KN7, KP7, \ | 60 | KG6, KH4, KI4, KI2, KI6, KP5, KL6, KM2, KM4, KO4, KO5, KO6, KO0, KN5, KN7, KP7, \ |
diff --git a/keyboards/bpiphany/pegasushoof/2015/2015.h b/keyboards/bpiphany/pegasushoof/2015/2015.h index 8a0084d40..418772aa2 100644 --- a/keyboards/bpiphany/pegasushoof/2015/2015.h +++ b/keyboards/bpiphany/pegasushoof/2015/2015.h | |||
@@ -47,14 +47,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
47 | KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6, KB1, \ | 47 | KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6, KB1, \ |
48 | KN2, KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0, KN3, KO6, \ | 48 | KN2, KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0, KN3, KO6, \ |
49 | KA4, KP2, KC6, KK6, KC0, KM3, KD0, KA1, KO0, KK0, KL0 \ | 49 | KA4, KP2, KC6, KK6, KC0, KM3, KD0, KA1, KO0, KK0, KL0 \ |
50 | ) LAYOUT( \ | 50 | ) { /* 00-A 01-B 02-C 03-D 04-E 05-F 06-G 07-H 08-I 09-J 10-K 11-L 12-M 13-N 14-O 15-P 16-Q 17-R */ \ |
51 | KJ6, KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0, KC7, KC5, KA5, \ | 51 | /* 0 */ { ___ , KB0 , KC0 , KD0 , ___ , KF0 , KG0 , ___ , ___ , ___ , KK0 , KL0 , ___ , ___ , KO0 , ___ , ___ , KR0 }, \ |
52 | KJ4, KJ7, KI7, KH7, KG7, KG4, KF4, KF7, KE7, KD7, KR7, KR4, KE4, KB2, KL4, KO4, KQ4, \ | 52 | /* 1 */ { KA1 , KB1 , ___ , KD1 , KE1 , KF1 , KG1 , KH1 , KI1 , KJ1 , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ }, \ |
53 | KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2, KB3, KK4, KO7, KQ7, \ | 53 | /* 2 */ { ___ , KB2 , ___ , KD2 , KE2 , KF2 , KG2 , KH2 , KI2 , KJ2 , ___ , ___ , ___ , KN2 , ___ , KP2 , ___ , KR2 }, \ |
54 | KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6, KB1, \ | 54 | /* 3 */ { ___ , KB3 , ___ , KD3 , KE3 , KF3 , KG3 , KH3 , KI3 , KJ3 , ___ , ___ , KM3 , KN3 , ___ , ___ , ___ , KR3 }, \ |
55 | KN2,KC_NO,KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0, KN3, KO6, \ | 55 | /* 4 */ { KA4 , KB4 , ___ , KD4 , KE4 , KF4 , KG4 , KH4 , KI4 , KJ4 , KK4 , KL4 , ___ , ___ , KO4 , ___ , KQ4 , KR4 }, \ |
56 | KA4, KP2, KC6, KK6, KC0, KM3, KD0, KA1, KO0, KK0, KL0 \ | 56 | /* 5 */ { KA5 , ___ , KC5 , KD5 , KE5 , KF5 , KG5 , KH5 , KI5 , KJ5 , ___ , ___ , ___ , ___ , ___ , ___ , ___ , KR5 }, \ |
57 | ) | 57 | /* 6 */ { ___ , KB6 , KC6 , ___ , KE6 , KF6 , KG6 , KH6 , ___ , KJ6 , KK6 , ___ , ___ , ___ , KO6 , ___ , ___ , KR6 }, \ |
58 | /* 7 */ { KA7 , KB7 , KC7 , KD7 , KE7 , KF7 , KG7 , KH7 , KI7 , KJ7 , ___ , ___ , ___ , ___ , KO7 , ___ , KQ7 , KR7 } \ | ||
59 | } | ||
58 | 60 | ||
59 | #define LAYOUT_tkl_iso( \ | 61 | #define LAYOUT_tkl_iso( \ |
60 | KJ6, KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0, KC7, KC5, KA5, \ | 62 | KJ6, KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0, KC7, KC5, KA5, \ |
@@ -63,14 +65,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
63 | KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6, KB3, KB1, \ | 65 | KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6, KB3, KB1, \ |
64 | KN2, KI6, KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0, KN3, KO6, \ | 66 | KN2, KI6, KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0, KN3, KO6, \ |
65 | KA4, KP2, KC6, KK6, KC0, KM3, KD0, KA1, KO0, KK0, KL0 \ | 67 | KA4, KP2, KC6, KK6, KC0, KM3, KD0, KA1, KO0, KK0, KL0 \ |
66 | ) LAYOUT( \ | 68 | ) { /* 00-A 01-B 02-C 03-D 04-E 05-F 06-G 07-H 08-I 09-J 10-K 11-L 12-M 13-N 14-O 15-P 16-Q 17-R */ \ |
67 | KJ6, KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0, KC7, KC5, KA5, \ | 69 | /* 0 */ { ___ , KB0 , KC0 , KD0 , ___ , KF0 , KG0 , ___ , ___ , ___ , KK0 , KL0 , ___ , ___ , KO0 , ___ , ___ , KR0 }, \ |
68 | KJ4, KJ7, KI7, KH7, KG7, KG4, KF4, KF7, KE7, KD7, KR7, KR4, KE4, KB2, KL4, KO4, KQ4, \ | 70 | /* 1 */ { KA1 , KB1 , ___ , KD1 , KE1 , KF1 , KG1 , KH1 , KI1 , KJ1 , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ }, \ |
69 | KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2, KB3, KK4, KO7, KQ7, \ | 71 | /* 2 */ { ___ , KB2 , ___ , KD2 , KE2 , KF2 , KG2 , KH2 , KI2 , KJ2 , ___ , ___ , ___ , KN2 , ___ , KP2 , ___ , KR2 }, \ |
70 | KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6, KB1, \ | 72 | /* 3 */ { ___ , KB3 , ___ , KD3 , KE3 , KF3 , KG3 , KH3 , KI3 , KJ3 , ___ , ___ , KM3 , KN3 , ___ , ___ , ___ , KR3 }, \ |
71 | KN2, KI6 ,KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0, KN3, KO6, \ | 73 | /* 4 */ { KA4 , KB4 , ___ , KD4 , KE4 , KF4 , KG4 , KH4 , KI4 , KJ4 , KK4 , KL4 , ___ , ___ , KO4 , ___ , KQ4 , KR4 }, \ |
72 | KA4, KP2, KC6, KK6, KC0, KM3, KD0, KA1, KO0, KK0, KL0 \ | 74 | /* 5 */ { KA5 , ___ , KC5 , KD5 , KE5 , KF5 , KG5 , KH5 , KI5 , KJ5 , ___ , ___ , ___ , ___ , ___ , ___ , ___ , KR5 }, \ |
73 | ) | 75 | /* 6 */ { ___ , KB6 , KC6 , ___ , KE6 , KF6 , KG6 , KH6 , KI6 , KJ6 , KK6 , ___ , ___ , ___ , KO6 , ___ , ___ , KR6 }, \ |
76 | /* 7 */ { KA7 , KB7 , KC7 , KD7 , KE7 , KF7 , KG7 , KH7 , KI7 , KJ7 , ___ , ___ , ___ , ___ , KO7 , ___ , KQ7 , KR7 } \ | ||
77 | } | ||
74 | 78 | ||
75 | #define LAYOUT_tkl_jis( \ | 79 | #define LAYOUT_tkl_jis( \ |
76 | KJ6, KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0, KC7, KC5, KA5, \ | 80 | KJ6, KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0, KC7, KC5, KA5, \ |
diff --git a/keyboards/converter/usb_usb/usb_usb.h b/keyboards/converter/usb_usb/usb_usb.h index e0c7c9c0d..1d1b6770d 100644 --- a/keyboards/converter/usb_usb/usb_usb.h +++ b/keyboards/converter/usb_usb/usb_usb.h | |||
@@ -127,15 +127,40 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
127 | K39,K04,K16,K07,K09,K0A,K0B,K0D,K0E,K0F,K33,K34, K28, K5C,K5D,K5E,K57, \ | 127 | K39,K04,K16,K07,K09,K0A,K0B,K0D,K0E,K0F,K33,K34, K28, K5C,K5D,K5E,K57, \ |
128 | KE1,K1D,K1B,K06,K19,K05,K11,K10,K36,K37,K38, KE5, K52, K59,K5A,K5B, \ | 128 | KE1,K1D,K1B,K06,K19,K05,K11,K10,K36,K37,K38, KE5, K52, K59,K5A,K5B, \ |
129 | KE0,KE3,KE2, K2C, KE6,KE7,K65,KE4, K50,K51,K4F, K62, K63,K58 \ | 129 | KE0,KE3,KE2, K2C, KE6,KE7,K65,KE4, K50,K51,K4F, K62, K63,K58 \ |
130 | ) LAYOUT_all( \ | 130 | ) { \ |
131 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ | 131 | { KC_NO, KC_NO, KC_NO, KC_NO, K04, K05, K06, K07, /* 00-07 */ \ |
132 | K29, K3A, K3B, K3C, K3D, K3E, K3F, K40, K41, K42, K43, K44, K45, K46, K47, K48, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ | 132 | K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, /* 08-0F */ \ |
133 | K35, K1E, K1F, K20, K21, K22, K23, K24, K25, K26, K27, K2D, K2E, KC_NO, K2A, K49, K4A, K4B, K53, K54, K55, K56, KC_NO, KC_NO, \ | 133 | { K10, K11, K12, K13, K14, K15, K16, K17, /* 10-17 */ \ |
134 | K2B, K14, K1A, K08, K15, K17, K1C, K18, K0C, K12, K13, K2F, K30, K31, K4C, K4D, K4E, K5F, K60, K61, K57, KC_NO, KC_NO, \ | 134 | K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, /* 18-1F */ \ |
135 | K39, K04, K16, K07, K09, K0A, K0B, K0D, K0E, K0F, K33, K34, KC_NO, K28, K5C, K5D, K5E, KC_NO, KC_NO, KC_NO, \ | 135 | { K20, K21, K22, K23, K24, K25, K26, K27, /* 20-27 */ \ |
136 | KE1, KC_NO, K1D, K1B, K06, K19, K05, K11, K10, K36, K37, K38, KC_NO, KE5, K52, K59, K5A, K5B, KC_NO, KC_NO, KC_NO, \ | 136 | K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, /* 28-2F */ \ |
137 | KE0, KE3, KE2, KC_NO, KC_NO, K2C, KC_NO, KC_NO, KC_NO, KE6, KE7, K65, KE4, K50, K51, K4F, K62, K63, K58, KC_NO, KC_NO \ | 137 | { K30, K31, KC_NO, K33, K34, K35, K36, K37, /* 30-37 */ \ |
138 | ) | 138 | K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, /* 38-3F */ \ |
139 | { K40, K41, K42, K43, K44, K45, K46, K47, /* 40-47 */ \ | ||
140 | K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, /* 48-4F */ \ | ||
141 | { K50, K51, K52, K53, K54, K55, K56, K57, /* 50-57 */ \ | ||
142 | K58, K59, K5A, K5B, K5C, K5D, K5E, K5F }, /* 58-5F */ \ | ||
143 | { K60, K61, K62, K63, KC_NO, K65, KC_NO, KC_NO, /* 60-67 */ \ | ||
144 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, }, /* 68-6F */ \ | ||
145 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* 70-77 */ \ | ||
146 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, }, /* 78-7F */ \ | ||
147 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* 80-87 */ \ | ||
148 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* 88-8F */ \ | ||
149 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* 90-97 */ \ | ||
150 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* 98-9F */ \ | ||
151 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* A0-A7 */ \ | ||
152 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* A8-AF */ \ | ||
153 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* B0-B7 */ \ | ||
154 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* B8-BF */ \ | ||
155 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* C0-C7 */ \ | ||
156 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* C8-CF */ \ | ||
157 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* D0-D7 */ \ | ||
158 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* D8-DF */ \ | ||
159 | { KE0, KE1, KE2, KE3, KE4, KE5, KE6, KE7, /* E0-E7 */ \ | ||
160 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* E8-EF */ \ | ||
161 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* F0-F7 */ \ | ||
162 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* F8-FF */ \ | ||
163 | } | ||
139 | 164 | ||
140 | /* ,---. ,---------------. ,---------------. ,---------------. ,-----------. | 165 | /* ,---. ,---------------. ,---------------. ,---------------. ,-----------. |
141 | * |Esc| |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau| | 166 | * |Esc| |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau| |
@@ -159,15 +184,40 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
159 | K39,K04,K16,K07,K09,K0A,K0B,K0D,K0E,K0F,K33,K34,K32, K5C,K5D,K5E, \ | 184 | K39,K04,K16,K07,K09,K0A,K0B,K0D,K0E,K0F,K33,K34,K32, K5C,K5D,K5E, \ |
160 | KE1,K64,K1D,K1B,K06,K19,K05,K11,K10,K36,K37,K38, KE5, K52, K59,K5A,K5B,K58, \ | 185 | KE1,K64,K1D,K1B,K06,K19,K05,K11,K10,K36,K37,K38, KE5, K52, K59,K5A,K5B,K58, \ |
161 | KE0,KE3,KE2, K2C, KE6,KE7,K65,KE4, K50,K51,K4F, K62, K63 \ | 186 | KE0,KE3,KE2, K2C, KE6,KE7,K65,KE4, K50,K51,K4F, K62, K63 \ |
162 | ) LAYOUT_all( \ | 187 | ) { \ |
163 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ | 188 | { KC_NO, KC_NO, KC_NO, KC_NO, K04, K05, K06, K07, /* 00-07 */ \ |
164 | K29, K3A, K3B, K3C, K3D, K3E, K3F, K40, K41, K42, K43, K44, K45, K46, K47, K48, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ | 189 | K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, /* 08-0F */ \ |
165 | K35, K1E, K1F, K20, K21, K22, K23, K24, K25, K26, K27, K2D, K2E, KC_NO, K2A, K49, K4A, K4B, K53, K54, K55, K56, KC_NO, KC_NO, \ | 190 | { K10, K11, K12, K13, K14, K15, K16, K17, /* 10-17 */ \ |
166 | K2B, K14, K1A, K08, K15, K17, K1C, K18, K0C, K12, K13, K2F, K30, K32, K4C, K4D, K4E, K5F, K60, K61, K57, KC_NO, KC_NO, \ | 191 | K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, /* 18-1F */ \ |
167 | K39, K04, K16, K07, K09, K0A, K0B, K0D, K0E, K0F, K33, K34, K32, K28, K5C, K5D, K5E, KC_NO, KC_NO, KC_NO, \ | 192 | { K20, K21, K22, K23, K24, K25, K26, K27, /* 20-27 */ \ |
168 | KE1, K64, K1D, K1B, K06, K19, K05, K11, K10, K36, K37, K38, KC_NO, KE5, K52, K59, K5A, K5B, KC_NO, KC_NO, KC_NO, \ | 193 | K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, /* 28-2F */ \ |
169 | KE0, KE3, KE2, KC_NO, KC_NO, K2C, KC_NO, KC_NO, KC_NO, KE6, KE7, K65, KE4, K50, K51, K4F, K62, K63, K58, KC_NO, KC_NO \ | 194 | { K30, K31, K32, K33, K34, K35, K36, K37, /* 30-37 */ \ |
170 | ) | 195 | K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, /* 38-3F */ \ |
196 | { K40, K41, K42, K43, K44, K45, K46, K47, /* 40-47 */ \ | ||
197 | K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, /* 48-4F */ \ | ||
198 | { K50, K51, K52, K53, K54, K55, K56, K57, /* 50-57 */ \ | ||
199 | K58, K59, K5A, K5B, K5C, K5D, K5E, K5F }, /* 58-5F */ \ | ||
200 | { K60, K61, K62, K63, K64, K65, KC_NO, KC_NO, /* 60-67 */ \ | ||
201 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, }, /* 68-6F */ \ | ||
202 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* 70-77 */ \ | ||
203 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, }, /* 78-7F */ \ | ||
204 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* 80-87 */ \ | ||
205 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* 88-8F */ \ | ||
206 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* 90-97 */ \ | ||
207 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* 98-9F */ \ | ||
208 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* A0-A7 */ \ | ||
209 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* A8-AF */ \ | ||
210 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* B0-B7 */ \ | ||
211 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* B8-BF */ \ | ||
212 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* C0-C7 */ \ | ||
213 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* C8-CF */ \ | ||
214 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* D0-D7 */ \ | ||
215 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* D8-DF */ \ | ||
216 | { KE0, KE1, KE2, KE3, KE4, KE5, KE6, KE7, /* E0-E7 */ \ | ||
217 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* E8-EF */ \ | ||
218 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* F0-F7 */ \ | ||
219 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* F8-FF */ \ | ||
220 | } | ||
171 | 221 | ||
172 | /* ,---. ,---------------. ,---------------. ,---------------. ,-----------. | 222 | /* ,---. ,---------------. ,---------------. ,---------------. ,-----------. |
173 | * |Esc| |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau| | 223 | * |Esc| |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau| |
@@ -191,13 +241,38 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
191 | K39,K04,K16,K07,K09,K0A,K0B,K0D,K0E,K0F,K33,K34,K32, K5C,K5D,K5E, \ | 241 | K39,K04,K16,K07,K09,K0A,K0B,K0D,K0E,K0F,K33,K34,K32, K5C,K5D,K5E, \ |
192 | KE1,K1D,K1B,K06,K19,K05,K11,K10,K36,K37,K38, K87,KE5, K52, K59,K5A,K5B,K58, \ | 242 | KE1,K1D,K1B,K06,K19,K05,K11,K10,K36,K37,K38, K87,KE5, K52, K59,K5A,K5B,K58, \ |
193 | KE0,KE3,KE2,K8B, K2C, K8A,K88,KE6,KE7,K65,KE4, K50,K51,K4F, K62, K63 \ | 243 | KE0,KE3,KE2,K8B, K2C, K8A,K88,KE6,KE7,K65,KE4, K50,K51,K4F, K62, K63 \ |
194 | ) LAYOUT_all( \ | 244 | ) { \ |
195 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ | 245 | { KC_NO, KC_NO, KC_NO, KC_NO, K04, K05, K06, K07, /* 00-07 */ \ |
196 | K29, K3A, K3B, K3C, K3D, K3E, K3F, K40, K41, K42, K43, K44, K45, K46, K47, K48, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ | 246 | K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, /* 08-0F */ \ |
197 | K35, K1E, K1F, K20, K21, K22, K23, K24, K25, K26, K27, K2D, K2E, K89, K2A, K49, K4A, K4B, K53, K54, K55, K56, KC_NO, KC_NO, \ | 247 | { K10, K11, K12, K13, K14, K15, K16, K17, /* 10-17 */ \ |
198 | K2B, K14, K1A, K08, K15, K17, K1C, K18, K0C, K12, K13, K2F, K30, K32, K4C, K4D, K4E, K5F, K60, K61, K57, KC_NO, KC_NO, \ | 248 | K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, /* 18-1F */ \ |
199 | K39, K04, K16, K07, K09, K0A, K0B, K0D, K0E, K0F, K33, K34, K32, K28, K5C, K5D, K5E, KC_NO, KC_NO, KC_NO, \ | 249 | { K20, K21, K22, K23, K24, K25, K26, K27, /* 20-27 */ \ |
200 | KE1, KC_NO, K1D, K1B, K06, K19, K05, K11, K10, K36, K37, K38, K87, KE5, K52, K59, K5A, K5B, KC_NO, KC_NO, KC_NO, \ | 250 | K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, /* 28-2F */ \ |
201 | KE0, KE3, KE2, K8B, KC_NO, K2C, KC_NO, K8A, K88, KE6, KE7, K65, KE4, K50, K51, K4F, K62, K63, K58, KC_NO, KC_NO \ | 251 | { K30, K31, K32, K33, K34, K35, K36, K37, /* 30-37 */ \ |
202 | ) | 252 | K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, /* 38-3F */ \ |
253 | { K40, K41, K42, K43, K44, K45, K46, K47, /* 40-47 */ \ | ||
254 | K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, /* 48-4F */ \ | ||
255 | { K50, K51, K52, K53, K54, K55, K56, K57, /* 50-57 */ \ | ||
256 | K58, K59, K5A, K5B, K5C, K5D, K5E, K5F }, /* 58-5F */ \ | ||
257 | { K60, K61, K62, K63, K64, K65, KC_NO, KC_NO, /* 60-67 */ \ | ||
258 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, }, /* 68-6F */ \ | ||
259 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* 70-77 */ \ | ||
260 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, }, /* 78-7F */ \ | ||
261 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K87, /* 80-87 */ \ | ||
262 | K88, K89, K8A, K8B, KC_NO, KC_NO, KC_NO, KC_NO }, /* 88-8F */ \ | ||
263 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* 90-97 */ \ | ||
264 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* 98-9F */ \ | ||
265 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* A0-A7 */ \ | ||
266 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* A8-AF */ \ | ||
267 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* B0-B7 */ \ | ||
268 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* B8-BF */ \ | ||
269 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* C0-C7 */ \ | ||
270 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* C8-CF */ \ | ||
271 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* D0-D7 */ \ | ||
272 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* D8-DF */ \ | ||
273 | { KE0, KE1, KE2, KE3, KE4, KE5, KE6, KE7, /* E0-E7 */ \ | ||
274 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* E8-EF */ \ | ||
275 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* F0-F7 */ \ | ||
276 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* F8-FF */ \ | ||
277 | } | ||
203 | #endif | 278 | #endif |
diff --git a/keyboards/ergo42/rules.mk b/keyboards/ergo42/rules.mk index b593de2be..29e7cf2b7 100644 --- a/keyboards/ergo42/rules.mk +++ b/keyboards/ergo42/rules.mk | |||
@@ -31,6 +31,4 @@ AUDIO_ENABLE = no # Audio output on port C6 | |||
31 | 31 | ||
32 | SPLIT_KEYBOARD = yes | 32 | SPLIT_KEYBOARD = yes |
33 | 33 | ||
34 | LAYOUTS = ortho_4x14 | ||
35 | |||
36 | DEFAULT_FOLDER = ergo42/rev1 | 34 | DEFAULT_FOLDER = ergo42/rev1 |
diff --git a/keyboards/handwired/412_64/rules.mk b/keyboards/handwired/412_64/rules.mk index 044a6d01e..bf8ddad45 100644 --- a/keyboards/handwired/412_64/rules.mk +++ b/keyboards/handwired/412_64/rules.mk | |||
@@ -28,5 +28,3 @@ MIDI_ENABLE = no # MIDI support (+2400 to 4200, depending on config) | |||
28 | UNICODE_ENABLE = no # Unicode | 28 | UNICODE_ENABLE = no # Unicode |
29 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | 29 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID |
30 | AUDIO_ENABLE = no # Audio output on port C6 | 30 | AUDIO_ENABLE = no # Audio output on port C6 |
31 | |||
32 | LAYOUTS = ortho_4x16 | ||
diff --git a/keyboards/handwired/tritium_numpad/rules.mk b/keyboards/handwired/tritium_numpad/rules.mk index 42dfc5cbe..ddb43bdb5 100644 --- a/keyboards/handwired/tritium_numpad/rules.mk +++ b/keyboards/handwired/tritium_numpad/rules.mk | |||
@@ -27,4 +27,4 @@ AUDIO_ENABLE = no | |||
27 | UNICODE_ENABLE = no # Unicode | 27 | UNICODE_ENABLE = no # Unicode |
28 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | 28 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID |
29 | 29 | ||
30 | LAYOUTS = numpad_6x4 ortho_6x4 nontra_6x4 | 30 | LAYOUTS = numpad_6x4 ortho_6x4 |
diff --git a/keyboards/handwired/xealous/rules.mk b/keyboards/handwired/xealous/rules.mk index 2d816ab7c..93dd6cf23 100644 --- a/keyboards/handwired/xealous/rules.mk +++ b/keyboards/handwired/xealous/rules.mk | |||
@@ -36,6 +36,4 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | |||
36 | SRC += matrix.c | 36 | SRC += matrix.c |
37 | DEBOUNCE_TYPE = eager_pk | 37 | DEBOUNCE_TYPE = eager_pk |
38 | 38 | ||
39 | LAYOUTS = split60 | ||
40 | |||
41 | DEFAULT_FOLDER = handwired/xealous/rev1 | 39 | DEFAULT_FOLDER = handwired/xealous/rev1 |
diff --git a/keyboards/kbdfans/kbd67/rev2/info.json b/keyboards/kbdfans/kbd67/rev2/info.json index b5cc79654..208a13c58 100644 --- a/keyboards/kbdfans/kbd67/rev2/info.json +++ b/keyboards/kbdfans/kbd67/rev2/info.json | |||
@@ -235,7 +235,7 @@ | |||
235 | {"x":14, "y":4}, | 235 | {"x":14, "y":4}, |
236 | {"x":15, "y":4}] | 236 | {"x":15, "y":4}] |
237 | }, | 237 | }, |
238 | "LAYOUT_65_ansi_blocker_splitbs": { | 238 | "LAYOUT_65_ansi_blocker_split_bs": { |
239 | "layout": [ | 239 | "layout": [ |
240 | {"x":0, "y":0}, | 240 | {"x":0, "y":0}, |
241 | {"x":1, "y":0}, | 241 | {"x":1, "y":0}, |
diff --git a/keyboards/keebio/nyquist/nyquist.h b/keyboards/keebio/nyquist/nyquist.h index 25da44172..63d7680f0 100644 --- a/keyboards/keebio/nyquist/nyquist.h +++ b/keyboards/keebio/nyquist/nyquist.h | |||
@@ -11,17 +11,3 @@ | |||
11 | #endif | 11 | #endif |
12 | 12 | ||
13 | #include "quantum.h" | 13 | #include "quantum.h" |
14 | |||
15 | #define LAYOUT_ortho_4x12( \ | ||
16 | L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ | ||
17 | L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ | ||
18 | L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ | ||
19 | L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \ | ||
20 | ) \ | ||
21 | LAYOUT_ortho_5x12( \ | ||
22 | L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ | ||
23 | L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ | ||
24 | L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ | ||
25 | L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \ | ||
26 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO \ | ||
27 | ) | ||
diff --git a/keyboards/keebio/nyquist/rev1/rev1.h b/keyboards/keebio/nyquist/rev1/rev1.h index 20f53b3b4..5896a826c 100644 --- a/keyboards/keebio/nyquist/rev1/rev1.h +++ b/keyboards/keebio/nyquist/rev1/rev1.h | |||
@@ -34,6 +34,22 @@ | |||
34 | { R35, R34, R33, R32, R31, R30 }, \ | 34 | { R35, R34, R33, R32, R31, R30 }, \ |
35 | { R45, R44, R43, R42, R41, R40 } \ | 35 | { R45, R44, R43, R42, R41, R40 } \ |
36 | } | 36 | } |
37 | #define LAYOUT_ortho_4x12( \ | ||
38 | L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ | ||
39 | L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ | ||
40 | L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ | ||
41 | L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \ | ||
42 | ) \ | ||
43 | { \ | ||
44 | { L00, L01, L02, L03, L04, L05 }, \ | ||
45 | { L10, L11, L12, L13, L14, L15 }, \ | ||
46 | { L20, L21, L22, L23, L24, L25 }, \ | ||
47 | { L30, L31, L32, L33, L34, L35 }, \ | ||
48 | { R05, R04, R03, R02, R01, R00 }, \ | ||
49 | { R15, R14, R13, R12, R11, R10 }, \ | ||
50 | { R25, R24, R23, R22, R21, R20 }, \ | ||
51 | { R35, R34, R33, R32, R31, R30 } \ | ||
52 | } | ||
37 | #else | 53 | #else |
38 | // Keymap with right side flipped | 54 | // Keymap with right side flipped |
39 | // (TRRS jack on both halves are to the right) | 55 | // (TRRS jack on both halves are to the right) |
@@ -56,6 +72,22 @@ | |||
56 | { R30, R31, R32, R33, R34, R35 }, \ | 72 | { R30, R31, R32, R33, R34, R35 }, \ |
57 | { R40, R41, R42, R43, R44, R45 } \ | 73 | { R40, R41, R42, R43, R44, R45 } \ |
58 | } | 74 | } |
75 | #define LAYOUT_ortho_4x12( \ | ||
76 | L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ | ||
77 | L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ | ||
78 | L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ | ||
79 | L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \ | ||
80 | ) \ | ||
81 | { \ | ||
82 | { L00, L01, L02, L03, L04, L05 }, \ | ||
83 | { L10, L11, L12, L13, L14, L15 }, \ | ||
84 | { L20, L21, L22, L23, L24, L25 }, \ | ||
85 | { L30, L31, L32, L33, L34, L35 }, \ | ||
86 | { R00, R01, R02, R03, R04, R05 }, \ | ||
87 | { R10, R11, R12, R13, R14, R15 }, \ | ||
88 | { R20, R21, R22, R23, R24, R25 }, \ | ||
89 | { R30, R31, R32, R33, R34, R35 } \ | ||
90 | } | ||
59 | #endif | 91 | #endif |
60 | 92 | ||
61 | #define LAYOUT_ortho_5x12 LAYOUT | 93 | #define LAYOUT_ortho_5x12 LAYOUT |
diff --git a/keyboards/keebio/nyquist/rev2/rev2.h b/keyboards/keebio/nyquist/rev2/rev2.h index 20f53b3b4..5896a826c 100644 --- a/keyboards/keebio/nyquist/rev2/rev2.h +++ b/keyboards/keebio/nyquist/rev2/rev2.h | |||
@@ -34,6 +34,22 @@ | |||
34 | { R35, R34, R33, R32, R31, R30 }, \ | 34 | { R35, R34, R33, R32, R31, R30 }, \ |
35 | { R45, R44, R43, R42, R41, R40 } \ | 35 | { R45, R44, R43, R42, R41, R40 } \ |
36 | } | 36 | } |
37 | #define LAYOUT_ortho_4x12( \ | ||
38 | L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ | ||
39 | L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ | ||
40 | L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ | ||
41 | L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \ | ||
42 | ) \ | ||
43 | { \ | ||
44 | { L00, L01, L02, L03, L04, L05 }, \ | ||
45 | { L10, L11, L12, L13, L14, L15 }, \ | ||
46 | { L20, L21, L22, L23, L24, L25 }, \ | ||
47 | { L30, L31, L32, L33, L34, L35 }, \ | ||
48 | { R05, R04, R03, R02, R01, R00 }, \ | ||
49 | { R15, R14, R13, R12, R11, R10 }, \ | ||
50 | { R25, R24, R23, R22, R21, R20 }, \ | ||
51 | { R35, R34, R33, R32, R31, R30 } \ | ||
52 | } | ||
37 | #else | 53 | #else |
38 | // Keymap with right side flipped | 54 | // Keymap with right side flipped |
39 | // (TRRS jack on both halves are to the right) | 55 | // (TRRS jack on both halves are to the right) |
@@ -56,6 +72,22 @@ | |||
56 | { R30, R31, R32, R33, R34, R35 }, \ | 72 | { R30, R31, R32, R33, R34, R35 }, \ |
57 | { R40, R41, R42, R43, R44, R45 } \ | 73 | { R40, R41, R42, R43, R44, R45 } \ |
58 | } | 74 | } |
75 | #define LAYOUT_ortho_4x12( \ | ||
76 | L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ | ||
77 | L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ | ||
78 | L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ | ||
79 | L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \ | ||
80 | ) \ | ||
81 | { \ | ||
82 | { L00, L01, L02, L03, L04, L05 }, \ | ||
83 | { L10, L11, L12, L13, L14, L15 }, \ | ||
84 | { L20, L21, L22, L23, L24, L25 }, \ | ||
85 | { L30, L31, L32, L33, L34, L35 }, \ | ||
86 | { R00, R01, R02, R03, R04, R05 }, \ | ||
87 | { R10, R11, R12, R13, R14, R15 }, \ | ||
88 | { R20, R21, R22, R23, R24, R25 }, \ | ||
89 | { R30, R31, R32, R33, R34, R35 } \ | ||
90 | } | ||
59 | #endif | 91 | #endif |
60 | 92 | ||
61 | #define LAYOUT_ortho_5x12 LAYOUT | 93 | #define LAYOUT_ortho_5x12 LAYOUT |
diff --git a/keyboards/keebio/nyquist/rev3/rev3.h b/keyboards/keebio/nyquist/rev3/rev3.h index 274b83926..506fcc6e3 100644 --- a/keyboards/keebio/nyquist/rev3/rev3.h +++ b/keyboards/keebio/nyquist/rev3/rev3.h | |||
@@ -31,4 +31,21 @@ | |||
31 | { R40, R41, R42, R43, R44, R45 } \ | 31 | { R40, R41, R42, R43, R44, R45 } \ |
32 | } | 32 | } |
33 | 33 | ||
34 | #define LAYOUT_ortho_4x12( \ | ||
35 | L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ | ||
36 | L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ | ||
37 | L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ | ||
38 | L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \ | ||
39 | ) \ | ||
40 | { \ | ||
41 | { L00, L01, L02, L03, L04, L05 }, \ | ||
42 | { L10, L11, L12, L13, L14, L15 }, \ | ||
43 | { L20, L21, L22, L23, L24, L25 }, \ | ||
44 | { L30, L31, L32, L33, L34, L35 }, \ | ||
45 | { R00, R01, R02, R03, R04, R05 }, \ | ||
46 | { R10, R11, R12, R13, R14, R15 }, \ | ||
47 | { R20, R21, R22, R23, R24, R25 }, \ | ||
48 | { R30, R31, R32, R33, R34, R35 } \ | ||
49 | } | ||
50 | |||
34 | #define LAYOUT_ortho_5x12 LAYOUT | 51 | #define LAYOUT_ortho_5x12 LAYOUT |
diff --git a/keyboards/kindakeyboards/conone65/rules.mk b/keyboards/kindakeyboards/conone65/rules.mk index 7210ffcf0..10b93d7b4 100644 --- a/keyboards/kindakeyboards/conone65/rules.mk +++ b/keyboards/kindakeyboards/conone65/rules.mk | |||
@@ -21,4 +21,4 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow | |||
21 | BLUETOOTH_ENABLE = no # Enable Bluetooth | 21 | BLUETOOTH_ENABLE = no # Enable Bluetooth |
22 | AUDIO_ENABLE = no # Audio output | 22 | AUDIO_ENABLE = no # Audio output |
23 | 23 | ||
24 | LAYOUTS = 65_ansi 65_ansi_split_bs 65_iso 65_iso_split_bs \ No newline at end of file | 24 | LAYOUTS = 65_ansi 65_ansi_split_bs 65_iso |
diff --git a/keyboards/latinpadble/rules.mk b/keyboards/latinpadble/rules.mk index cb9789aca..7754e3e01 100644 --- a/keyboards/latinpadble/rules.mk +++ b/keyboards/latinpadble/rules.mk | |||
@@ -37,7 +37,6 @@ MIDI_ENABLE = no # MIDI controls | |||
37 | UNICODE_ENABLE = no # Unicode | 37 | UNICODE_ENABLE = no # Unicode |
38 | AUDIO_ENABLE = no # Audio output on port C6 | 38 | AUDIO_ENABLE = no # Audio output on port C6 |
39 | BLUETOOTH = AdafruitBLE | 39 | BLUETOOTH = AdafruitBLE |
40 | LAYOUTS = pad | ||
41 | RGBLIGHT_ENABLE = yes | 40 | RGBLIGHT_ENABLE = yes |
42 | OLED_DRIVER_ENABLE = yes | 41 | OLED_DRIVER_ENABLE = yes |
43 | ENCODER_ENABLE = yes | 42 | ENCODER_ENABLE = yes |
diff --git a/keyboards/masterworks/classy_tkl/rev_a/rules.mk b/keyboards/masterworks/classy_tkl/rev_a/rules.mk index 68d6bc50c..ba09a6cb6 100644 --- a/keyboards/masterworks/classy_tkl/rev_a/rules.mk +++ b/keyboards/masterworks/classy_tkl/rev_a/rules.mk | |||
@@ -21,6 +21,3 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality | |||
21 | RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow | 21 | RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow |
22 | BLUETOOTH_ENABLE = no # Enable Bluetooth | 22 | BLUETOOTH_ENABLE = no # Enable Bluetooth |
23 | AUDIO_ENABLE = no # Audio output | 23 | AUDIO_ENABLE = no # Audio output |
24 | |||
25 | # Supported layouts | ||
26 | LAYOUTS = tkl_ansi_wkl tkl_iso_wkl | ||
diff --git a/keyboards/meira/meira.h b/keyboards/meira/meira.h index cad590477..d96839440 100644 --- a/keyboards/meira/meira.h +++ b/keyboards/meira/meira.h | |||
@@ -25,7 +25,7 @@ void reset_keyboard_kb(void); | |||
25 | // The following is an example using the Planck MIT layout | 25 | // The following is an example using the Planck MIT layout |
26 | // The first section contains all of the arguments | 26 | // The first section contains all of the arguments |
27 | // The second converts the arguments into a two-dimensional array | 27 | // The second converts the arguments into a two-dimensional array |
28 | #define LAYOUT( \ | 28 | #define LAYOUT_ortho_4x12( \ |
29 | k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ | 29 | k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ |
30 | k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ | 30 | k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ |
31 | k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ | 31 | k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ |
@@ -38,7 +38,7 @@ void reset_keyboard_kb(void); | |||
38 | { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \ | 38 | { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \ |
39 | } | 39 | } |
40 | 40 | ||
41 | #define LAYOUT_ortho_4x12 LAYOUT | 41 | #define LAYOUT LAYOUT_ortho_4x12 |
42 | 42 | ||
43 | #endif | 43 | #endif |
44 | 44 | ||
diff --git a/keyboards/nopunin10did/jabberwocky/config.h b/keyboards/nopunin10did/jabberwocky/config.h index b49a98ba8..84c3cec45 100644 --- a/keyboards/nopunin10did/jabberwocky/config.h +++ b/keyboards/nopunin10did/jabberwocky/config.h | |||
@@ -22,7 +22,6 @@ | |||
22 | #define VENDOR_ID 0x4E50 // "NP" | 22 | #define VENDOR_ID 0x4E50 // "NP" |
23 | #define PRODUCT_ID 0x4A57 // "JW" | 23 | #define PRODUCT_ID 0x4A57 // "JW" |
24 | #define DEVICE_VER 0x0001 | 24 | #define DEVICE_VER 0x0001 |
25 | #define MANUFACTURER NoPunIn10Did | ||
26 | #define PRODUCT Jabberwocky | 25 | #define PRODUCT Jabberwocky |
27 | 26 | ||
28 | /* key matrix size */ | 27 | /* key matrix size */ |
diff --git a/keyboards/ok60/rules.mk b/keyboards/ok60/rules.mk index f2801c945..e664640ba 100644 --- a/keyboards/ok60/rules.mk +++ b/keyboards/ok60/rules.mk | |||
@@ -27,4 +27,4 @@ RGBLIGHT_ENABLE = yes # Enable the RGB backlight | |||
27 | # UNICODE_ENABLE = YES # Unicode | 27 | # UNICODE_ENABLE = YES # Unicode |
28 | # BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID | 28 | # BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID |
29 | 29 | ||
30 | LAYOUTS = 60_ansi 60_ansi_split_bksp_rshift 60_iso 60_hhkb | 30 | LAYOUTS = 60_ansi 60_iso 60_hhkb |
diff --git a/keyboards/pisces/rules.mk b/keyboards/pisces/rules.mk index 156ace1ff..567b20b1c 100644 --- a/keyboards/pisces/rules.mk +++ b/keyboards/pisces/rules.mk | |||
@@ -23,5 +23,3 @@ AUDIO_ENABLE = no # Audio output | |||
23 | 23 | ||
24 | # Enable generic behavior for split boards | 24 | # Enable generic behavior for split boards |
25 | SPLIT_KEYBOARD = yes | 25 | SPLIT_KEYBOARD = yes |
26 | |||
27 | LAYOUTS = split_3x6_1 # total 38 | ||
diff --git a/keyboards/planck/ez/ez.h b/keyboards/planck/ez/ez.h index d11929d3e..14506dd72 100644 --- a/keyboards/planck/ez/ez.h +++ b/keyboards/planck/ez/ez.h | |||
@@ -39,17 +39,21 @@ | |||
39 | } | 39 | } |
40 | 40 | ||
41 | #define LAYOUT_ortho_4x12( \ | 41 | #define LAYOUT_ortho_4x12( \ |
42 | k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ | ||
43 | k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ | ||
44 | k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ | ||
45 | k30, k31, k32, k33, k34, k35, KC_NO, k37, k38, k39, k3a, k3b \ | ||
46 | ) \ | ||
47 | LAYOUT_planck_1x2uC( \ | ||
48 | k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ | 42 | k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ |
49 | k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ | 43 | k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ |
50 | k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ | 44 | k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ |
51 | k30, k31, k32, k33, k34, k35, k37, k38, k39, k3a, k3b \ | 45 | k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \ |
52 | ) | 46 | ) \ |
47 | { \ | ||
48 | { k00, k01, k02, k03, k04, k05 }, \ | ||
49 | { k10, k11, k12, k13, k14, k15 }, \ | ||
50 | { k20, k21, k22, k23, k24, k25 }, \ | ||
51 | { k30, k31, k32, k3a, k3b, k36 }, \ | ||
52 | { k06, k07, k08, k09, k0a, k0b }, \ | ||
53 | { k16, k17, k18, k19, k1a, k1b }, \ | ||
54 | { k26, k27, k28, k29, k2a, k2b }, \ | ||
55 | { k37, k38, k39, k33, k34, k35 } \ | ||
56 | } | ||
53 | 57 | ||
54 | #define LAYOUT_planck_mit LAYOUT_planck_1x2uC | 58 | #define LAYOUT_planck_mit LAYOUT_planck_1x2uC |
55 | #define LAYOUT_planck_grid LAYOUT_ortho_4x12 | 59 | #define LAYOUT_planck_grid LAYOUT_ortho_4x12 |
diff --git a/keyboards/planck/thk/info.json b/keyboards/planck/thk/info.json index cffc9fd36..558597b4d 100644 --- a/keyboards/planck/thk/info.json +++ b/keyboards/planck/thk/info.json | |||
@@ -1,53 +1,13 @@ | |||
1 | { | 1 | { |
2 | "manufacturer": "OLKB", | ||
3 | "keyboard_name": "Planck THK", | 2 | "keyboard_name": "Planck THK", |
4 | "maintainer": "Erovia", | 3 | "maintainer": "Erovia", |
5 | "height": 4, | ||
6 | "width": 12, | ||
7 | "bootloader": "USBasp", | ||
8 | "debounce": 5, | ||
9 | "diode_direction": "COL2ROW", | ||
10 | "features": { | ||
11 | "audio": false, | ||
12 | "backlight": false, | ||
13 | "bluetooth": false, | ||
14 | "bootmagic_lite": true, | ||
15 | "command": false, | ||
16 | "console": false, | ||
17 | "dip_switch": true, | ||
18 | "encoder": true, | ||
19 | "extrakey": true, | ||
20 | "mousekey": true, | ||
21 | "nkro": false, | ||
22 | "rgblight": false, | ||
23 | "sleep_led": false | ||
24 | }, | ||
25 | "matrix_pins": { | ||
26 | "cols": ["D7", "C2", "C3", "C4", "C5", "C6", "C7", "A3", "A2", "A1", "A0", "B0"], | ||
27 | "rows": ["A7", "A6", "A5", "A4"] | ||
28 | }, | ||
29 | "processor": "atmega32a", | ||
30 | "qmk_lufa_bootloader": { | ||
31 | "esc_input": "D5", | ||
32 | "esc_output": "F1", | ||
33 | "led": "E6", | ||
34 | "speaker": "C6" | ||
35 | }, | ||
36 | "url": "https://olkb.com/planck", | 4 | "url": "https://olkb.com/planck", |
37 | "usb": { | ||
38 | "device_ver": "0x0000", | ||
39 | "pid": "0x25A7", | ||
40 | "vid": "0x03A8" | ||
41 | }, | ||
42 | "community_layouts": ["ortho_4x12", "planck_mit"], | ||
43 | "layout_aliases": { | 5 | "layout_aliases": { |
44 | "LAYOUT_planck_grid": "LAYOUT_ortho_4x12", | 6 | "LAYOUT_planck_grid": "LAYOUT_ortho_4x12", |
45 | "LAYOUT_planck_mit": "LAYOUT_planck_1x2uC" | 7 | "LAYOUT_planck_mit": "LAYOUT_planck_1x2uC" |
46 | }, | 8 | }, |
47 | "layouts": { | 9 | "layouts": { |
48 | "LAYOUT_ortho_4x12": { | 10 | "LAYOUT_ortho_4x12": { |
49 | "c_macro": true, | ||
50 | "filename": "keyboards/planck/thk/thk.h", | ||
51 | "key_count": 48, | 11 | "key_count": 48, |
52 | "layout": [ | 12 | "layout": [ |
53 | { "label": "k00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, | 13 | { "label": "k00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, |
@@ -101,8 +61,6 @@ | |||
101 | ] | 61 | ] |
102 | }, | 62 | }, |
103 | "LAYOUT_planck_1x2uC": { | 63 | "LAYOUT_planck_1x2uC": { |
104 | "c_macro": true, | ||
105 | "filename": "keyboards/planck/thk/thk.h", | ||
106 | "key_count": 47, | 64 | "key_count": 47, |
107 | "layout": [ | 65 | "layout": [ |
108 | { "label": "k00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, | 66 | { "label": "k00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, |
diff --git a/keyboards/primekb/prime_m/rules.mk b/keyboards/primekb/prime_m/rules.mk index a2e427b67..6988d7e99 100644 --- a/keyboards/primekb/prime_m/rules.mk +++ b/keyboards/primekb/prime_m/rules.mk | |||
@@ -30,4 +30,4 @@ UNICODE_ENABLE = no # Unicode | |||
30 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | 30 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID |
31 | AUDIO_ENABLE = no # Audio output on port C6 | 31 | AUDIO_ENABLE = no # Audio output on port C6 |
32 | 32 | ||
33 | LAYOUTS = ortho_5x6 numpad_5x6 | 33 | LAYOUTS = numpad_5x6 |
diff --git a/keyboards/rgbkb/sol/rev2/config.h b/keyboards/rgbkb/sol/rev2/config.h index 6613b447b..360ccbc76 100644 --- a/keyboards/rgbkb/sol/rev2/config.h +++ b/keyboards/rgbkb/sol/rev2/config.h | |||
@@ -28,23 +28,23 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
28 | /* ws2812 RGB LED */ | 28 | /* ws2812 RGB LED */ |
29 | #define RGB_DI_PIN B7 | 29 | #define RGB_DI_PIN B7 |
30 | 30 | ||
31 | #define BACKLIGHT_LEDS 124 | 31 | // Underglow / DIY Tent Glow are parallel to the top row leds, no separate define |
32 | |||
33 | #ifdef FULLHAND_ENABLE | 32 | #ifdef FULLHAND_ENABLE |
34 | #define FULLHAND_LEDS 24 | 33 | #ifdef LED_MIRRORED |
34 | #define RGBLED_NUM 74 | ||
35 | #else | ||
36 | #define RGBLED_NUM 148 | ||
37 | #endif | ||
35 | #elif SF_ENABLE | 38 | #elif SF_ENABLE |
36 | #define FULLHAND_LEDS 38 | 39 | #ifdef LED_MIRRORED |
40 | #define RGBLED_NUM 81 | ||
41 | #else | ||
42 | #define RGBLED_NUM 162 | ||
43 | #endif | ||
37 | #else | 44 | #else |
38 | #define FULLHAND_LEDS 0 | 45 | #define RGBLED_NUM 0 |
39 | #endif | 46 | #endif |
40 | 47 | ||
41 | // Underglow / DIY Tent Glow are parallel to the top row leds, no separate define | ||
42 | |||
43 | #ifdef LED_MIRRORED | ||
44 | #define RGBLED_NUM ((BACKLIGHT_LEDS + FULLHAND_LEDS) / 2) | ||
45 | #else | ||
46 | #define RGBLED_NUM (BACKLIGHT_LEDS + FULLHAND_LEDS) | ||
47 | #endif | ||
48 | #define DRIVER_LED_TOTAL RGBLED_NUM | 48 | #define DRIVER_LED_TOTAL RGBLED_NUM |
49 | 49 | ||
50 | #define RGB_MATRIX_CENTER { 112, 37 } | 50 | #define RGB_MATRIX_CENTER { 112, 37 } |
diff --git a/keyboards/shk9/rules.mk b/keyboards/shk9/rules.mk index 8d356cbd1..5f1b6954e 100644 --- a/keyboards/shk9/rules.mk +++ b/keyboards/shk9/rules.mk | |||
@@ -20,5 +20,3 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality | |||
20 | RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow | 20 | RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow |
21 | BLUETOOTH_ENABLE = no # Enable Bluetooth | 21 | BLUETOOTH_ENABLE = no # Enable Bluetooth |
22 | AUDIO_ENABLE = no # Audio output | 22 | AUDIO_ENABLE = no # Audio output |
23 | |||
24 | LAYOUTS = ortho_3x3 \ No newline at end of file | ||
diff --git a/keyboards/sowbug/68keys/config.h b/keyboards/sowbug/68keys/config.h index 92d839728..21e304335 100644 --- a/keyboards/sowbug/68keys/config.h +++ b/keyboards/sowbug/68keys/config.h | |||
@@ -48,7 +48,7 @@ | |||
48 | // | 48 | // |
49 | // #define BACKLIGHT_PIN rgb_matrix | 49 | // #define BACKLIGHT_PIN rgb_matrix |
50 | #define RGB_MATRIX_KEYPRESSES | 50 | #define RGB_MATRIX_KEYPRESSES |
51 | #define DRIVER_LED_TOTAL 68 | 51 | #define RGBLED_NUM 68 |
52 | #define RGBLED_NUM DRIVER_LED_TOTAL | 52 | #define DRIVER_LED_TOTAL RGBLED_NUM |
53 | #define RGB_MATRIX_FRAMEBUFFER_EFFECTS | 53 | #define RGB_MATRIX_FRAMEBUFFER_EFFECTS |
54 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 128 | 54 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 128 |
diff --git a/keyboards/sowbug/ansi_tkl/config.h b/keyboards/sowbug/ansi_tkl/config.h index e2ed0edd8..8e7724540 100644 --- a/keyboards/sowbug/ansi_tkl/config.h +++ b/keyboards/sowbug/ansi_tkl/config.h | |||
@@ -44,8 +44,8 @@ | |||
44 | 44 | ||
45 | #define RGB_DI_PIN B9 | 45 | #define RGB_DI_PIN B9 |
46 | #define RGB_MATRIX_KEYPRESSES | 46 | #define RGB_MATRIX_KEYPRESSES |
47 | #define DRIVER_LED_TOTAL (87) | 47 | #define RGBLED_NUM 87 |
48 | #define RGBLED_NUM (DRIVER_LED_TOTAL) | 48 | #define DRIVER_LED_TOTAL RGBLED_NUM |
49 | #define RGB_MATRIX_FRAMEBUFFER_EFFECTS | 49 | #define RGB_MATRIX_FRAMEBUFFER_EFFECTS |
50 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 128 | 50 | #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 128 |
51 | 51 | ||
diff --git a/keyboards/torn/rules.mk b/keyboards/torn/rules.mk index 62f9d8393..0e0914d6a 100644 --- a/keyboards/torn/rules.mk +++ b/keyboards/torn/rules.mk | |||
@@ -21,8 +21,6 @@ OLED_DRIVER_ENABLE = yes | |||
21 | WPM_ENABLE = yes | 21 | WPM_ENABLE = yes |
22 | CUSTOM_MATRIX = lite | 22 | CUSTOM_MATRIX = lite |
23 | 23 | ||
24 | LAYOUTS = split_3x6_4 | ||
25 | |||
26 | SRC += matrix.c \ | 24 | SRC += matrix.c \ |
27 | bongocat.c \ | 25 | bongocat.c \ |
28 | mcp23018.c \ | 26 | mcp23018.c \ |
diff --git a/keyboards/ymdk/np24/u4rgb6/rules.mk b/keyboards/ymdk/np24/u4rgb6/rules.mk index 625a433f9..d05a2a589 100644 --- a/keyboards/ymdk/np24/u4rgb6/rules.mk +++ b/keyboards/ymdk/np24/u4rgb6/rules.mk | |||
@@ -21,4 +21,4 @@ RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow | |||
21 | BLUETOOTH_ENABLE = no # Enable Bluetooth | 21 | BLUETOOTH_ENABLE = no # Enable Bluetooth |
22 | AUDIO_ENABLE = no # Audio output | 22 | AUDIO_ENABLE = no # Audio output |
23 | 23 | ||
24 | LAYOUTS = ortho_6x4 numpad_6x4 ortho_4x6 | 24 | LAYOUTS = ortho_6x4 numpad_6x4 |