summaryrefslogtreecommitdiff
path: root/keyboards/basekeys
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/basekeys')
-rw-r--r--keyboards/basekeys/trifecta/info.json88
-rw-r--r--keyboards/basekeys/trifecta/trifecta.c2
-rw-r--r--keyboards/basekeys/trifecta/trifecta.h48
3 files changed, 87 insertions, 51 deletions
diff --git a/keyboards/basekeys/trifecta/info.json b/keyboards/basekeys/trifecta/info.json
index d52c54dbc6..eae4ac1d63 100644
--- a/keyboards/basekeys/trifecta/info.json
+++ b/keyboards/basekeys/trifecta/info.json
@@ -28,9 +28,93 @@
},
"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} \
-}