summaryrefslogtreecommitdiff
path: root/keyboards/basekeys
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/basekeys')
-rw-r--r--keyboards/basekeys/slice/rev1/config.h6
-rw-r--r--keyboards/basekeys/slice/rev1/info.json367
-rw-r--r--keyboards/basekeys/slice/rev1/rev1.c16
-rw-r--r--keyboards/basekeys/slice/rev1/rev1.h120
-rw-r--r--keyboards/basekeys/slice/rev1_rgb/config.h8
-rw-r--r--keyboards/basekeys/slice/rev1_rgb/info.json272
-rw-r--r--keyboards/basekeys/slice/rev1_rgb/rev1_rgb.c16
-rw-r--r--keyboards/basekeys/slice/rev1_rgb/rev1_rgb.h98
-rw-r--r--keyboards/basekeys/slice/slice.c16
-rw-r--r--keyboards/basekeys/slice/slice.h25
-rw-r--r--keyboards/basekeys/trifecta/config.h15
-rw-r--r--keyboards/basekeys/trifecta/info.json105
-rw-r--r--keyboards/basekeys/trifecta/trifecta.c2
-rw-r--r--keyboards/basekeys/trifecta/trifecta.h48
14 files changed, 727 insertions, 387 deletions
diff --git a/keyboards/basekeys/slice/rev1/config.h b/keyboards/basekeys/slice/rev1/config.h
index 6e0065c062..c1008da9b8 100644
--- a/keyboards/basekeys/slice/rev1/config.h
+++ b/keyboards/basekeys/slice/rev1/config.h
@@ -17,12 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, B5 }
-
-#define DIODE_DIRECTION COL2ROW
-
/* Select hand configuration */
//#define EE_HANDS
#define MASTER_LEFT
diff --git a/keyboards/basekeys/slice/rev1/info.json b/keyboards/basekeys/slice/rev1/info.json
index fac0bf3682..6b97d0c9ec 100644
--- a/keyboards/basekeys/slice/rev1/info.json
+++ b/keyboards/basekeys/slice/rev1/info.json
@@ -1,13 +1,18 @@
{
- "keyboard_name": "Slice",
+ "keyboard_name": "Slice",
"manufacturer": "2Moons",
- "url": "https://www.basekeys.com",
- "maintainer": "2Moons",
+ "url": "https://www.basekeys.com",
+ "maintainer": "2Moons",
"usb": {
"vid": "0x04D8",
"pid": "0xEC17",
"device_version": "0.0.2"
},
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5"],
+ "rows": ["D4", "C6", "D7", "E6", "B4"]
+ },
+ "diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D2"
},
@@ -15,16 +20,358 @@
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
- "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.6600000000000001, "y":0}, {"label":"!", "x":2.66, "y":0}, {"label":"@", "x":3.66, "y":0}, {"label":"#", "x":4.66, "y":0}, {"label":"$", "x":5.66, "y":0}, {"label":"%", "x":6.66, "y":0}, {"label":"^", "x":7.66, "y":0}, {"label":"&", "x":9.32, "y":0}, {"label":"*", "x":10.32, "y":0}, {"label":"(", "x":11.32, "y":0}, {"label":")", "x":12.32, "y":0}, {"label":"_", "x":13.32, "y":0}, {"label":"+", "x":14.32, "y":0}, {"label":"Backspace", "x":15.32, "y":0, "w":2}, {"x":0, "y":1}, {"label":"Tab", "x":1.53, "y":1, "w":1.5}, {"label":"Q", "x":3.03, "y":1}, {"label":"W", "x":4.03, "y":1}, {"label":"E", "x":5.03, "y":1}, {"label":"R", "x":6.03, "y":1}, {"label":"T", "x":7.03, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15.05, "y":1}, {"label":"|", "x":16.1, "y":1, "w":1.5}, {"x":0, "y":2}, {"label":"Caps Lock", "x":1.3900000000000001, "y":2, "w":1.75}, {"label":"A", "x":3.14, "y":2}, {"label":"S", "x":4.14, "y":2}, {"label":"D", "x":5.14, "y":2}, {"label":"F", "x":6.14, "y":2}, {"label":"G", "x":7.14, "y":2}, {"label":"H", "x":9.34, "y":2}, {"label":"J", "x":10.34, "y":2}, {"label":"K", "x":11.34, "y":2}, {"label":"L", "x":12.34, "y":2}, {"label":":", "x":13.34, "y":2}, {"label":"\"", "x":14.34, "y":2}, {"label":"Enter", "x":15.34, "y":2, "w":2.25}, {"x":0, "y":3}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":8.97, "y":3}, {"label":"N", "x":9.97, "y":3}, {"label":"M", "x":10.97, "y":3}, {"label":"<", "x":11.97, "y":3}, {"label":">", "x":12.97, "y":3}, {"label":"?", "x":13.97, "y":3}, {"label":"Shift", "x":14.97, "y":3, "w":1.75}, {"label":"Shift", "x":16.72, "y":3}, {"x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Alt", "x":2.75, "y":4, "w":1.25}, {"label":"\u21d3", "x":4.75, "y":4}, {"x":5.75, "y":4, "w":2.75}, {"x":8.97, "y":4, "w":2.25}, {"label":"\u21d1", "x":11.22, "y":4}, {"label":"Alt", "x":13.98, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.23, "y":4, "w":1.25}, {"label":"Fn", "x":16.48, "y":4}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.66, "y": 0},
+ {"matrix": [0, 2], "x": 2.66, "y": 0},
+ {"matrix": [0, 3], "x": 3.66, "y": 0},
+ {"matrix": [0, 4], "x": 4.66, "y": 0},
+ {"matrix": [0, 5], "x": 5.66, "y": 0},
+ {"matrix": [0, 6], "x": 6.66, "y": 0},
+ {"matrix": [0, 7], "x": 7.66, "y": 0},
+
+ {"matrix": [5, 0], "x": 9.32, "y": 0},
+ {"matrix": [5, 1], "x": 10.32, "y": 0},
+ {"matrix": [5, 2], "x": 11.32, "y": 0},
+ {"matrix": [5, 3], "x": 12.32, "y": 0},
+ {"matrix": [5, 4], "x": 13.32, "y": 0},
+ {"matrix": [5, 5], "x": 14.32, "y": 0},
+ {"matrix": [5, 7], "x": 15.32, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 3.03, "y": 1},
+ {"matrix": [1, 3], "x": 4.03, "y": 1},
+ {"matrix": [1, 4], "x": 5.03, "y": 1},
+ {"matrix": [1, 5], "x": 6.03, "y": 1},
+ {"matrix": [1, 6], "x": 7.03, "y": 1},
+
+ {"matrix": [6, 0], "x": 9, "y": 1},
+ {"matrix": [6, 1], "x": 10, "y": 1},
+ {"matrix": [6, 2], "x": 11, "y": 1},
+ {"matrix": [6, 3], "x": 12, "y": 1},
+ {"matrix": [6, 4], "x": 13, "y": 1},
+ {"matrix": [6, 5], "x": 14, "y": 1},
+ {"matrix": [6, 6], "x": 15.05, "y": 1},
+ {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 3.14, "y": 2},
+ {"matrix": [2, 3], "x": 4.14, "y": 2},
+ {"matrix": [2, 4], "x": 5.14, "y": 2},
+ {"matrix": [2, 5], "x": 6.14, "y": 2},
+ {"matrix": [2, 6], "x": 7.14, "y": 2},
+
+ {"matrix": [7, 0], "x": 9.34, "y": 2},
+ {"matrix": [7, 1], "x": 10.34, "y": 2},
+ {"matrix": [7, 2], "x": 11.34, "y": 2},
+ {"matrix": [7, 3], "x": 12.34, "y": 2},
+ {"matrix": [7, 4], "x": 13.34, "y": 2},
+ {"matrix": [7, 5], "x": 14.34, "y": 2},
+ {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 3.5, "y": 3},
+ {"matrix": [3, 3], "x": 4.5, "y": 3},
+ {"matrix": [3, 4], "x": 5.5, "y": 3},
+ {"matrix": [3, 5], "x": 6.5, "y": 3},
+ {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+ {"matrix": [8, 0], "x": 8.97, "y": 3},
+ {"matrix": [8, 1], "x": 9.97, "y": 3},
+ {"matrix": [8, 2], "x": 10.97, "y": 3},
+ {"matrix": [8, 3], "x": 11.97, "y": 3},
+ {"matrix": [8, 4], "x": 12.97, "y": 3},
+ {"matrix": [8, 5], "x": 13.97, "y": 3},
+ {"matrix": [8, 6], "x": 14.97, "y": 3, "w": 1.75},
+ {"matrix": [8, 8], "x": 16.72, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4.75, "y": 4},
+ {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.75},
+
+ {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
+ {"matrix": [9, 1], "x": 11.22, "y": 4},
+ {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
+ {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
+ {"matrix": [9, 4], "x": 16.48, "y": 4}
+ ]
},
- "LAYOUT_split_backspace": {
- "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.6600000000000001, "y":0}, {"label":"!", "x":2.66, "y":0}, {"label":"@", "x":3.66, "y":0}, {"label":"#", "x":4.66, "y":0}, {"label":"$", "x":5.66, "y":0}, {"label":"%", "x":6.66, "y":0}, {"label":"^", "x":7.66, "y":0}, {"label":"&", "x":9.32, "y":0}, {"label":"*", "x":10.32, "y":0}, {"label":"(", "x":11.32, "y":0}, {"label":")", "x":12.32, "y":0}, {"label":"_", "x":13.32, "y":0}, {"label":"+", "x":14.32, "y":0}, {"label":"BS", "x":15.32, "y":0}, {"label":"BS", "x":16.32, "y":0}, {"x":0, "y":1}, {"label":"Tab", "x":1.53, "y":1, "w":1.5}, {"label":"Q", "x":3.03, "y":1}, {"label":"W", "x":4.03, "y":1}, {"label":"E", "x":5.03, "y":1}, {"label":"R", "x":6.03, "y":1}, {"label":"T", "x":7.03, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15.05, "y":1}, {"label":"|", "x":16.1, "y":1, "w":1.5}, {"x":0, "y":2}, {"label":"Caps Lock", "x":1.3900000000000001, "y":2, "w":1.75}, {"label":"A", "x":3.14, "y":2}, {"label":"S", "x":4.14, "y":2}, {"label":"D", "x":5.14, "y":2}, {"label":"F", "x":6.14, "y":2}, {"label":"G", "x":7.14, "y":2}, {"label":"H", "x":9.34, "y":2}, {"label":"J", "x":10.34, "y":2}, {"label":"K", "x":11.34, "y":2}, {"label":"L", "x":12.34, "y":2}, {"label":":", "x":13.34, "y":2}, {"label":"\"", "x":14.34, "y":2}, {"label":"Enter", "x":15.34, "y":2, "w":2.25}, {"x":0, "y":3}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":8.97, "y":3}, {"label":"N", "x":9.97, "y":3}, {"label":"M", "x":10.97, "y":3}, {"label":"<", "x":11.97, "y":3}, {"label":">", "x":12.97, "y":3}, {"label":"?", "x":13.97, "y":3}, {"label":"Shift", "x":14.97, "y":3, "w":1.75}, {"label":"Shift", "x":16.72, "y":3}, {"x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Alt", "x":2.75, "y":4, "w":1.25}, {"label":"\u21d3", "x":4.75, "y":4}, {"x":5.75, "y":4, "w":2.75}, {"x":8.97, "y":4, "w":2.25}, {"label":"\u21d1", "x":11.22, "y":4}, {"label":"Alt", "x":13.98, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.23, "y":4, "w":1.25}, {"label":"Fn", "x":16.48, "y":4}]
+ "LAYOUT_split_backspace": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.66, "y": 0},
+ {"matrix": [0, 2], "x": 2.66, "y": 0},
+ {"matrix": [0, 3], "x": 3.66, "y": 0},
+ {"matrix": [0, 4], "x": 4.66, "y": 0},
+ {"matrix": [0, 5], "x": 5.66, "y": 0},
+ {"matrix": [0, 6], "x": 6.66, "y": 0},
+ {"matrix": [0, 7], "x": 7.66, "y": 0},
+
+ {"matrix": [5, 0], "x": 9.32, "y": 0},
+ {"matrix": [5, 1], "x": 10.32, "y": 0},
+ {"matrix": [5, 2], "x": 11.32, "y": 0},
+ {"matrix": [5, 3], "x": 12.32, "y": 0},
+ {"matrix": [5, 4], "x": 13.32, "y": 0},
+ {"matrix": [5, 5], "x": 14.32, "y": 0},
+ {"matrix": [5, 6], "x": 15.32, "y": 0},
+ {"matrix": [5, 8], "x": 16.32, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 3.03, "y": 1},
+ {"matrix": [1, 3], "x": 4.03, "y": 1},
+ {"matrix": [1, 4], "x": 5.03, "y": 1},
+ {"matrix": [1, 5], "x": 6.03, "y": 1},
+ {"matrix": [1, 6], "x": 7.03, "y": 1},
+
+ {"matrix": [6, 0], "x": 9, "y": 1},
+ {"matrix": [6, 1], "x": 10, "y": 1},
+ {"matrix": [6, 2], "x": 11, "y": 1},
+ {"matrix": [6, 3], "x": 12, "y": 1},
+ {"matrix": [6, 4], "x": 13, "y": 1},
+ {"matrix": [6, 5], "x": 14, "y": 1},
+ {"matrix": [6, 6], "x": 15.05, "y": 1},
+ {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 3.14, "y": 2},
+ {"matrix": [2, 3], "x": 4.14, "y": 2},
+ {"matrix": [2, 4], "x": 5.14, "y": 2},
+ {"matrix": [2, 5], "x": 6.14, "y": 2},
+ {"matrix": [2, 6], "x": 7.14, "y": 2},
+
+ {"matrix": [7, 0], "x": 9.34, "y": 2},
+ {"matrix": [7, 1], "x": 10.34, "y": 2},
+ {"matrix": [7, 2], "x": 11.34, "y": 2},
+ {"matrix": [7, 3], "x": 12.34, "y": 2},
+ {"matrix": [7, 4], "x": 13.34, "y": 2},
+ {"matrix": [7, 5], "x": 14.34, "y": 2},
+ {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 3.5, "y": 3},
+ {"matrix": [3, 3], "x": 4.5, "y": 3},
+ {"matrix": [3, 4], "x": 5.5, "y": 3},
+ {"matrix": [3, 5], "x": 6.5, "y": 3},
+ {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+ {"matrix": [8, 0], "x": 8.97, "y": 3},
+ {"matrix": [8, 1], "x": 9.97, "y": 3},
+ {"matrix": [8, 2], "x": 10.97, "y": 3},
+ {"matrix": [8, 3], "x": 11.97, "y": 3},
+ {"matrix": [8, 4], "x": 12.97, "y": 3},
+ {"matrix": [8, 5], "x": 13.97, "y": 3},
+ {"matrix": [8, 6], "x": 14.97, "y": 3, "w": 1.75},
+ {"matrix": [8, 8], "x": 16.72, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4.75, "y": 4},
+ {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.75},
+
+ {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
+ {"matrix": [9, 1], "x": 11.22, "y": 4},
+ {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
+ {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
+ {"matrix": [9, 4], "x": 16.48, "y": 4}
+ ]
},
- "LAYOUT_split_left_space": {
- "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.6600000000000001, "y":0}, {"label":"!", "x":2.66, "y":0}, {"label":"@", "x":3.66, "y":0}, {"label":"#", "x":4.66, "y":0}, {"label":"$", "x":5.66, "y":0}, {"label":"%", "x":6.66, "y":0}, {"label":"^", "x":7.66, "y":0}, {"label":"&", "x":9.32, "y":0}, {"label":"*", "x":10.32, "y":0}, {"label":"(", "x":11.32, "y":0}, {"label":")", "x":12.32, "y":0}, {"label":"_", "x":13.32, "y":0}, {"label":"+", "x":14.32, "y":0}, {"label":"Backspace", "x":15.32, "y":0, "w":2}, {"x":0, "y":1}, {"label":"Tab", "x":1.53, "y":1, "w":1.5}, {"label":"Q", "x":3.03, "y":1}, {"label":"W", "x":4.03, "y":1}, {"label":"E", "x":5.03, "y":1}, {"label":"R", "x":6.03, "y":1}, {"label":"T", "x":7.03, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15.05, "y":1}, {"label":"|", "x":16.1, "y":1, "w":1.5}, {"x":0, "y":2}, {"label":"Caps Lock", "x":1.3900000000000001, "y":2, "w":1.75}, {"label":"A", "x":3.14, "y":2}, {"label":"S", "x":4.14, "y":2}, {"label":"D", "x":5.14, "y":2}, {"label":"F", "x":6.14, "y":2}, {"label":"G", "x":7.14, "y":2}, {"label":"H", "x":9.34, "y":2}, {"label":"J", "x":10.34, "y":2}, {"label":"K", "x":11.34, "y":2}, {"label":"L", "x":12.34, "y":2}, {"label":":", "x":13.34, "y":2}, {"label":"\"", "x":14.34, "y":2}, {"label":"Enter", "x":15.34, "y":2, "w":2.25}, {"x":0, "y":3}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":8.97, "y":3}, {"label":"N", "x":9.97, "y":3}, {"label":"M", "x":10.97, "y":3}, {"label":"<", "x":11.97, "y":3}, {"label":">", "x":12.97, "y":3}, {"label":"?", "x":13.97, "y":3}, {"label":"Shift", "x":14.97, "y":3, "w":1.75}, {"label":"Shift", "x":16.72, "y":3}, {"x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Alt", "x":2.75, "y":4, "w":1.25}, {"label":"\u21d3", "x":4.75, "y":4}, {"x":5.75, "y":4, "w":1.75}, {"x":7.5, "y":4}, {"x":8.97, "y":4, "w":2.25}, {"label":"\u21d1", "x":11.22, "y":4}, {"label":"Alt", "x":13.98, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.23, "y":4, "w":1.25}, {"label":"Fn", "x":16.48, "y":4}]
+ "LAYOUT_split_left_space": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.66, "y": 0},
+ {"matrix": [0, 2], "x": 2.66, "y": 0},
+ {"matrix": [0, 3], "x": 3.66, "y": 0},
+ {"matrix": [0, 4], "x": 4.66, "y": 0},
+ {"matrix": [0, 5], "x": 5.66, "y": 0},
+ {"matrix": [0, 6], "x": 6.66, "y": 0},
+ {"matrix": [0, 7], "x": 7.66, "y": 0},
+
+ {"matrix": [5, 0], "x": 9.32, "y": 0},
+ {"matrix": [5, 1], "x": 10.32, "y": 0},
+ {"matrix": [5, 2], "x": 11.32, "y": 0},
+ {"matrix": [5, 3], "x": 12.32, "y": 0},
+ {"matrix": [5, 4], "x": 13.32, "y": 0},
+ {"matrix": [5, 5], "x": 14.32, "y": 0},
+ {"matrix": [5, 7], "x": 15.32, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 3.03, "y": 1},
+ {"matrix": [1, 3], "x": 4.03, "y": 1},
+ {"matrix": [1, 4], "x": 5.03, "y": 1},
+ {"matrix": [1, 5], "x": 6.03, "y": 1},
+ {"matrix": [1, 6], "x": 7.03, "y": 1},
+
+ {"matrix": [6, 0], "x": 9, "y": 1},
+ {"matrix": [6, 1], "x": 10, "y": 1},
+ {"matrix": [6, 2], "x": 11, "y": 1},
+ {"matrix": [6, 3], "x": 12, "y": 1},
+ {"matrix": [6, 4], "x": 13, "y": 1},
+ {"matrix": [6, 5], "x": 14, "y": 1},
+ {"matrix": [6, 6], "x": 15.05, "y": 1},
+ {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 3.14, "y": 2},
+ {"matrix": [2, 3], "x": 4.14, "y": 2},
+ {"matrix": [2, 4], "x": 5.14, "y": 2},
+ {"matrix": [2, 5], "x": 6.14, "y": 2},
+ {"matrix": [2, 6], "x": 7.14, "y": 2},
+
+ {"matrix": [7, 0], "x": 9.34, "y": 2},
+ {"matrix": [7, 1], "x": 10.34, "y": 2},
+ {"matrix": [7, 2], "x": 11.34, "y": 2},
+ {"matrix": [7, 3], "x": 12.34, "y": 2},
+ {"matrix": [7, 4], "x": 13.34, "y": 2},
+ {"matrix": [7, 5], "x": 14.34, "y": 2},
+ {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 3.5, "y": 3},
+ {"matrix": [3, 3], "x": 4.5, "y": 3},
+ {"matrix": [3, 4], "x": 5.5, "y": 3},
+ {"matrix": [3, 5], "x": 6.5, "y": 3},
+ {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+ {"matrix": [8, 0], "x": 8.97, "y": 3},
+ {"matrix": [8, 1], "x": 9.97, "y": 3},
+ {"matrix": [8, 2], "x": 10.97, "y": 3},
+ {"matrix": [8, 3], "x": 11.97, "y": 3},
+ {"matrix": [8, 4], "x": 12.97, "y": 3},
+ {"matrix": [8, 5], "x": 13.97, "y": 3},
+ {"matrix": [8, 6], "x": 14.97, "y": 3, "w": 1.75},
+ {"matrix": [8, 8], "x": 16.72, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4.75, "y": 4},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 1.75},
+ {"matrix": [4, 6], "x": 7.5, "y": 4},
+
+ {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
+ {"matrix": [9, 1], "x": 11.22, "y": 4},
+ {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
+ {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
+ {"matrix": [9, 4], "x": 16.48, "y": 4}
+ ]
},
- "LAYOUT_all": {
- "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.6600000000000001, "y":0}, {"label":"!", "x":2.66, "y":0}, {"label":"@", "x":3.66, "y":0}, {"label":"#", "x":4.66, "y":0}, {"label":"$", "x":5.66, "y":0}, {"label":"%", "x":6.66, "y":0}, {"label":"^", "x":7.66, "y":0}, {"label":"&", "x":9.32, "y":0}, {"label":"*", "x":10.32, "y":0}, {"label":"(", "x":11.32, "y":0}, {"label":")", "x":12.32, "y":0}, {"label":"_", "x":13.32, "y":0}, {"label":"+", "x":14.32, "y":0}, {"label":"BS", "x":15.32, "y":0}, {"label":"BS", "x":16.32, "y":0}, {"label":"BS", "x":17.32, "y":0}, {"x":0, "y":1}, {"label":"Tab", "x":1.53, "y":1, "w":1.5}, {"label":"Q", "x":3.03, "y":1}, {"label":"W", "x":4.03, "y":1}, {"label":"E", "x":5.03, "y":1}, {"label":"R", "x":6.03, "y":1}, {"label":"T", "x":7.03, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15.05, "y":1}, {"label":"|", "x":16.1, "y":1, "w":1.5}, {"x":0, "y":2}, {"label":"Caps Lock", "x":1.3900000000000001, "y":2, "w":1.75}, {"label":"A", "x":3.14, "y":2}, {"label":"S", "x":4.14, "y":2}, {"label":"D", "x":5.14, "y":2}, {"label":"F", "x":6.14, "y":2}, {"label":"G", "x":7.14, "y":2}, {"label":"H", "x":9.34, "y":2}, {"label":"J", "x":10.34, "y":2}, {"label":"K", "x":11.34, "y":2}, {"label":"L", "x":12.34, "y":2}, {"label":":", "x":13.34, "y":2}, {"label":"\"", "x":14.34, "y":2}, {"label":"Enter", "x":15.34, "y":2, "w":2.25}, {"x":0, "y":3}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":8.97, "y":3}, {"label":"N", "x":9.97, "y":3}, {"label":"M", "x":10.97, "y":3}, {"label":"<", "x":11.97, "y":3}, {"label":">", "x":12.97, "y":3}, {"label":"?", "x":13.97, "y":3}, {"label":"Shift", "x":14.97, "y":3}, {"label":"Shift", "x":15.97, "y":3}, {"label":"Shift", "x":16.97, "y":3}, {"x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Alt", "x":2.75, "y":4, "w":1.25}, {"label":"\u21d3", "x":4.75, "y":4}, {"x":5.75, "y":4}, {"x":6.75, "y":4}, {"x":7.75, "y":4}, {"x":8.97, "y":4, "w":2.25}, {"label":"\u21d1", "x":11.22, "y":4}, {"label":"Alt", "x":13.98, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.23, "y":4, "w":1.25}, {"label":"Fn", "x":16.48, "y":4}]
+ "LAYOUT_all": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.66, "y": 0},
+ {"matrix": [0, 2], "x": 2.66, "y": 0},
+ {"matrix": [0, 3], "x": 3.66, "y": 0},
+ {"matrix": [0, 4], "x": 4.66, "y": 0},
+ {"matrix": [0, 5], "x": 5.66, "y": 0},
+ {"matrix": [0, 6], "x": 6.66, "y": 0},
+ {"matrix": [0, 7], "x": 7.66, "y": 0},
+
+ {"matrix": [5, 0], "x": 9.32, "y": 0},
+ {"matrix": [5, 1], "x": 10.32, "y": 0},
+ {"matrix": [5, 2], "x": 11.32, "y": 0},
+ {"matrix": [5, 3], "x": 12.32, "y": 0},
+ {"matrix": [5, 4], "x": 13.32, "y": 0},
+ {"matrix": [5, 5], "x": 14.32, "y": 0},
+ {"matrix": [5, 6], "x": 15.32, "y": 0},
+ {"matrix": [5, 7], "x": 16.32, "y": 0},
+ {"matrix": [5, 8], "x": 17.32, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 3.03, "y": 1},
+ {"matrix": [1, 3], "x": 4.03, "y": 1},
+ {"matrix": [1, 4], "x": 5.03, "y": 1},
+ {"matrix": [1, 5], "x": 6.03, "y": 1},
+ {"matrix": [1, 6], "x": 7.03, "y": 1},
+
+ {"matrix": [6, 0], "x": 9, "y": 1},
+ {"matrix": [6, 1], "x": 10, "y": 1},
+ {"matrix": [6, 2], "x": 11, "y": 1},
+ {"matrix": [6, 3], "x": 12, "y": 1},
+ {"matrix": [6, 4], "x": 13, "y": 1},
+ {"matrix": [6, 5], "x": 14, "y": 1},
+ {"matrix": [6, 6], "x": 15.05, "y": 1},
+ {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 3.14, "y": 2},
+ {"matrix": [2, 3], "x": 4.14, "y": 2},
+ {"matrix": [2, 4], "x": 5.14, "y": 2},
+ {"matrix": [2, 5], "x": 6.14, "y": 2},
+ {"matrix": [2, 6], "x": 7.14, "y": 2},
+
+ {"matrix": [7, 0], "x": 9.34, "y": 2},
+ {"matrix": [7, 1], "x": 10.34, "y": 2},
+ {"matrix": [7, 2], "x": 11.34, "y": 2},
+ {"matrix": [7, 3], "x": 12.34, "y": 2},
+ {"matrix": [7, 4], "x": 13.34, "y": 2},
+ {"matrix": [7, 5], "x": 14.34, "y": 2},
+ {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 3.5, "y": 3},
+ {"matrix": [3, 3], "x": 4.5, "y": 3},
+ {"matrix": [3, 4], "x": 5.5, "y": 3},
+ {"matrix": [3, 5], "x": 6.5, "y": 3},
+ {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+ {"matrix": [8, 0], "x": 8.97, "y": 3},
+ {"matrix": [8, 1], "x": 9.97, "y": 3},
+ {"matrix": [8, 2], "x": 10.97, "y": 3},
+ {"matrix": [8, 3], "x": 11.97, "y": 3},
+ {"matrix": [8, 4], "x": 12.97, "y": 3},
+ {"matrix": [8, 5], "x": 13.97, "y": 3},
+ {"matrix": [8, 6], "x": 14.97, "y": 3},
+ {"matrix": [8, 7], "x": 15.97, "y": 3},
+ {"matrix": [8, 8], "x": 16.97, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4.75, "y": 4},
+ {"matrix": [4, 4], "x": 5.75, "y": 4},
+ {"matrix": [4, 5], "x": 6.75, "y": 4},
+ {"matrix": [4, 6], "x": 7.75, "y": 4},
+
+ {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
+ {"matrix": [9, 1], "x": 11.22, "y": 4},
+ {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
+ {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
+ {"matrix": [9, 4], "x": 16.48, "y": 4}
+ ]
}
}
}
diff --git a/keyboards/basekeys/slice/rev1/rev1.c b/keyboards/basekeys/slice/rev1/rev1.c
deleted file mode 100644
index a3c8f66fe0..0000000000
--- a/keyboards/basekeys/slice/rev1/rev1.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 2Moons
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#include "rev1.h"
diff --git a/keyboards/basekeys/slice/rev1/rev1.h b/keyboards/basekeys/slice/rev1/rev1.h
deleted file mode 100644
index 26a5da31bc..0000000000
--- a/keyboards/basekeys/slice/rev1/rev1.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/* Copyright 2020 2Moons
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "slice.h"
-
-#include "quantum.h"
-
-//////////////////////////////////////////////////////////////////////////////
-// When only use Slice Rev1.
-//////////////////////////////////////////////////////////////////////////////
-/*
- * ,------------------------------------------------ --------------------------------------------------.
- * | L00 | L01 | L02 | L03 | L04 | L05 | L06 | L07 | | R00 | R01 | R02 | R03 | R04 | R05 | R06R07R08 |
- * |------------------------------------------------ ------------------------------------------------------+
- * | L10 | L11 | L12 | L13 | L14 | L15 | L16 | | R10 | R11 | R12 | R13 | R14 | R15 | R16 | R37 |
- * |---------------------------------------------- ------------------------------------------------------+
- * | L20 | L21 | L22 | L23 | L24 | L25 | L26 | | R20 | R21 | R22 | R23 | R24 | R25 | R26 |
- * |------------------------------------------------- --------------------------------------------------------+
- * | L30 | L31 | L32 | L33 | L34 | L35 | L36 | | R30 | R31 | R32 | R33 | R34 | R34 | R35 | R36R37R38 |
- * |------------------------------------------------- --------------------------------------------------------'
- * | L40 | L41 | L42 | L43 | L44L45L46 | | R40 | R41 | | R42 | R43 | R44 |
- * |------------------------------------------------- -------------------------------------------------------'
- */
-
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, R07, \
- L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, R17, \
- L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
- L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, R38,\
- L40, L41, L42, L43, L45, R40, R41, R42, R43, R44 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05, L06, L07, KC_NO }, \
- { L10, L11, L12, L13, L14, L15, L16, KC_NO, KC_NO }, \
- { L20, L21, L22, L23, L24, L25, L26, KC_NO, KC_NO }, \
- { L30, L31, L32, L33, L34, L35, L36, KC_NO, KC_NO }, \
- { L40, L41, L42, L43, KC_NO, L45, KC_NO, KC_NO, KC_NO }, \
- { R00, R01, R02, R03, R04, R05, KC_NO, R07, KC_NO }, \
- { R10, R11, R12, R13, R14, R15, R16, R17, KC_NO }, \
- { R20, R21, R22, R23, R24, R25, R26, KC_NO, KC_NO }, \
- { R30, R31, R32, R33, R34, R35, R36, KC_NO, R38 }, \
- { R40, R41, R42, R43, R44, KC_NO, KC_NO, KC_NO, KC_NO } \
- }
-
-#define LAYOUT_all( \
- L00, L01, L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, R06, R07, R08, \
- L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, R17, \
- L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
- L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, R37, R38,\
- L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05, L06, L07, KC_NO }, \
- { L10, L11, L12, L13, L14, L15, L16, KC_NO, KC_NO }, \
- { L20, L21, L22, L23, L24, L25, L26, KC_NO, KC_NO }, \
- { L30, L31, L32, L33, L34, L35, L36, KC_NO, KC_NO }, \
- { L40, L41, L42, L43, L44, L45, L46, KC_NO, KC_NO }, \
- { R00, R01, R02, R03, R04, R05, R06, R07, R08 }, \
- { R10, R11, R12, R13, R14, R15, R16, R17, KC_NO }, \
- { R20, R21, R22, R23, R24, R25, R26, KC_NO, KC_NO }, \
- { R30, R31, R32, R33, R34, R35, R36, R37, R38 }, \
- { R40, R41, R42, R43, R44, KC_NO, KC_NO, KC_NO, KC_NO } \
- }
-
-#define LAYOUT_split_backspace( \
- L00, L01, L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, R06, R08, \
- L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, R17, \
- L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
- L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, R38,\
- L40, L41, L42, L43, L45, R40, R41, R42, R43, R44 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05, L06, L07, KC_NO }, \
- { L10, L11, L12, L13, L14, L15, L16, KC_NO, KC_NO }, \
- { L20, L21, L22, L23, L24, L25, L26, KC_NO, KC_NO }, \
- { L30, L31, L32, L33, L34, L35, L36, KC_NO, KC_NO }, \
- { L40, L41, L42, L43, KC_NO, L45, KC_NO, KC_NO, KC_NO }, \
- { R00, R01, R02, R03, R04, R05, R06, KC_NO, R08 }, \
- { R10, R11, R12, R13, R14, R15, R16, R17, KC_NO }, \
- { R20, R21, R22, R23, R24, R25, R26, KC_NO, KC_NO }, \
- { R30, R31, R32, R33, R34, R35, R36, KC_NO, R38 }, \
- { R40, R41, R42, R43, R44, KC_NO, KC_NO, KC_NO, KC_NO } \
- }
-
-
-#define LAYOUT_split_left_space( \
- L00, L01, L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, R07, \
- L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, R17, \
- L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
- L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, R38,\
- L40, L41, L42, L43, L44, L46, R40, R41, R42, R43, R44 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05, L06, L07, KC_NO }, \
- { L10, L11, L12, L13, L14, L15, L16, KC_NO, KC_NO }, \
- { L20, L21, L22, L23, L24, L25, L26, KC_NO, KC_NO }, \
- { L30, L31, L32, L33, L34, L35, L36, KC_NO, KC_NO }, \
- { L40, L41, L42, L43, L44, KC_NO, L46, KC_NO, KC_NO }, \
- { R00, R01, R02, R03, R04, R05, KC_NO, R07, KC_NO }, \
- { R10, R11, R12, R13, R14, R15, R16, R17, KC_NO }, \
- { R20, R21, R22, R23, R24, R25, R26, KC_NO, KC_NO }, \
- { R30, R31, R32, R33, R34, R35, R36, KC_NO, R38 }, \
- { R40, R41, R42, R43, R44, KC_NO, KC_NO, KC_NO, KC_NO } \
- }
-
-
diff --git a/keyboards/basekeys/slice/rev1_rgb/config.h b/keyboards/basekeys/slice/rev1_rgb/config.h
index a19d676b29..996e538ae3 100644
--- a/keyboards/basekeys/slice/rev1_rgb/config.h
+++ b/keyboards/basekeys/slice/rev1_rgb/config.h
@@ -16,12 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, B5 }
-
-#define DIODE_DIRECTION COL2ROW
-
/* Select hand configuration */
//#define EE_HANDS
#define MASTER_LEFT
@@ -34,10 +28,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* RGB LED */
#ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN D3
#define RGBLED_NUM 69 // Number of LEDs. backlight x69
#define RGBLED_SPLIT { 34, 35 }
-#define RGBLIGHT_LIMIT_VAL 120 /* The maximum brightness level */
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/basekeys/slice/rev1_rgb/info.json b/keyboards/basekeys/slice/rev1_rgb/info.json
index fb6a19bc2f..38a6e8398a 100644
--- a/keyboards/basekeys/slice/rev1_rgb/info.json
+++ b/keyboards/basekeys/slice/rev1_rgb/info.json
@@ -8,20 +8,286 @@
"pid": "0xEC15",
"device_version": "0.0.2"
},
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5"],
+ "rows": ["D4", "C6", "D7", "E6", "B4"]
+ },
+ "diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D2"
},
+ "ws2812": {
+ "pin": "D3"
+ },
+ "rgblight": {
+ "max_brightness": 120
+ },
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
- "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.660, "y":0}, {"label":"!", "x":2.66, "y":0}, {"label":"@", "x":3.66, "y":0}, {"label":"#", "x":4.66, "y":0}, {"label":"$", "x":5.66, "y":0}, {"label":"%", "x":6.66, "y":0}, {"label":"^", "x":7.66, "y":0}, {"label":"&", "x":9.32, "y":0}, {"label":"*", "x":10.32, "y":0}, {"label":"(", "x":11.32, "y":0}, {"label":")", "x":12.32, "y":0}, {"label":"_", "x":13.32, "y":0}, {"label":"+", "x":14.32, "y":0}, {"label":"Backspace", "x":15.32, "y":0, "w":2}, {"x":0, "y":1}, {"label":"Tab", "x":1.53, "y":1, "w":1.5}, {"label":"Q", "x":3.03, "y":1}, {"label":"W", "x":4.03, "y":1}, {"label":"E", "x":5.03, "y":1}, {"label":"R", "x":6.03, "y":1}, {"label":"T", "x":7.03, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15.05, "y":1}, {"label":"|", "x":16.1, "y":1, "w":1.5}, {"x":0, "y":2}, {"label":"Caps Lock", "x":1.390, "y":2, "w":1.75}, {"label":"A", "x":3.14, "y":2}, {"label":"S", "x":4.14, "y":2}, {"label":"D", "x":5.14, "y":2}, {"label":"F", "x":6.14, "y":2}, {"label":"G", "x":7.14, "y":2}, {"label":"H", "x":9.34, "y":2}, {"label":"J", "x":10.34, "y":2}, {"label":"K", "x":11.34, "y":2}, {"label":"L", "x":12.34, "y":2}, {"label":":", "x":13.34, "y":2}, {"label":"\"", "x":14.34, "y":2}, {"label":"Enter", "x":15.34, "y":2, "w":2.25}, {"x":0, "y":3}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":8.97, "y":3}, {"label":"N", "x":9.97, "y":3}, {"label":"M", "x":10.97, "y":3}, {"label":"<", "x":11.97, "y":3}, {"label":">", "x":12.97, "y":3}, {"label":"?", "x":13.97, "y":3}, {"label":"Shift", "x":14.97, "y":3, "w":1.75}, {"label":"Shift", "x":16.72, "y":3}, {"x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Alt", "x":2.75, "y":4, "w":1.25}, {"label":"\u21d3", "x":4.75, "y":4}, {"x":5.75, "y":4, "w":2.75}, {"x":8.97, "y":4, "w":2.25}, {"label":"\u21d1", "x":11.22, "y":4}, {"label":"Alt", "x":13.98, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.23, "y":4, "w":1.25}, {"label":"Fn", "x":16.48, "y":4}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.66, "y": 0},
+ {"matrix": [0, 2], "x": 2.66, "y": 0},
+ {"matrix": [0, 3], "x": 3.66, "y": 0},
+ {"matrix": [0, 4], "x": 4.66, "y": 0},
+ {"matrix": [0, 5], "x": 5.66, "y": 0},
+ {"matrix": [0, 6], "x": 6.66, "y": 0},
+ {"matrix": [0, 7], "x": 7.66, "y": 0},
+
+ {"matrix": [5, 0], "x": 9.32, "y": 0},
+ {"matrix": [5, 1], "x": 10.32, "y": 0},
+ {"matrix": [5, 2], "x": 11.32, "y": 0},
+ {"matrix": [5, 3], "x": 12.32, "y": 0},
+ {"matrix": [5, 4], "x": 13.32, "y": 0},
+ {"matrix": [5, 5], "x": 14.32, "y": 0},
+ {"matrix": [5, 6], "x": 15.32, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 3.03, "y": 1},
+ {"matrix": [1, 3], "x": 4.03, "y": 1},
+ {"matrix": [1, 4], "x": 5.03, "y": 1},
+ {"matrix": [1, 5], "x": 6.03, "y": 1},
+ {"matrix": [1, 6], "x": 7.03, "y": 1},
+
+ {"matrix": [6, 0], "x": 9, "y": 1},
+ {"matrix": [6, 1], "x": 10, "y": 1},
+ {"matrix": [6, 2], "x": 11, "y": 1},
+ {"matrix": [6, 3], "x": 12, "y": 1},
+ {"matrix": [6, 4], "x": 13, "y": 1},
+ {"matrix": [6, 5], "x": 14, "y": 1},
+ {"matrix": [6, 6], "x": 15.05, "y": 1},
+ {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 3.14, "y": 2},
+ {"matrix": [2, 3], "x": 4.14, "y": 2},
+ {"matrix": [2, 4], "x": 5.14, "y": 2},
+ {"matrix": [2, 5], "x": 6.14, "y": 2},
+ {"matrix": [2, 6], "x": 7.14, "y": 2},
+
+ {"matrix": [7, 0], "x": 9.34, "y": 2},
+ {"matrix": [7, 1], "x": 10.34, "y": 2},
+ {"matrix": [7, 2], "x": 11.34, "y": 2},
+ {"matrix": [7, 3], "x": 12.34, "y": 2},
+ {"matrix": [7, 4], "x": 13.34, "y": 2},
+ {"matrix": [7, 5], "x": 14.34, "y": 2},
+ {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 3.5, "y": 3},
+ {"matrix": [3, 3], "x": 4.5, "y": 3},
+ {"matrix": [3, 4], "x": 5.5, "y": 3},
+ {"matrix": [3, 5], "x": 6.5, "y": 3},
+ {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+ {"matrix": [8, 0], "x": 8.97, "y": 3},
+ {"matrix": [8, 1], "x": 9.97, "y": 3},
+ {"matrix": [8, 2], "x": 10.97, "y": 3},
+ {"matrix": [8, 3], "x": 11.97, "y": 3},
+ {"matrix": [8, 4], "x": 12.97, "y": 3},
+ {"matrix": [8, 5], "x": 13.97, "y": 3},
+ {"matrix": [8, 6], "x": 14.97, "y": 3, "w": 1.75},
+ {"matrix": [8, 7], "x": 16.72, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4.75, "y": 4},
+ {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.75},
+
+ {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
+ {"matrix": [9, 1], "x": 11.22, "y": 4},
+ {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
+ {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
+ {"matrix": [9, 4], "x": 16.48, "y": 4}
+ ]
},
"LAYOUT_split_left_space": {
- "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.660, "y":0}, {"label":"!", "x":2.66, "y":0}, {"label":"@", "x":3.66, "y":0}, {"label":"#", "x":4.66, "y":0}, {"label":"$", "x":5.66, "y":0}, {"label":"%", "x":6.66, "y":0}, {"label":"^", "x":7.66, "y":0}, {"label":"&", "x":9.32, "y":0}, {"label":"*", "x":10.32, "y":0}, {"label":"(", "x":11.32, "y":0}, {"label":")", "x":12.32, "y":0}, {"label":"_", "x":13.32, "y":0}, {"label":"+", "x":14.32, "y":0}, {"label":"Backspace", "x":15.32, "y":0, "w":2}, {"x":0, "y":1}, {"label":"Tab", "x":1.53, "y":1, "w":1.5}, {"label":"Q", "x":3.03, "y":1}, {"label":"W", "x":4.03, "y":1}, {"label":"E", "x":5.03, "y":1}, {"label":"R", "x":6.03, "y":1}, {"label":"T", "x":7.03, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15.05, "y":1}, {"label":"|", "x":16.1, "y":1, "w":1.5}, {"x":0, "y":2}, {"label":"Caps Lock", "x":1.390, "y":2, "w":1.75}, {"label":"A", "x":3.14, "y":2}, {"label":"S", "x":4.14, "y":2}, {"label":"D", "x":5.14, "y":2}, {"label":"F", "x":6.14, "y":2}, {"label":"G", "x":7.14, "y":2}, {"label":"H", "x":9.34, "y":2}, {"label":"J", "x":10.34, "y":2}, {"label":"K", "x":11.34, "y":2}, {"label":"L", "x":12.34, "y":2}, {"label":":", "x":13.34, "y":2}, {"label":"\"", "x":14.34, "y":2}, {"label":"Enter", "x":15.34, "y":2, "w":2.25}, {"x":0, "y":3}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":8.97, "y":3}, {"label":"N", "x":9.97, "y":3}, {"label":"M", "x":10.97, "y":3}, {"label":"<", "x":11.97, "y":3}, {"label":">", "x":12.97, "y":3}, {"label":"?", "x":13.97, "y":3}, {"label":"Shift", "x":14.97, "y":3, "w":1.75}, {"label":"Shift", "x":16.72, "y":3}, {"x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Alt", "x":2.75, "y":4, "w":1.25}, {"label":"\u21d3", "x":4.75, "y":4}, {"x":5.75, "y":4, "w":1.75}, {"x":7.5, "y":4}, {"x":8.97, "y":4, "w":2.25}, {"label":"\u21d1", "x":11.22, "y":4}, {"label":"Alt", "x":13.98, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.23, "y":4, "w":1.25}, {"label":"Fn", "x":16.48, "y":4}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.66, "y": 0},
+ {"matrix": [0, 2], "x": 2.66, "y": 0},
+ {"matrix": [0, 3], "x": 3.66, "y": 0},
+ {"matrix": [0, 4], "x": 4.66, "y": 0},
+ {"matrix": [0, 5], "x": 5.66, "y": 0},
+ {"matrix": [0, 6], "x": 6.66, "y": 0},
+ {"matrix": [0, 7], "x": 7.66, "y": 0},
+
+ {"matrix": [5, 0], "x": 9.32, "y": 0},
+ {"matrix": [5, 1], "x": 10.32, "y": 0},
+ {"matrix": [5, 2], "x": 11.32, "y": 0},
+ {"matrix": [5, 3], "x": 12.32, "y": 0},
+ {"matrix": [5, 4], "x": 13.32, "y": 0},
+ {"matrix": [5, 5], "x": 14.32, "y": 0},
+ {"matrix": [5, 6], "x": 15.32, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 3.03, "y": 1},
+ {"matrix": [1, 3], "x": 4.03, "y": 1},
+ {"matrix": [1, 4], "x": 5.03, "y": 1},
+ {"matrix": [1, 5], "x": 6.03, "y": 1},
+ {"matrix": [1, 6], "x": 7.03, "y": 1},
+
+ {"matrix": [6, 0], "x": 9, "y": 1},
+ {"matrix": [6, 1], "x": 10, "y": 1},
+ {"matrix": [6, 2], "x": 11, "y": 1},
+ {"matrix": [6, 3], "x": 12, "y": 1},
+ {"matrix": [6, 4], "x": 13, "y": 1},
+ {"matrix": [6, 5], "x": 14, "y": 1},
+ {"matrix": [6, 6], "x": 15.05, "y": 1},
+ {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 3.14, "y": 2},
+ {"matrix": [2, 3], "x": 4.14, "y": 2},
+ {"matrix": [2, 4], "x": 5.14, "y": 2},
+ {"matrix": [2, 5], "x": 6.14, "y": 2},
+ {"matrix": [2, 6], "x": 7.14, "y": 2},
+
+ {"matrix": [7, 0], "x": 9.34, "y": 2},
+ {"matrix": [7, 1], "x": 10.34, "y": 2},
+ {"matrix": [7, 2], "x": 11.34, "y": 2},
+ {"matrix": [7, 3], "x": 12.34, "y": 2},
+ {"matrix": [7, 4], "x": 13.34, "y": 2},
+ {"matrix": [7, 5], "x": 14.34, "y": 2},
+ {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 3.5, "y": 3},
+ {"matrix": [3, 3], "x": 4.5, "y": 3},
+ {"matrix": [3, 4], "x": 5.5, "y": 3},
+ {"matrix": [3, 5], "x": 6.5, "y": 3},
+ {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+ {"matrix": [8, 0], "x": 8.97, "y": 3},
+ {"matrix": [8, 1], "x": 9.97, "y": 3},
+ {"matrix": [8, 2], "x": 10.97, "y": 3},
+ {"matrix": [8, 3], "x": 11.97, "y": 3},
+ {"matrix": [8, 4], "x": 12.97, "y": 3},
+ {"matrix": [8, 5], "x": 13.97, "y": 3},
+ {"matrix": [8, 6], "x": 14.97, "y": 3, "w": 1.75},
+ {"matrix": [8, 7], "x": 16.72, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4.75, "y": 4},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 1.75},
+ {"matrix": [4, 6], "x": 7.5, "y": 4},
+
+ {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
+ {"matrix": [9, 1], "x": 11.22, "y": 4},
+ {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
+ {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
+ {"matrix": [9, 4], "x": 16.48, "y": 4}
+ ]
},
"LAYOUT_all": {
- "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.660, "y":0}, {"label":"!", "x":2.66, "y":0}, {"label":"@", "x":3.66, "y":0}, {"label":"#", "x":4.66, "y":0}, {"label":"$", "x":5.66, "y":0}, {"label":"%", "x":6.66, "y":0}, {"label":"^", "x":7.66, "y":0}, {"label":"&", "x":9.32, "y":0}, {"label":"*", "x":10.32, "y":0}, {"label":"(", "x":11.32, "y":0}, {"label":")", "x":12.32, "y":0}, {"label":"_", "x":13.32, "y":0}, {"label":"+", "x":14.32, "y":0}, {"label":"Backspace", "x":15.32, "y":0, "w":2}, {"x":0, "y":1}, {"label":"Tab", "x":1.53, "y":1, "w":1.5}, {"label":"Q", "x":3.03, "y":1}, {"label":"W", "x":4.03, "y":1}, {"label":"E", "x":5.03, "y":1}, {"label":"R", "x":6.03, "y":1}, {"label":"T", "x":7.03, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15.05, "y":1}, {"label":"|", "x":16.1, "y":1, "w":1.5}, {"x":0, "y":2}, {"label":"Caps Lock", "x":1.390, "y":2, "w":1.75}, {"label":"A", "x":3.14, "y":2}, {"label":"S", "x":4.14, "y":2}, {"label":"D", "x":5.14, "y":2}, {"label":"F", "x":6.14, "y":2}, {"label":"G", "x":7.14, "y":2}, {"label":"H", "x":9.34, "y":2}, {"label":"J", "x":10.34, "y":2}, {"label":"K", "x":11.34, "y":2}, {"label":"L", "x":12.34, "y":2}, {"label":":", "x":13.34, "y":2}, {"label":"\"", "x":14.34, "y":2}, {"label":"Enter", "x":15.34, "y":2, "w":2.25}, {"x":0, "y":3}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":8.97, "y":3}, {"label":"N", "x":9.97, "y":3}, {"label":"M", "x":10.97, "y":3}, {"label":"<", "x":11.97, "y":3}, {"label":">", "x":12.97, "y":3}, {"label":"?", "x":13.97, "y":3}, {"label":"Shift", "x":14.97, "y":3, "w":1.75}, {"label":"Shift", "x":16.72, "y":3}, {"x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Alt", "x":2.75, "y":4, "w":1.25}, {"label":"\u21d3", "x":4.75, "y":4}, {"x":5.75, "y":4, "w":0.917}, {"x":6.667, "y":4, "w":0.916}, {"x":7.583, "y":4, "w":0.917}, {"x":8.97, "y":4, "w":2.25}, {"label":"\u21d1", "x":11.22, "y":4}, {"label":"Alt", "x":13.98, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.23, "y":4, "w":1.25}, {"label":"Fn", "x":16.48, "y":4}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.66, "y": 0},
+ {"matrix": [0, 2], "x": 2.66, "y": 0},
+ {"matrix": [0, 3], "x": 3.66, "y": 0},
+ {"matrix": [0, 4], "x": 4.66, "y": 0},
+ {"matrix": [0, 5], "x": 5.66, "y": 0},
+ {"matrix": [0, 6], "x": 6.66, "y": 0},
+ {"matrix": [0, 7], "x": 7.66, "y": 0},
+
+ {"matrix": [5, 0], "x": 9.32, "y": 0},
+ {"matrix": [5, 1], "x": 10.32, "y": 0},
+ {"matrix": [5, 2], "x": 11.32, "y": 0},
+ {"matrix": [5, 3], "x": 12.32, "y": 0},
+ {"matrix": [5, 4], "x": 13.32, "y": 0},
+ {"matrix": [5, 5], "x": 14.32, "y": 0},
+ {"matrix": [5, 6], "x": 15.32, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 3.03, "y": 1},
+ {"matrix": [1, 3], "x": 4.03, "y": 1},
+ {"matrix": [1, 4], "x": 5.03, "y": 1},
+ {"matrix": [1, 5], "x": 6.03, "y": 1},
+ {"matrix": [1, 6], "x": 7.03, "y": 1},
+
+ {"matrix": [6, 0], "x": 9, "y": 1},
+ {"matrix": [6, 1], "x": 10, "y": 1},
+ {"matrix": [6, 2], "x": 11, "y": 1},
+ {"matrix": [6, 3], "x": 12, "y": 1},
+ {"matrix": [6, 4], "x": 13, "y": 1},
+ {"matrix": [6, 5], "x": 14, "y": 1},
+ {"matrix": [6, 6], "x": 15.05, "y": 1},
+ {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 3.14, "y": 2},
+ {"matrix": [2, 3], "x": 4.14, "y": 2},
+ {"matrix": [2, 4], "x": 5.14, "y": 2},
+ {"matrix": [2, 5], "x": 6.14, "y": 2},
+ {"matrix": [2, 6], "x": 7.14, "y": 2},
+
+ {"matrix": [7, 0], "x": 9.34, "y": 2},
+ {"matrix": [7, 1], "x": 10.34, "y": 2},
+ {"matrix": [7, 2], "x": 11.34, "y": 2},
+ {"matrix": [7, 3], "x": 12.34, "y": 2},
+ {"matrix": [7, 4], "x": 13.34, "y": 2},
+ {"matrix": [7, 5], "x": 14.34, "y": 2},
+ {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 3.5, "y": 3},
+ {"matrix": [3, 3], "x": 4.5, "y": 3},
+ {"matrix": [3, 4], "x": 5.5, "y": 3},
+ {"matrix": [3, 5], "x": 6.5, "y": 3},
+ {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+ {"matrix": [8, 0], "x": 8.97, "y": 3},
+ {"matrix": [8, 1], "x": 9.97, "y": 3},
+ {"matrix": [8, 2], "x": 10.97, "y": 3},
+ {"matrix": [8, 3], "x": 11.97, "y": 3},
+ {"matrix": [8, 4], "x": 12.97, "y": 3},
+ {"matrix": [8, 5], "x": 13.97, "y": 3},
+ {"matrix": [8, 6], "x": 14.97, "y": 3, "w": 1.75},
+ {"matrix": [8, 7], "x": 16.72, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4.75, "y": 4},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 0.917},
+ {"matrix": [4, 5], "x": 6.667, "y": 4, "w": 0.916},
+ {"matrix": [4, 6], "x": 7.583, "y": 4, "w": 0.917},
+
+ {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
+ {"matrix": [9, 1], "x": 11.22, "y": 4},
+ {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
+ {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
+ {"matrix": [9, 4], "x": 16.48, "y": 4}
+ ]
}
}
}
diff --git a/keyboards/basekeys/slice/rev1_rgb/rev1_rgb.c b/keyboards/basekeys/slice/rev1_rgb/rev1_rgb.c
deleted file mode 100644
index 9ab3d2539a..0000000000
--- a/keyboards/basekeys/slice/rev1_rgb/rev1_rgb.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 2Moons
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#include "rev1_rgb.h"
diff --git a/keyboards/basekeys/slice/rev1_rgb/rev1_rgb.h b/keyboards/basekeys/slice/rev1_rgb/rev1_rgb.h
deleted file mode 100644
index fdc5331585..0000000000
--- a/keyboards/basekeys/slice/rev1_rgb/rev1_rgb.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* Copyright 2020 2Moons
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "slice.h"
-
-#include "quantum.h"
-
-//////////////////////////////////////////////////////////////////////////////
-// When only use Slice Rev1.
-//////////////////////////////////////////////////////////////////////////////
-/*
- * ,------------------------------------------------ --------------------------------------------------.
- * | L00 | L01 | L02 | L03 | L04 | L05 | L06 | L07 | | R00 | R01 | R02 | R03 | R04 | R05 | R06 |
- * |------------------------------------------------ ------------------------------------------------------+
- * | L10 | L11 | L12 | L13 | L14 | L15 | L16 | | R10 | R11 | R12 | R13 | R14 | R15 | R16 | R37 |
- * |---------------------------------------------- ------------------------------------------------------+
- * | L20 | L21 | L22 | L23 | L24 | L25 | L26 | | R20 | R21 | R22 | R23 | R24 | R25 | R26 |
- * |------------------------------------------------- --------------------------------------------------------+
- * | L30 | L31 | L32 | L33 | L34 | L35 | L36 | | R30 | R31 | R32 | R33 | R34 | R34 | R35 | R36 | R37 |
- * |------------------------------------------------- --------------------------------------------------------'
- * | L40 | L41 | L42 | L43 | L44L45L46 | | R40 | R41 | | R42 | R43 | R44 |
- * |------------------------------------------------- -------------------------------------------------------'
- */
-
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, R06, \
- L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, R17, \
- L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
- L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, R37,\
- L40, L41, L42, L43, L45, R40, R41, R42, R43, R44 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05, L06, L07, KC_NO }, \
- { L10, L11, L12, L13, L14, L15, L16, KC_NO, KC_NO }, \
- { L20, L21, L22, L23, L24, L25, L26, KC_NO, KC_NO }, \
- { L30, L31, L32, L33, L34, L35, L36, KC_NO, KC_NO }, \
- { L40, L41, L42, L43, KC_NO, L45, KC_NO, KC_NO, KC_NO }, \
- { R00, R01, R02, R03, R04, R05, R06, KC_NO, KC_NO }, \
- { R10, R11, R12, R13, R14, R15, R16, R17, KC_NO }, \
- { R20, R21, R22, R23, R24, R25, R26, KC_NO, KC_NO }, \
- { R30, R31, R32, R33, R34, R35, R36, R37, KC_NO }, \
- { R40, R41, R42, R43, R44, KC_NO, KC_NO, KC_NO, KC_NO } \
- }
-
-#define LAYOUT_split_left_space( \
- L00, L01, L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, R06, \
- L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, R17, \
- L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
- L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, R37,\
- L40, L41, L42, L43, L44, L46, R40, R41, R42, R43, R44 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05, L06, L07, KC_NO }, \
- { L10, L11, L12, L13, L14, L15, L16, KC_NO, KC_NO }, \
- { L20, L21, L22, L23, L24, L25, L26, KC_NO, KC_NO }, \
- { L30, L31, L32, L33, L34, L35, L36, KC_NO, KC_NO }, \
- { L40, L41, L42, L43, L44, KC_NO, L46, KC_NO, KC_NO }, \
- { R00, R01, R02, R03, R04, R05, R06, KC_NO, KC_NO }, \
- { R10, R11, R12, R13, R14, R15, R16, R17, KC_NO }, \
- { R20, R21, R22, R23, R24, R25, R26, KC_NO, KC_NO }, \
- { R30, R31, R32, R33, R34, R35, R36, R37, KC_NO }, \
- { R40, R41, R42, R43, R44, KC_NO, KC_NO, KC_NO, KC_NO } \
- }
-
-#define LAYOUT_all( \
- L00, L01, L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, R06, \
- L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, R17, \
- L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
- L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, R37,\
- L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05, L06, L07, KC_NO }, \
- { L10, L11, L12, L13, L14, L15, L16, KC_NO, KC_NO }, \
- { L20, L21, L22, L23, L24, L25, L26, KC_NO, KC_NO }, \
- { L30, L31, L32, L33, L34, L35, L36, KC_NO, KC_NO }, \
- { L40, L41, L42, L43, L44, L45, L46, KC_NO, KC_NO }, \
- { R00, R01, R02, R03, R04, R05, R06, KC_NO, KC_NO }, \
- { R10, R11, R12, R13, R14, R15, R16, R17, KC_NO }, \
- { R20, R21, R22, R23, R24, R25, R26, KC_NO, KC_NO }, \
- { R30, R31, R32, R33, R34, R35, R36, R37, KC_NO }, \
- { R40, R41, R42, R43, R44, KC_NO, KC_NO, KC_NO, KC_NO } \
- }
-
diff --git a/keyboards/basekeys/slice/slice.c b/keyboards/basekeys/slice/slice.c
deleted file mode 100644
index 2d7d111f9a..0000000000
--- a/keyboards/basekeys/slice/slice.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 2Moons
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#include "slice.h"
diff --git a/keyboards/basekeys/slice/slice.h b/keyboards/basekeys/slice/slice.h
deleted file mode 100644
index bc3eb813a2..0000000000
--- a/keyboards/basekeys/slice/slice.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2020 2Moons
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-#ifdef KEYBOARD_basekeys_slice_rev1
- #include "rev1.h"
-#endif
-
-#ifdef KEYBOARD_basekeys_slice_rev1_rgb
- #include "rev1_rgb.h"
-#endif
diff --git a/keyboards/basekeys/trifecta/config.h b/keyboards/basekeys/trifecta/config.h
index c06395545d..85ae15513e 100644
--- a/keyboards/basekeys/trifecta/config.h
+++ b/keyboards/basekeys/trifecta/config.h
@@ -16,22 +16,10 @@
#pragma once
-
-/* key matrix pins */
-
-#define MATRIX_ROW_PINS { B0, B7, F7, B1, B6, C6, C7, B5, F6, D2 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, D1, B2, D0, B3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-
-#define RGB_DI_PIN E6
#define RGB_MATRIX_LED_COUNT 80
/* RGB LED */
#ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN E6
#define RGBLED_NUM 80 // Number of LEDs. backlight x69
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
@@ -48,9 +36,6 @@
#define RGBLIGHT_EFFECT_TWINKLE
#endif
-/* Limits the brightness of the LEDS range of 255-0 (255 is default)*/
-#define RGBLIGHT_LIMIT_VAL 128
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/basekeys/trifecta/info.json b/keyboards/basekeys/trifecta/info.json
index 8743e3aad1..3cc2c19f8b 100644
--- a/keyboards/basekeys/trifecta/info.json
+++ b/keyboards/basekeys/trifecta/info.json
@@ -1,13 +1,18 @@
{
- "keyboard_name": "Trifecta",
+ "keyboard_name": "Trifecta",
"manufacturer": "Swiftrax",
- "url": "https://www.basekeys.com",
- "maintainer": "Swiftrax",
+ "url": "https://www.basekeys.com",
+ "maintainer": "Swiftrax",
"usb": {
"vid": "0x04D8",
"pid": "0xEAF3",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F0", "F1", "F4", "F5", "D1", "B2", "D0", "B3"],
+ "rows": ["B0", "B7", "F7", "B1", "B6", "C6", "C7", "B5", "F6", "D2"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "D4", "pin_b": "B4"},
@@ -18,11 +23,101 @@
"bootmagic": {
"matrix": [1, 0]
},
+ "ws2812": {
+ "pin": "E6"
+ },
+ "rgblight": {
+ "max_brightness": 128
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
- "layouts": {
+ "layouts": {
"LAYOUT": {
- "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":8.75, "y":0}, {"label":"*", "x":9.75, "y":0}, {"label":"(", "x":10.75, "y":0}, {"label":")", "x":11.75, "y":0}, {"label":"_", "x":12.75, "y":0}, {"label":"+", "x":13.75, "y":0}, {"label":"BS", "x":14.75, "y":0}, {"x":15.75, "y":0}, {"x":17, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":8.25, "y":1}, {"label":"U", "x":9.25, "y":1}, {"label":"I", "x":10.25, "y":1}, {"label":"O", "x":11.25, "y":1}, {"label":"P", "x":12.25, "y":1}, {"label":"{", "x":13.25, "y":1}, {"label":"}", "x":14.25, "y":1}, {"label":"|", "x":15.25, "y":1, "w":1.5}, {"x":17, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":8.5, "y":2}, {"label":"J", "x":9.5, "y":2}, {"label":"K", "x":10.5, "y":2}, {"label":"L", "x":11.5, "y":2}, {"label":":", "x":12.5, "y":2}, {"label":"\"", "x":13.5, "y":2}, {"label":"Enter", "x":14.5, "y":2, "w":2.25}, {"x":17, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"x":8, "y":3}, {"label":"N", "x":9, "y":3}, {"label":"M", "x":10, "y":3}, {"label":"<", "x":11, "y":3}, {"label":">", "x":12, "y":3}, {"label":"?", "x":13, "y":3}, {"label":"Shift", "x":14, "y":3, "w":1.75}, {"x":16, "y":3.25}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":3, "y":4, "w":1.5}, {"x":4.5, "y":4, "w":2.25}, {"x":6.75, "y":4}, {"x":8.5, "y":4, "w":2.75}, {"label":"Alt", "x":11.25, "y":4, "w":1.5}, {"label":"Win", "x":13.5, "y":4, "w":1.25}, {"x":15, "y":4.25}, {"x":16, "y":4.25}, {"x":17, "y":4.25}]
+ "layout": [
+ {"matrix": [1, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [1, 1], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [1, 2], "x": 4, "y": 0},
+ {"matrix": [0, 3], "x": 5, "y": 0},
+ {"matrix": [1, 3], "x": 6, "y": 0},
+
+ {"matrix": [0, 4], "x": 8.75, "y": 0},
+ {"matrix": [1, 4], "x": 9.75, "y": 0},
+ {"matrix": [0, 5], "x": 10.75, "y": 0},
+ {"matrix": [1, 5], "x": 11.75, "y": 0},
+ {"matrix": [0, 6], "x": 12.75, "y": 0},
+ {"matrix": [1, 6], "x": 13.75, "y": 0},
+ {"matrix": [0, 7], "x": 14.75, "y": 0},
+ {"matrix": [1, 7], "x": 15.75, "y": 0},
+
+ {"matrix": [3, 7], "x": 17, "y": 0},
+
+ {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 1},
+ {"matrix": [3, 1], "x": 2.5, "y": 1},
+ {"matrix": [2, 2], "x": 3.5, "y": 1},
+ {"matrix": [3, 2], "x": 4.5, "y": 1},
+ {"matrix": [2, 3], "x": 5.5, "y": 1},
+
+ {"matrix": [3, 3], "x": 8.25, "y": 1},
+ {"matrix": [2, 4], "x": 9.25, "y": 1},
+ {"matrix": [3, 4], "x": 10.25, "y": 1},
+ {"matrix": [2, 5], "x": 11.25, "y": 1},
+ {"matrix": [3, 5], "x": 12.25, "y": 1},
+ {"matrix": [2, 6], "x": 13.25, "y": 1},
+ {"matrix": [3, 6], "x": 14.25, "y": 1},
+ {"matrix": [2, 7], "x": 15.25, "y": 1, "w": 1.5},
+
+ {"matrix": [5, 7], "x": 17, "y": 1},
+
+ {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [5, 1], "x": 1.75, "y": 2},
+ {"matrix": [4, 1], "x": 2.75, "y": 2},
+ {"matrix": [5, 2], "x": 3.75, "y": 2},
+ {"matrix": [4, 2], "x": 4.75, "y": 2},
+ {"matrix": [5, 3], "x": 5.75, "y": 2},
+
+ {"matrix": [4, 3], "x": 8.5, "y": 2},
+ {"matrix": [5, 4], "x": 9.5, "y": 2},
+ {"matrix": [4, 4], "x": 10.5, "y": 2},
+ {"matrix": [5, 5], "x": 11.5, "y": 2},
+ {"matrix": [4, 5], "x": 12.5, "y": 2},
+ {"matrix": [5, 6], "x": 13.5, "y": 2},
+ {"matrix": [4, 7], "x": 14.5, "y": 2, "w": 2.25},
+
+ {"matrix": [7, 7], "x": 17, "y": 2},
+
+ {"matrix": [7, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [6, 1], "x": 2.25, "y": 3},
+ {"matrix": [7, 1], "x": 3.25, "y": 3},
+ {"matrix": [6, 2], "x": 4.25, "y": 3},
+ {"matrix": [7, 2], "x": 5.25, "y": 3},
+ {"matrix": [6, 3], "x": 6.25, "y": 3},
+
+ {"matrix": [7, 3], "x": 8, "y": 3},
+ {"matrix": [6, 4], "x": 9, "y": 3},
+ {"matrix": [7, 4], "x": 10, "y": 3},
+ {"matrix": [6, 5], "x": 11, "y": 3},
+ {"matrix": [7, 5], "x": 12, "y": 3},
+ {"matrix": [6, 6], "x": 13, "y": 3},
+ {"matrix": [7, 6], "x": 14, "y": 3, "w": 1.75},
+
+ {"matrix": [6, 7], "x": 16, "y": 3.25},
+
+ {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [9, 1], "x": 3, "y": 4, "w": 1.5},
+ {"matrix": [8, 2], "x": 4.5, "y": 4, "w": 2.25},
+ {"matrix": [9, 4], "x": 6.75, "y": 4},
+ {"matrix": [8, 5], "x": 8.5, "y": 4, "w": 2.75},
+ {"matrix": [9, 5], "x": 11.25, "y": 4, "w": 1.5},
+ {"matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.25},
+
+ {"matrix": [9, 6], "x": 15, "y": 4.25},
+ {"matrix": [8, 7], "x": 16, "y": 4.25},
+ {"matrix": [9, 7], "x": 17, "y": 4.25}
+ ]
}
}
}
diff --git a/keyboards/basekeys/trifecta/trifecta.c b/keyboards/basekeys/trifecta/trifecta.c
index e7aca201ce..926180d996 100644
--- a/keyboards/basekeys/trifecta/trifecta.c
+++ b/keyboards/basekeys/trifecta/trifecta.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "trifecta.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/basekeys/trifecta/trifecta.h b/keyboards/basekeys/trifecta/trifecta.h
deleted file mode 100644
index ed337813c6..0000000000
--- a/keyboards/basekeys/trifecta/trifecta.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2020 Swiftrax and Basekeys.com
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO//readabilty
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
- k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07, k17, k37, \
- k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27, k57, \
- k40, k51, k41, k52, k42, k53, k43, k54, k44, k55, k45, k56, k47, k77, \
- k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76, k67, \
- k90, k81, k91, k82, k94, k85, k95, k86, k96, k87, k97 \
-) \
-{ \
- { XXX, k01, k02, k03, k04, k05, k06, k07}, \
- { k10, k11, k12, k13, k14, k15, k16, k17}, \
- { XXX, k21, k22, k23, k24, k25, k26, k27}, \
- { k30, k31, k32, k33, k34, k35, k36, k37}, \
- { k40, k41, k42, k43, k44, k45, XXX, k47}, \
- { XXX, k51, k52, k53, k54, k55, k56, k57}, \
- { XXX, k61, k62, k63, k64, k65, k66, k67}, \
- { k70, k71, k72, k73, k74, k75, k76, k77}, \
- { XXX, k81, k82, XXX, XXX, k85, k86, k87}, \
- { k90, k91, XXX, XXX, k94, k95, k96, k97} \
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-13 08:30:41 +0000