summaryrefslogtreecommitdiff
path: root/keyboards/peej
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/peej')
-rw-r--r--keyboards/peej/lumberjack/info.json124
-rw-r--r--keyboards/peej/lumberjack/lumberjack.h16
-rw-r--r--keyboards/peej/rosaline/ortho/info.json123
-rw-r--r--keyboards/peej/rosaline/ortho/ortho.h56
-rw-r--r--keyboards/peej/tripel/info.json77
-rw-r--r--keyboards/peej/tripel/left/info.json81
-rw-r--r--keyboards/peej/tripel/left/left.h38
-rw-r--r--keyboards/peej/tripel/middle/info.json81
-rw-r--r--keyboards/peej/tripel/middle/middle.h38
-rw-r--r--keyboards/peej/tripel/right/info.json81
-rw-r--r--keyboards/peej/tripel/right/right.h38
11 files changed, 371 insertions, 382 deletions
diff --git a/keyboards/peej/lumberjack/info.json b/keyboards/peej/lumberjack/info.json
index 8c37a5bf74..c65c4bea47 100644
--- a/keyboards/peej/lumberjack/info.json
+++ b/keyboards/peej/lumberjack/info.json
@@ -19,66 +19,70 @@
"layouts": {
"LAYOUT_ortho_5x12": {
"layout": [
- { "x": 0, "y": 0 },
- { "x": 1, "y": 0 },
- { "x": 2, "y": 0 },
- { "x": 3, "y": 0 },
- { "x": 4, "y": 0 },
- { "x": 5, "y": 0 },
- { "x": 6, "y": 0 },
- { "x": 7, "y": 0 },
- { "x": 8, "y": 0 },
- { "x": 9, "y": 0 },
- { "x": 10, "y": 0 },
- { "x": 11, "y": 0 },
- { "x": 0, "y": 1 },
- { "x": 1, "y": 1 },
- { "x": 2, "y": 1 },
- { "x": 3, "y": 1 },
- { "x": 4, "y": 1 },
- { "x": 5, "y": 1 },
- { "x": 6, "y": 1 },
- { "x": 7, "y": 1 },
- { "x": 8, "y": 1 },
- { "x": 9, "y": 1 },
- { "x": 10, "y": 1 },
- { "x": 11, "y": 1 },
- { "x": 0, "y": 2 },
- { "x": 1, "y": 2 },
- { "x": 2, "y": 2 },
- { "x": 3, "y": 2 },
- { "x": 4, "y": 2 },
- { "x": 5, "y": 2 },
- { "x": 6, "y": 2 },
- { "x": 7, "y": 2 },
- { "x": 8, "y": 2 },
- { "x": 9, "y": 2 },
- { "x": 10, "y": 2 },
- { "x": 11, "y": 2 },
- { "x": 0, "y": 3 },
- { "x": 1, "y": 3 },
- { "x": 2, "y": 3 },
- { "x": 3, "y": 3 },
- { "x": 4, "y": 3 },
- { "x": 5, "y": 3 },
- { "x": 6, "y": 3 },
- { "x": 7, "y": 3 },
- { "x": 8, "y": 3 },
- { "x": 9, "y": 3 },
- { "x": 10, "y": 3 },
- { "x": 11, "y": 3 },
- { "x": 0, "y": 4 },
- { "x": 1, "y": 4 },
- { "x": 2, "y": 4 },
- { "x": 3, "y": 4 },
- { "x": 4, "y": 4 },
- { "x": 5, "y": 4 },
- { "x": 6, "y": 4 },
- { "x": 7, "y": 4 },
- { "x": 8, "y": 4 },
- { "x": 9, "y": 4 },
- { "x": 10, "y": 4 },
- { "x": 11, "y": 4 }
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [1, 4], "x": 5, "y": 0},
+ {"matrix": [1, 9], "x": 6, "y": 0},
+ {"matrix": [0, 9], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 7], "x": 9, "y": 0},
+ {"matrix": [0, 6], "x": 10, "y": 0},
+ {"matrix": [0, 5], "x": 11, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [2, 3], "x": 4, "y": 1},
+ {"matrix": [2, 4], "x": 5, "y": 1},
+ {"matrix": [2, 9], "x": 6, "y": 1},
+ {"matrix": [2, 8], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 7], "x": 9, "y": 1},
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 5], "x": 11, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [3, 2], "x": 3, "y": 2},
+ {"matrix": [3, 3], "x": 4, "y": 2},
+ {"matrix": [3, 4], "x": 5, "y": 2},
+ {"matrix": [3, 9], "x": 6, "y": 2},
+ {"matrix": [3, 8], "x": 7, "y": 2},
+ {"matrix": [3, 7], "x": 8, "y": 2},
+ {"matrix": [2, 7], "x": 9, "y": 2},
+ {"matrix": [2, 6], "x": 10, "y": 2},
+ {"matrix": [2, 5], "x": 11, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [4, 1], "x": 2, "y": 3},
+ {"matrix": [4, 2], "x": 3, "y": 3},
+ {"matrix": [4, 3], "x": 4, "y": 3},
+ {"matrix": [4, 4], "x": 5, "y": 3},
+ {"matrix": [4, 9], "x": 6, "y": 3},
+ {"matrix": [4, 8], "x": 7, "y": 3},
+ {"matrix": [4, 7], "x": 8, "y": 3},
+ {"matrix": [4, 6], "x": 9, "y": 3},
+ {"matrix": [3, 6], "x": 10, "y": 3},
+ {"matrix": [3, 5], "x": 11, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [5, 0], "x": 1, "y": 4},
+ {"matrix": [5, 1], "x": 2, "y": 4},
+ {"matrix": [5, 2], "x": 3, "y": 4},
+ {"matrix": [5, 3], "x": 4, "y": 4},
+ {"matrix": [5, 4], "x": 5, "y": 4},
+ {"matrix": [5, 9], "x": 6, "y": 4},
+ {"matrix": [5, 8], "x": 7, "y": 4},
+ {"matrix": [5, 7], "x": 8, "y": 4},
+ {"matrix": [5, 6], "x": 9, "y": 4},
+ {"matrix": [5, 5], "x": 10, "y": 4},
+ {"matrix": [4, 5], "x": 11, "y": 4}
]
}
}
diff --git a/keyboards/peej/lumberjack/lumberjack.h b/keyboards/peej/lumberjack/lumberjack.h
index 785f13a903..b14f72d81e 100644
--- a/keyboards/peej/lumberjack/lumberjack.h
+++ b/keyboards/peej/lumberjack/lumberjack.h
@@ -18,21 +18,5 @@
#include "quantum.h"
-#define LAYOUT_ortho_5x12( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
- k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b \
-) \
-{ \
- { k00, k01, k02, k03, k04, k0b, k0a, k09, k08, k07 }, \
- { k10, k11, k12, k13, k05, k1b, k1a, k19, k18, k06 }, \
- { k20, k21, k22, k14, k15, k2b, k2a, k29, k17, k16 }, \
- { k30, k31, k23, k24, k25, k3b, k3a, k28, k27, k26 }, \
- { k40, k32, k33, k34, k35, k4b, k39, k38, k37, k36 }, \
- { k41, k42, k43, k44, k45, k4a, k49, k48, k47, k46 } \
-}
-
#define LED1 C5
#define LED2 C4
diff --git a/keyboards/peej/rosaline/ortho/info.json b/keyboards/peej/rosaline/ortho/info.json
index fcd6fce1b4..c175aafb42 100644
--- a/keyboards/peej/rosaline/ortho/info.json
+++ b/keyboards/peej/rosaline/ortho/info.json
@@ -18,66 +18,69 @@
"layouts": {
"LAYOUT_ortho_4x15": {
"layout": [
- { "x": 0, "y": 0 },
- { "x": 1, "y": 0 },
- { "x": 2, "y": 0 },
- { "x": 3, "y": 0 },
- { "x": 4, "y": 0 },
- { "x": 5, "y": 0 },
- { "x": 6, "y": 0 },
- { "x": 7, "y": 0 },
- { "x": 8, "y": 0 },
- { "x": 9, "y": 0 },
- { "x": 10, "y": 0 },
- { "x": 11, "y": 0 },
- { "x": 12, "y": 0 },
- { "x": 13, "y": 0 },
- { "x": 14, "y": 0 },
- { "x": 0, "y": 1 },
- { "x": 1, "y": 1 },
- { "x": 2, "y": 1 },
- { "x": 3, "y": 1 },
- { "x": 4, "y": 1 },
- { "x": 5, "y": 1 },
- { "x": 6, "y": 1 },
- { "x": 7, "y": 1 },
- { "x": 8, "y": 1 },
- { "x": 9, "y": 1 },
- { "x": 10, "y": 1 },
- { "x": 11, "y": 1 },
- { "x": 12, "y": 1 },
- { "x": 13, "y": 1 },
- { "x": 14, "y": 1 },
- { "x": 0, "y": 2 },
- { "x": 1, "y": 2 },
- { "x": 2, "y": 2 },
- { "x": 3, "y": 2 },
- { "x": 4, "y": 2 },
- { "x": 5, "y": 2 },
- { "x": 6, "y": 2 },
- { "x": 7, "y": 2 },
- { "x": 8, "y": 2 },
- { "x": 9, "y": 2 },
- { "x": 10, "y": 2 },
- { "x": 11, "y": 2 },
- { "x": 12, "y": 2 },
- { "x": 13, "y": 2 },
- { "x": 14, "y": 2 },
- { "x": 0, "y": 3 },
- { "x": 1, "y": 3 },
- { "x": 2, "y": 3 },
- { "x": 3, "y": 3 },
- { "x": 4, "y": 3 },
- { "x": 5, "y": 3 },
- { "x": 6, "y": 3 },
- { "x": 7, "y": 3 },
- { "x": 8, "y": 3 },
- { "x": 9, "y": 3 },
- { "x": 10, "y": 3 },
- { "x": 11, "y": 3 },
- { "x": 12, "y": 3 },
- { "x": 13, "y": 3 },
- { "x": 14, "y": 3 }
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [4, 0], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [4, 1], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+ {"matrix": [4, 2], "x": 5, "y": 0},
+ {"matrix": [0, 3], "x": 6, "y": 0},
+ {"matrix": [4, 3], "x": 7, "y": 0},
+ {"matrix": [0, 4], "x": 8, "y": 0},
+ {"matrix": [4, 4], "x": 9, "y": 0},
+ {"matrix": [0, 5], "x": 10, "y": 0},
+ {"matrix": [4, 5], "x": 11, "y": 0},
+ {"matrix": [0, 6], "x": 12, "y": 0},
+ {"matrix": [4, 6], "x": 13, "y": 0},
+ {"matrix": [0, 7], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [5, 0], "x": 1, "y": 1},
+ {"matrix": [1, 1], "x": 2, "y": 1},
+ {"matrix": [5, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [5, 2], "x": 5, "y": 1},
+ {"matrix": [1, 3], "x": 6, "y": 1},
+ {"matrix": [5, 3], "x": 7, "y": 1},
+ {"matrix": [1, 4], "x": 8, "y": 1},
+ {"matrix": [5, 4], "x": 9, "y": 1},
+ {"matrix": [1, 5], "x": 10, "y": 1},
+ {"matrix": [5, 5], "x": 11, "y": 1},
+ {"matrix": [1, 6], "x": 12, "y": 1},
+ {"matrix": [5, 6], "x": 13, "y": 1},
+ {"matrix": [1, 7], "x": 14, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [6, 0], "x": 1, "y": 2},
+ {"matrix": [2, 1], "x": 2, "y": 2},
+ {"matrix": [6, 1], "x": 3, "y": 2},
+ {"matrix": [2, 2], "x": 4, "y": 2},
+ {"matrix": [6, 2], "x": 5, "y": 2},
+ {"matrix": [2, 3], "x": 6, "y": 2},
+ {"matrix": [6, 3], "x": 7, "y": 2},
+ {"matrix": [2, 4], "x": 8, "y": 2},
+ {"matrix": [6, 4], "x": 9, "y": 2},
+ {"matrix": [2, 5], "x": 10, "y": 2},
+ {"matrix": [6, 5], "x": 11, "y": 2},
+ {"matrix": [2, 6], "x": 12, "y": 2},
+ {"matrix": [6, 6], "x": 13, "y": 2},
+ {"matrix": [2, 7], "x": 14, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [7, 0], "x": 1, "y": 3},
+ {"matrix": [3, 1], "x": 2, "y": 3},
+ {"matrix": [7, 1], "x": 3, "y": 3},
+ {"matrix": [3, 2], "x": 4, "y": 3},
+ {"matrix": [7, 2], "x": 5, "y": 3},
+ {"matrix": [3, 3], "x": 6, "y": 3},
+ {"matrix": [7, 3], "x": 7, "y": 3},
+ {"matrix": [3, 4], "x": 8, "y": 3},
+ {"matrix": [7, 4], "x": 9, "y": 3},
+ {"matrix": [3, 5], "x": 10, "y": 3},
+ {"matrix": [7, 5], "x": 11, "y": 3},
+ {"matrix": [3, 6], "x": 12, "y": 3},
+ {"matrix": [7, 6], "x": 13, "y": 3},
+ {"matrix": [3, 7], "x": 14, "y": 3}
]
}
}
diff --git a/keyboards/peej/rosaline/ortho/ortho.h b/keyboards/peej/rosaline/ortho/ortho.h
deleted file mode 100644
index 30beb92831..0000000000
--- a/keyboards/peej/rosaline/ortho/ortho.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Copyright 2021 Paul James
- *
- * 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"
-
-/*
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │00 │40 │01 │41 │02 │42 │03 │43 │04 │44 │05 │45 │06 │46 │07 │
- * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
- * │10 │50 │11 │51 │12 │52 │13 │53 │14 │54 │15 │55 │16 │56 │17 │
- * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
- * │20 │60 │21 │61 │22 │62 │23 │63 │24 │64 │25 │65 │26 │66 │27 │
- * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
- * │30 │70 │31 │71 │32 │72 │33 │73 │34 │74 │35 │75 │36 │76 │37 │
- * └───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
- * ┌───────────────────────────┐
- * │73 │ 7u Space
- * └───────────────────────────┘
- * ┌───────┐ ┌───────┐
- * 2u Left │32 │ │35 │ 2u Right
- * └───────┘ └───────┘
- */
-
-#define XXX KC_NO
-
-#define LAYOUT_ortho_4x15( \
- k00, k40, k01, k41, k02, k42, k03, k43, k04, k44, k05, k45, k06, k46, k07, \
- k10, k50, k11, k51, k12, k52, k13, k53, k14, k54, k15, k55, k16, k56, k17, \
- k20, k60, k21, k61, k22, k62, k23, k63, k24, k64, k25, k65, k26, k66, k27, \
- k30, k70, k31, k71, k32, k72, k33, k73, k34, k74, k35, k75, k36, k76, k37 \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07 }, \
- { k10, k11, k12, k13, k14, k15, k16, k17 }, \
- { k20, k21, k22, k23, k24, k25, k26, k27 }, \
- { k30, k31, k32, k33, k34, k35, k36, k37 }, \
- { k40, k41, k42, k43, k44, k45, k46, XXX }, \
- { k50, k51, k52, k53, k54, k55, k56, XXX }, \
- { k60, k61, k62, k63, k64, k65, k66, XXX }, \
- { k70, k71, k72, k73, k74, k75, k76, XXX } \
-}
diff --git a/keyboards/peej/tripel/info.json b/keyboards/peej/tripel/info.json
index c5aebfd106..15980f254a 100644
--- a/keyboards/peej/tripel/info.json
+++ b/keyboards/peej/tripel/info.json
@@ -14,80 +14,5 @@
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT_ortho_7u": {
- "layout": [
- { "x":0, "y":0 },
- { "x":1, "y":0 },
- { "x":2, "y":0 },
- { "x":3, "y":0 },
- { "x":4, "y":0 },
- { "x":5, "y":0 },
- { "x":6, "y":0 },
- { "x":7, "y":0 },
- { "x":8, "y":0 },
- { "x":9, "y":0 },
- { "x":10, "y":0 },
- { "x":11, "y":0 },
- { "x":12, "y":0 },
- { "x":13, "y":0 },
- { "x":14, "y":0 },
- { "x":0, "y":1 },
- { "x":1, "y":1 },
- { "x":2, "y":1 },
- { "x":3, "y":1 },
- { "x":4, "y":1 },
- { "x":5, "y":1 },
- { "x":6, "y":1 },
- { "x":7, "y":1 },
- { "x":8, "y":1 },
- { "x":9, "y":1 },
- { "x":10, "y":1 },
- { "x":11, "y":1 },
- { "x":12, "y":1 },
- { "x":13, "y":1 },
- { "x":14, "y":1 },
- { "x":0, "y":2 },
- { "x":1, "y":2 },
- { "x":2, "y":2 },
- { "x":3, "y":2 },
- { "x":4, "y":2 },
- { "x":5, "y":2 },
- { "x":6, "y":2 },
- { "x":7, "y":2 },
- { "x":8, "y":2 },
- { "x":9, "y":2 },
- { "x":10, "y":2 },
- { "x":11, "y":2 },
- { "x":12, "y":2 },
- { "x":13, "y":2 },
- { "x":14, "y":2 },
- { "x":0, "y":3 },
- { "x":1, "y":3 },
- { "x":2, "y":3 },
- { "x":3, "y":3 },
- { "x":4, "y":3 },
- { "x":5, "y":3 },
- { "x":6, "y":3 },
- { "x":7, "y":3 },
- { "x":8, "y":3 },
- { "x":9, "y":3 },
- { "x":10, "y":3 },
- { "x":11, "y":3 },
- { "x":12, "y":3 },
- { "x":13, "y":3 },
- { "x":14, "y":3 },
- { "x":0, "y":4 },
- { "x":1, "y":4 },
- { "x":2, "y":4 },
- { "x":3, "y":4 },
- { "x":7, "y":4, "w":7 },
- { "x":11, "y":4 },
- { "x":12, "y":4 },
- { "x":13, "y":4 },
- { "x":14, "y":4 }
- ]
- }
- }
+ "bootloader": "caterina"
}
diff --git a/keyboards/peej/tripel/left/info.json b/keyboards/peej/tripel/left/info.json
new file mode 100644
index 0000000000..b938ef9b9a
--- /dev/null
+++ b/keyboards/peej/tripel/left/info.json
@@ -0,0 +1,81 @@
+{
+ "layouts": {
+ "LAYOUT_ortho_7u": {
+ "layout": [
+ {"matrix": [3, 0], "x": 0, "y": 0},
+ {"matrix": [3, 1], "x": 1, "y": 0},
+ {"matrix": [3, 2], "x": 2, "y": 0},
+ {"matrix": [3, 3], "x": 3, "y": 0},
+ {"matrix": [3, 4], "x": 4, "y": 0},
+ {"matrix": [6, 0], "x": 5, "y": 0},
+ {"matrix": [6, 1], "x": 6, "y": 0},
+ {"matrix": [6, 2], "x": 7, "y": 0},
+ {"matrix": [6, 3], "x": 8, "y": 0},
+ {"matrix": [6, 4], "x": 9, "y": 0},
+ {"matrix": [0, 0], "x": 10, "y": 0},
+ {"matrix": [0, 1], "x": 11, "y": 0},
+ {"matrix": [0, 2], "x": 12, "y": 0},
+ {"matrix": [0, 3], "x": 13, "y": 0},
+ {"matrix": [0, 4], "x": 14, "y": 0},
+
+ {"matrix": [4, 0], "x": 0, "y": 1},
+ {"matrix": [4, 1], "x": 1, "y": 1},
+ {"matrix": [4, 2], "x": 2, "y": 1},
+ {"matrix": [4, 3], "x": 3, "y": 1},
+ {"matrix": [3, 5], "x": 4, "y": 1},
+ {"matrix": [7, 0], "x": 5, "y": 1},
+ {"matrix": [7, 1], "x": 6, "y": 1},
+ {"matrix": [7, 2], "x": 7, "y": 1},
+ {"matrix": [7, 3], "x": 8, "y": 1},
+ {"matrix": [6, 5], "x": 9, "y": 1},
+ {"matrix": [1, 0], "x": 10, "y": 1},
+ {"matrix": [1, 1], "x": 11, "y": 1},
+ {"matrix": [1, 2], "x": 12, "y": 1},
+ {"matrix": [1, 3], "x": 13, "y": 1},
+ {"matrix": [0, 5], "x": 14, "y": 1},
+
+ {"matrix": [5, 0], "x": 0, "y": 2},
+ {"matrix": [5, 1], "x": 1, "y": 2},
+ {"matrix": [5, 2], "x": 2, "y": 2},
+ {"matrix": [4, 4], "x": 3, "y": 2},
+ {"matrix": [3, 6], "x": 4, "y": 2},
+ {"matrix": [8, 0], "x": 5, "y": 2},
+ {"matrix": [8, 1], "x": 6, "y": 2},
+ {"matrix": [8, 2], "x": 7, "y": 2},
+ {"matrix": [7, 4], "x": 8, "y": 2},
+ {"matrix": [6, 6], "x": 9, "y": 2},
+ {"matrix": [2, 0], "x": 10, "y": 2},
+ {"matrix": [2, 1], "x": 11, "y": 2},
+ {"matrix": [2, 2], "x": 12, "y": 2},
+ {"matrix": [1, 4], "x": 13, "y": 2},
+ {"matrix": [0, 6], "x": 14, "y": 2},
+
+ {"matrix": [5, 5], "x": 0, "y": 3},
+ {"matrix": [5, 4], "x": 1, "y": 3},
+ {"matrix": [5, 3], "x": 2, "y": 3},
+ {"matrix": [4, 5], "x": 3, "y": 3},
+ {"matrix": [3, 7], "x": 4, "y": 3},
+ {"matrix": [8, 5], "x": 5, "y": 3},
+ {"matrix": [8, 4], "x": 6, "y": 3},
+ {"matrix": [8, 3], "x": 7, "y": 3},
+ {"matrix": [7, 5], "x": 8, "y": 3},
+ {"matrix": [6, 7], "x": 9, "y": 3},
+ {"matrix": [2, 5], "x": 10, "y": 3},
+ {"matrix": [2, 4], "x": 11, "y": 3},
+ {"matrix": [2, 3], "x": 12, "y": 3},
+ {"matrix": [1, 5], "x": 13, "y": 3},
+ {"matrix": [0, 7], "x": 14, "y": 3},
+
+ {"matrix": [5, 6], "x": 0, "y": 4},
+ {"matrix": [5, 7], "x": 1, "y": 4},
+ {"matrix": [4, 6], "x": 2, "y": 4},
+ {"matrix": [4, 7], "x": 3, "y": 4},
+ {"matrix": [7, 6], "x": 7, "y": 4, "w": 7},
+ {"matrix": [2, 7], "x": 11, "y": 4},
+ {"matrix": [1, 6], "x": 12, "y": 4},
+ {"matrix": [1, 7], "x": 13, "y": 4},
+ {"matrix": [2, 6], "x": 14, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/peej/tripel/left/left.h b/keyboards/peej/tripel/left/left.h
deleted file mode 100644
index 852a503e60..0000000000
--- a/keyboards/peej/tripel/left/left.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2021 Paul James
- *
- * 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 LAYOUT_ortho_7u( \
- l11, l12, l13, l14, l15, m11, m12, m13, m14, m15, r11, r12, r13, r14, r15, \
- l21, l22, l23, l24, l25, m21, m22, m23, m24, m25, r21, r22, r23, r24, r25, \
- l31, l32, l33, l34, l35, m31, m32, m33, m34, m35, r31, r32, r33, r34, r35, \
- l41, l42, l43, l44, l45, m41, m42, m43, m44, m45, r41, r42, r43, r44, r45, \
- l51, l52, l53, l54, m53, r52, r53, r54, r51 \
-) \
-{ \
- { r11, r12, r13, r14, r15, r25, r35, r45 }, \
- { r21, r22, r23, r24, r34, r44, r53, r54 }, \
- { r31, r32, r33, r43, r42, r41, r51, r52 }, \
- { l11, l12, l13, l14, l15, l25, l35, l45 }, \
- { l21, l22, l23, l24, l34, l44, l53, l54 }, \
- { l31, l32, l33, l43, l42, l41, l51, l52 }, \
- { m11, m12, m13, m14, m15, m25, m35, m45 }, \
- { m21, m22, m23, m24, m34, m44, m53, KC_NO }, \
- { m31, m32, m33, m43, m42, m41, KC_NO, KC_NO } \
-}
diff --git a/keyboards/peej/tripel/middle/info.json b/keyboards/peej/tripel/middle/info.json
new file mode 100644
index 0000000000..b1bdf10f82
--- /dev/null
+++ b/keyboards/peej/tripel/middle/info.json
@@ -0,0 +1,81 @@
+{
+ "layouts": {
+ "LAYOUT_ortho_7u": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [3, 0], "x": 5, "y": 0},
+ {"matrix": [3, 1], "x": 6, "y": 0},
+ {"matrix": [3, 2], "x": 7, "y": 0},
+ {"matrix": [3, 3], "x": 8, "y": 0},
+ {"matrix": [3, 4], "x": 9, "y": 0},
+ {"matrix": [6, 0], "x": 10, "y": 0},
+ {"matrix": [6, 1], "x": 11, "y": 0},
+ {"matrix": [6, 2], "x": 12, "y": 0},
+ {"matrix": [6, 3], "x": 13, "y": 0},
+ {"matrix": [6, 4], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [0, 5], "x": 4, "y": 1},
+ {"matrix": [4, 0], "x": 5, "y": 1},
+ {"matrix": [4, 1], "x": 6, "y": 1},
+ {"matrix": [4, 2], "x": 7, "y": 1},
+ {"matrix": [4, 3], "x": 8, "y": 1},
+ {"matrix": [3, 5], "x": 9, "y": 1},
+ {"matrix": [7, 0], "x": 10, "y": 1},
+ {"matrix": [7, 1], "x": 11, "y": 1},
+ {"matrix": [7, 2], "x": 12, "y": 1},
+ {"matrix": [7, 3], "x": 13, "y": 1},
+ {"matrix": [6, 5], "x": 14, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [1, 4], "x": 3, "y": 2},
+ {"matrix": [0, 6], "x": 4, "y": 2},
+ {"matrix": [5, 0], "x": 5, "y": 2},
+ {"matrix": [5, 1], "x": 6, "y": 2},
+ {"matrix": [5, 2], "x": 7, "y": 2},
+ {"matrix": [4, 4], "x": 8, "y": 2},
+ {"matrix": [3, 6], "x": 9, "y": 2},
+ {"matrix": [8, 0], "x": 10, "y": 2},
+ {"matrix": [8, 1], "x": 11, "y": 2},
+ {"matrix": [8, 2], "x": 12, "y": 2},
+ {"matrix": [7, 4], "x": 13, "y": 2},
+ {"matrix": [6, 6], "x": 14, "y": 2},
+
+ {"matrix": [2, 5], "x": 0, "y": 3},
+ {"matrix": [2, 4], "x": 1, "y": 3},
+ {"matrix": [2, 3], "x": 2, "y": 3},
+ {"matrix": [1, 5], "x": 3, "y": 3},
+ {"matrix": [0, 7], "x": 4, "y": 3},
+ {"matrix": [5, 5], "x": 5, "y": 3},
+ {"matrix": [5, 4], "x": 6, "y": 3},
+ {"matrix": [5, 3], "x": 7, "y": 3},
+ {"matrix": [4, 5], "x": 8, "y": 3},
+ {"matrix": [3, 7], "x": 9, "y": 3},
+ {"matrix": [8, 5], "x": 10, "y": 3},
+ {"matrix": [8, 4], "x": 11, "y": 3},
+ {"matrix": [8, 3], "x": 12, "y": 3},
+ {"matrix": [7, 5], "x": 13, "y": 3},
+ {"matrix": [6, 7], "x": 14, "y": 3},
+
+ {"matrix": [2, 6], "x": 0, "y": 4},
+ {"matrix": [2, 7], "x": 1, "y": 4},
+ {"matrix": [1, 6], "x": 2, "y": 4},
+ {"matrix": [1, 7], "x": 3, "y": 4},
+ {"matrix": [4, 6], "x": 7, "y": 4, "w": 7},
+ {"matrix": [8, 7], "x": 11, "y": 4},
+ {"matrix": [7, 6], "x": 12, "y": 4},
+ {"matrix": [7, 7], "x": 13, "y": 4},
+ {"matrix": [8, 6], "x": 14, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/peej/tripel/middle/middle.h b/keyboards/peej/tripel/middle/middle.h
deleted file mode 100644
index 450eb095c3..0000000000
--- a/keyboards/peej/tripel/middle/middle.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2021 Paul James
- *
- * 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 LAYOUT_ortho_7u( \
- l11, l12, l13, l14, l15, m11, m12, m13, m14, m15, r11, r12, r13, r14, r15, \
- l21, l22, l23, l24, l25, m21, m22, m23, m24, m25, r21, r22, r23, r24, r25, \
- l31, l32, l33, l34, l35, m31, m32, m33, m34, m35, r31, r32, r33, r34, r35, \
- l41, l42, l43, l44, l45, m41, m42, m43, m44, m45, r41, r42, r43, r44, r45, \
- l51, l52, l53, l54, m53, r52, r53, r54, r51 \
-) \
-{ \
- { l11, l12, l13, l14, l15, l25, l35, l45 }, \
- { l21, l22, l23, l24, l34, l44, l53, l54 }, \
- { l31, l32, l33, l43, l42, l41, l51, l52 }, \
- { m11, m12, m13, m14, m15, m25, m35, m45 }, \
- { m21, m22, m23, m24, m34, m44, m53, KC_NO }, \
- { m31, m32, m33, m43, m42, m41, KC_NO, KC_NO }, \
- { r11, r12, r13, r14, r15, r25, r35, r45 }, \
- { r21, r22, r23, r24, r34, r44, r53, r54 }, \
- { r31, r32, r33, r43, r42, r41, r51, r52 } \
-}
diff --git a/keyboards/peej/tripel/right/info.json b/keyboards/peej/tripel/right/info.json
new file mode 100644
index 0000000000..9916d317f2
--- /dev/null
+++ b/keyboards/peej/tripel/right/info.json
@@ -0,0 +1,81 @@
+{
+ "layouts": {
+ "LAYOUT_ortho_7u": {
+ "layout": [
+ {"matrix": [6, 0], "x": 0, "y": 0},
+ {"matrix": [6, 1], "x": 1, "y": 0},
+ {"matrix": [6, 2], "x": 2, "y": 0},
+ {"matrix": [6, 3], "x": 3, "y": 0},
+ {"matrix": [6, 4], "x": 4, "y": 0},
+ {"matrix": [0, 0], "x": 5, "y": 0},
+ {"matrix": [0, 1], "x": 6, "y": 0},
+ {"matrix": [0, 2], "x": 7, "y": 0},
+ {"matrix": [0, 3], "x": 8, "y": 0},
+ {"matrix": [0, 4], "x": 9, "y": 0},
+ {"matrix": [3, 0], "x": 10, "y": 0},
+ {"matrix": [3, 1], "x": 11, "y": 0},
+ {"matrix": [3, 2], "x": 12, "y": 0},
+ {"matrix": [3, 3], "x": 13, "y": 0},
+ {"matrix": [3, 4], "x": 14, "y": 0},
+
+ {"matrix": [7, 0], "x": 0, "y": 1},
+ {"matrix": [7, 1], "x": 1, "y": 1},
+ {"matrix": [7, 2], "x": 2, "y": 1},
+ {"matrix": [7, 3], "x": 3, "y": 1},
+ {"matrix": [6, 5], "x": 4, "y": 1},
+ {"matrix": [1, 0], "x": 5, "y": 1},
+ {"matrix": [1, 1], "x": 6, "y": 1},
+ {"matrix": [1, 2], "x": 7, "y": 1},
+ {"matrix": [1, 3], "x": 8, "y": 1},
+ {"matrix": [0, 5], "x": 9, "y": 1},
+ {"matrix": [4, 0], "x": 10, "y": 1},
+ {"matrix": [4, 1], "x": 11, "y": 1},
+ {"matrix": [4, 2], "x": 12, "y": 1},
+ {"matrix": [4, 3], "x": 13, "y": 1},
+ {"matrix": [3, 5], "x": 14, "y": 1},
+
+ {"matrix": [8, 0], "x": 0, "y": 2},
+ {"matrix": [8, 1], "x": 1, "y": 2},
+ {"matrix": [8, 2], "x": 2, "y": 2},
+ {"matrix": [7, 4], "x": 3, "y": 2},
+ {"matrix": [6, 6], "x": 4, "y": 2},
+ {"matrix": [2, 0], "x": 5, "y": 2},
+ {"matrix": [2, 1], "x": 6, "y": 2},
+ {"matrix": [2, 2], "x": 7, "y": 2},
+ {"matrix": [1, 4], "x": 8, "y": 2},
+ {"matrix": [0, 6], "x": 9, "y": 2},
+ {"matrix": [5, 0], "x": 10, "y": 2},
+ {"matrix": [5, 1], "x": 11, "y": 2},
+ {"matrix": [5, 2], "x": 12, "y": 2},
+ {"matrix": [4, 4], "x": 13, "y": 2},
+ {"matrix": [3, 6], "x": 14, "y": 2},
+
+ {"matrix": [8, 5], "x": 0, "y": 3},
+ {"matrix": [8, 4], "x": 1, "y": 3},
+ {"matrix": [8, 3], "x": 2, "y": 3},
+ {"matrix": [7, 5], "x": 3, "y": 3},
+ {"matrix": [6, 7], "x": 4, "y": 3},
+ {"matrix": [2, 5], "x": 5, "y": 3},
+ {"matrix": [2, 4], "x": 6, "y": 3},
+ {"matrix": [2, 3], "x": 7, "y": 3},
+ {"matrix": [1, 5], "x": 8, "y": 3},
+ {"matrix": [0, 7], "x": 9, "y": 3},
+ {"matrix": [5, 5], "x": 10, "y": 3},
+ {"matrix": [5, 4], "x": 11, "y": 3},
+ {"matrix": [5, 3], "x": 12, "y": 3},
+ {"matrix": [4, 5], "x": 13, "y": 3},
+ {"matrix": [3, 7], "x": 14, "y": 3},
+
+ {"matrix": [8, 6], "x": 0, "y": 4},
+ {"matrix": [8, 7], "x": 1, "y": 4},
+ {"matrix": [7, 6], "x": 2, "y": 4},
+ {"matrix": [7, 7], "x": 3, "y": 4},
+ {"matrix": [1, 6], "x": 7, "y": 4, "w": 7},
+ {"matrix": [5, 7], "x": 11, "y": 4},
+ {"matrix": [4, 6], "x": 12, "y": 4},
+ {"matrix": [4, 7], "x": 13, "y": 4},
+ {"matrix": [5, 6], "x": 14, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/peej/tripel/right/right.h b/keyboards/peej/tripel/right/right.h
deleted file mode 100644
index 5fa38270c9..0000000000
--- a/keyboards/peej/tripel/right/right.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2021 Paul James
- *
- * 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 LAYOUT_ortho_7u( \
- l11, l12, l13, l14, l15, m11, m12, m13, m14, m15, r11, r12, r13, r14, r15, \
- l21, l22, l23, l24, l25, m21, m22, m23, m24, m25, r21, r22, r23, r24, r25, \
- l31, l32, l33, l34, l35, m31, m32, m33, m34, m35, r31, r32, r33, r34, r35, \
- l41, l42, l43, l44, l45, m41, m42, m43, m44, m45, r41, r42, r43, r44, r45, \
- l51, l52, l53, l54, m53, r52, r53, r54, r51 \
-) \
-{ \
- { m11, m12, m13, m14, m15, m25, m35, m45 }, \
- { m21, m22, m23, m24, m34, m44, m53, KC_NO }, \
- { m31, m32, m33, m43, m42, m41, KC_NO, KC_NO }, \
- { r11, r12, r13, r14, r15, r25, r35, r45 }, \
- { r21, r22, r23, r24, r34, r44, r53, r54 }, \
- { r31, r32, r33, r43, r42, r41, r51, r52 }, \
- { l11, l12, l13, l14, l15, l25, l35, l45 }, \
- { l21, l22, l23, l24, l34, l44, l53, l54 }, \
- { l31, l32, l33, l43, l42, l41, l51, l52 } \
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 21:41:02 +0000