summaryrefslogtreecommitdiff
path: root/keyboards/kiwikey/borderland
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/kiwikey/borderland')
-rw-r--r--keyboards/kiwikey/borderland/borderland.c4
-rw-r--r--keyboards/kiwikey/borderland/borderland.h29
-rw-r--r--keyboards/kiwikey/borderland/info.json144
3 files changed, 77 insertions, 100 deletions
diff --git a/keyboards/kiwikey/borderland/borderland.c b/keyboards/kiwikey/borderland/borderland.c
deleted file mode 100644
index 371dc73098..0000000000
--- a/keyboards/kiwikey/borderland/borderland.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2021 KiwiKey (@KiwiKey)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "borderland.h"
diff --git a/keyboards/kiwikey/borderland/borderland.h b/keyboards/kiwikey/borderland/borderland.h
deleted file mode 100644
index 85449a16b5..0000000000
--- a/keyboards/kiwikey/borderland/borderland.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2021 KiwiKey (@KiwiKey)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is 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( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k1E, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k2E, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k3E, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, \
- k40, k42, k44, k45, k47, k49, k4C, k4D, k4E \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, KC_NO, k2E }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, KC_NO, k3D, k3E }, \
- { k40, KC_NO, k42, KC_NO, k44, k45, KC_NO, k47, KC_NO, k49, KC_NO, KC_NO, k4C, k4D, k4E } \
-}
diff --git a/keyboards/kiwikey/borderland/info.json b/keyboards/kiwikey/borderland/info.json
index 30f8ccc048..7ecd81e07b 100644
--- a/keyboards/kiwikey/borderland/info.json
+++ b/keyboards/kiwikey/borderland/info.json
@@ -26,77 +26,87 @@
"layouts": {
"LAYOUT": {
"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":9, "y":0},
- {"x":10, "y":0},
- {"x":11, "y":0},
- {"x":12, "y":0},
- {"x":13, "y":0},
- {"x":14, "y":0},
- {"x":15, "y":0},
- {"x":16, "y":0},
- {"x":17.3, "y":0},
+ {"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": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
- {"x":0, "y":1, "w":1.5},
- {"x":1.5, "y":1},
- {"x":2.5, "y":1},
- {"x":3.5, "y":1},
- {"x":4.5, "y":1},
- {"x":5.5, "y":1},
- {"x":8.5, "y":1},
- {"x":9.5, "y":1},
- {"x":10.5, "y":1},
- {"x":11.5, "y":1},
- {"x":12.5, "y":1},
- {"x":13.5, "y":1},
- {"x":14.5, "y":1},
- {"x":15.5, "y":1, "w":1.5},
- {"x":17.3, "y":1},
+ {"matrix": [0, 7], "x": 9, "y": 0},
+ {"matrix": [0, 8], "x": 10, "y": 0},
+ {"matrix": [0, 9], "x": 11, "y": 0},
+ {"matrix": [0, 10], "x": 12, "y": 0},
+ {"matrix": [0, 11], "x": 13, "y": 0},
+ {"matrix": [0, 12], "x": 14, "y": 0},
+ {"matrix": [0, 13], "x": 15, "y": 0},
+ {"matrix": [0, 14], "x": 16, "y": 0},
- {"x":0, "y":2, "w":1.75},
- {"x":1.75, "y":2},
- {"x":2.75, "y":2},
- {"x":3.75, "y":2},
- {"x":4.75, "y":2},
- {"x":5.75, "y":2},
- {"x":8.75, "y":2},
- {"x":9.75, "y":2},
- {"x":10.75, "y":2},
- {"x":11.75, "y":2},
- {"x":12.75, "y":2},
- {"x":13.75, "y":2},
- {"x":14.75, "y":2, "w":2.25},
- {"x":17.3, "y":2},
+ {"matrix": [1, 14], "x": 17.3, "y": 0},
- {"x":0, "y":3, "w":2.25},
- {"x":2.25, "y":3},
- {"x":3.25, "y":3},
- {"x":4.25, "y":3},
- {"x":5.25, "y":3},
- {"x":6.25, "y":3},
- {"x":9.25, "y":3},
- {"x":10.25, "y":3},
- {"x":11.25, "y":3},
- {"x":12.25, "y":3},
- {"x":13.25, "y":3},
- {"x":14.25, "y":3, "w":1.75},
- {"x":16.3, "y":3.25},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"x":0, "y":4, "w":1.5},
- {"x":3.25, "y":4, "w":1.5},
- {"x":4.75, "y":4, "w":2},
- {"x":6.75, "y":4, "w":1.25},
- {"x":8.75, "y":4, "w":2.75},
- {"x":11.5, "y":4, "w":1.5},
- {"x":15.3, "y":4.25},
- {"x":16.3, "y":4.25},
- {"x":17.3, "y":4.25}
+ {"matrix": [1, 6], "x": 8.5, "y": 1},
+ {"matrix": [1, 7], "x": 9.5, "y": 1},
+ {"matrix": [1, 8], "x": 10.5, "y": 1},
+ {"matrix": [1, 9], "x": 11.5, "y": 1},
+ {"matrix": [1, 10], "x": 12.5, "y": 1},
+ {"matrix": [1, 11], "x": 13.5, "y": 1},
+ {"matrix": [1, 12], "x": 14.5, "y": 1},
+ {"matrix": [1, 13], "x": 15.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 14], "x": 17.3, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+ {"matrix": [2, 6], "x": 8.75, "y": 2},
+ {"matrix": [2, 7], "x": 9.75, "y": 2},
+ {"matrix": [2, 8], "x": 10.75, "y": 2},
+ {"matrix": [2, 9], "x": 11.75, "y": 2},
+ {"matrix": [2, 10], "x": 12.75, "y": 2},
+ {"matrix": [2, 11], "x": 13.75, "y": 2},
+ {"matrix": [2, 12], "x": 14.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 14], "x": 17.3, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+
+ {"matrix": [3, 6], "x": 9.25, "y": 3},
+ {"matrix": [3, 7], "x": 10.25, "y": 3},
+ {"matrix": [3, 8], "x": 11.25, "y": 3},
+ {"matrix": [3, 9], "x": 12.25, "y": 3},
+ {"matrix": [3, 10], "x": 13.25, "y": 3},
+ {"matrix": [3, 11], "x": 14.25, "y": 3, "w": 1.75},
+
+ {"matrix": [3, 13], "x": 16.3, "y": 3.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 3.25, "y": 4, "w": 1.5},
+ {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 2},
+ {"matrix": [4, 5], "x": 6.75, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 7], "x": 8.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 9], "x": 11.5, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 12], "x": 15.3, "y": 4.25},
+ {"matrix": [4, 13], "x": 16.3, "y": 4.25},
+ {"matrix": [4, 14], "x": 17.3, "y": 4.25}
]
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-20 07:06:36 +0000