summaryrefslogtreecommitdiff
path: root/keyboards/handwired
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/handwired')
-rw-r--r--keyboards/handwired/aball/aball.c17
-rw-r--r--keyboards/handwired/aball/aball.h21
-rw-r--r--keyboards/handwired/aball/info.json2
-rw-r--r--keyboards/handwired/bdn9_ble/bdn9_ble.c1
-rw-r--r--keyboards/handwired/bdn9_ble/bdn9_ble.h37
-rw-r--r--keyboards/handwired/bdn9_ble/info.json18
-rw-r--r--keyboards/handwired/bento/bento.c16
-rw-r--r--keyboards/handwired/bento/bento.h20
-rw-r--r--keyboards/handwired/bento/rev1/info.json12
-rw-r--r--keyboards/handwired/bento/rev1/rev1.c2
-rw-r--r--keyboards/handwired/bento/rev1/rev1.h36
-rw-r--r--keyboards/handwired/dc/mc/001/001.c17
-rw-r--r--keyboards/handwired/dc/mc/001/001.h33
-rw-r--r--keyboards/handwired/dc/mc/001/info.json10
-rw-r--r--keyboards/handwired/lemonpad/info.json12
-rw-r--r--keyboards/handwired/lemonpad/lemonpad.c17
-rw-r--r--keyboards/handwired/lemonpad/lemonpad.h38
-rw-r--r--keyboards/handwired/stream_cheap/2x3/2x3.c1
-rw-r--r--keyboards/handwired/stream_cheap/2x3/2x3.h11
-rw-r--r--keyboards/handwired/stream_cheap/2x3/info.json12
-rw-r--r--keyboards/handwired/stream_cheap/2x4/2x4.c1
-rw-r--r--keyboards/handwired/stream_cheap/2x4/2x4.h12
-rw-r--r--keyboards/handwired/stream_cheap/2x4/info.json16
-rw-r--r--keyboards/handwired/stream_cheap/2x5/2x5.c1
-rw-r--r--keyboards/handwired/stream_cheap/2x5/2x5.h11
-rw-r--r--keyboards/handwired/stream_cheap/2x5/info.json20
26 files changed, 52 insertions, 342 deletions
diff --git a/keyboards/handwired/aball/aball.c b/keyboards/handwired/aball/aball.c
deleted file mode 100644
index 3f12243ac6..0000000000
--- a/keyboards/handwired/aball/aball.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Richard Sutherland
- *
- * 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 "aball.h"
diff --git a/keyboards/handwired/aball/aball.h b/keyboards/handwired/aball/aball.h
deleted file mode 100644
index d6cb21bafc..0000000000
--- a/keyboards/handwired/aball/aball.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2020 Richard Sutherland
- *
- * 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(k00) {{ k00 }}
diff --git a/keyboards/handwired/aball/info.json b/keyboards/handwired/aball/info.json
index 84d277c136..a90a831f8a 100644
--- a/keyboards/handwired/aball/info.json
+++ b/keyboards/handwired/aball/info.json
@@ -18,7 +18,7 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0}
+ {"x":0, "y":0, "matrix": [0, 0]}
]
}
}
diff --git a/keyboards/handwired/bdn9_ble/bdn9_ble.c b/keyboards/handwired/bdn9_ble/bdn9_ble.c
deleted file mode 100644
index 75fe7fff71..0000000000
--- a/keyboards/handwired/bdn9_ble/bdn9_ble.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "bdn9_ble.h"
diff --git a/keyboards/handwired/bdn9_ble/bdn9_ble.h b/keyboards/handwired/bdn9_ble/bdn9_ble.h
deleted file mode 100644
index 8a45113264..0000000000
--- a/keyboards/handwired/bdn9_ble/bdn9_ble.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2019 Danny Nguyen <danny@keeb.io>
- *
- * 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"
-
-/* 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( \
- KA1, KA2, KA3, \
- KB1, KB2, KB3, \
- KC1, KC2, KC3 \
-) \
-{ \
- { KA1, KA2, KA3 }, \
- { KB1, KB2, KB3 }, \
- { KC1, KC2, KC3 } \
-}
diff --git a/keyboards/handwired/bdn9_ble/info.json b/keyboards/handwired/bdn9_ble/info.json
index 359939713a..303e26ba05 100644
--- a/keyboards/handwired/bdn9_ble/info.json
+++ b/keyboards/handwired/bdn9_ble/info.json
@@ -20,15 +20,15 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
- {"x":2, "y":0},
- {"x":0, "y":1},
- {"x":1, "y":1},
- {"x":2, "y":1},
- {"x":0, "y":2},
- {"x":1, "y":2},
- {"x":2, "y":2}
+ {"x":0, "y":0, "matrix": [0, 0]},
+ {"x":1, "y":0, "matrix": [0, 1]},
+ {"x":2, "y":0, "matrix": [0, 2]},
+ {"x":0, "y":1, "matrix": [1, 0]},
+ {"x":1, "y":1, "matrix": [1, 1]},
+ {"x":2, "y":1, "matrix": [1, 2]},
+ {"x":0, "y":2, "matrix": [2, 0]},
+ {"x":1, "y":2, "matrix": [2, 1]},
+ {"x":2, "y":2, "matrix": [2, 2]}
]
}
}
diff --git a/keyboards/handwired/bento/bento.c b/keyboards/handwired/bento/bento.c
deleted file mode 100644
index 904e0e5b65..0000000000
--- a/keyboards/handwired/bento/bento.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 GhostSeven <work@ghost7.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/>.
- */
-#include "bento.h"
diff --git a/keyboards/handwired/bento/bento.h b/keyboards/handwired/bento/bento.h
deleted file mode 100644
index 106882860a..0000000000
--- a/keyboards/handwired/bento/bento.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2020 GhostSeven <work@ghost7.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
-
-#ifdef KEYBOARD_handwired_bento_rev1
- #include "rev1.h"
-#endif
diff --git a/keyboards/handwired/bento/rev1/info.json b/keyboards/handwired/bento/rev1/info.json
index 2b3012b399..057931bb4e 100644
--- a/keyboards/handwired/bento/rev1/info.json
+++ b/keyboards/handwired/bento/rev1/info.json
@@ -19,12 +19,12 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
- {"x":2, "y":0},
- {"x":0, "y":1},
- {"x":1, "y":1},
- {"x":2, "y":1}
+ {"x":0, "y":0, "matrix": [0, 0]},
+ {"x":1, "y":0, "matrix": [0, 1]},
+ {"x":2, "y":0, "matrix": [0, 2]},
+ {"x":0, "y":1, "matrix": [1, 0]},
+ {"x":1, "y":1, "matrix": [1, 1]},
+ {"x":2, "y":1, "matrix": [1, 2]}
]
}
}
diff --git a/keyboards/handwired/bento/rev1/rev1.c b/keyboards/handwired/bento/rev1/rev1.c
index 4ab5dc2fd0..1dd5b683f1 100644
--- a/keyboards/handwired/bento/rev1/rev1.c
+++ b/keyboards/handwired/bento/rev1/rev1.c
@@ -13,7 +13,7 @@
* 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"
+#include "quantum.h"
void eeconfig_init_kb(void) {
#ifdef RGBLIGHT_ENABLE
diff --git a/keyboards/handwired/bento/rev1/rev1.h b/keyboards/handwired/bento/rev1/rev1.h
deleted file mode 100644
index a0b8ce2796..0000000000
--- a/keyboards/handwired/bento/rev1/rev1.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2020 GhostSeven <work@ghost7.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 "bento.h"
-#include "quantum.h"
-
-/* 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( \
- KA1, KA2, KA3, \
- KB1, KB2, KB3 \
-) \
-{ \
- { KA1, KA2, KA3 }, \
- { KB1, KB2, KB3 } \
-}
diff --git a/keyboards/handwired/dc/mc/001/001.c b/keyboards/handwired/dc/mc/001/001.c
deleted file mode 100644
index 4745469fd6..0000000000
--- a/keyboards/handwired/dc/mc/001/001.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Daniel Cormier
- *
- * 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 "001.h"
diff --git a/keyboards/handwired/dc/mc/001/001.h b/keyboards/handwired/dc/mc/001/001.h
deleted file mode 100644
index 317655162e..0000000000
--- a/keyboards/handwired/dc/mc/001/001.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 Daniel Cormier
- *
- * 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"
-
-/* 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 \
-) { \
- { k00, k01, k02, k03, k04 } \
-}
diff --git a/keyboards/handwired/dc/mc/001/info.json b/keyboards/handwired/dc/mc/001/info.json
index d14c92150b..78c75f3713 100644
--- a/keyboards/handwired/dc/mc/001/info.json
+++ b/keyboards/handwired/dc/mc/001/info.json
@@ -22,11 +22,11 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label": "Mute", "x": 0, "y": 0},
- {"label": "Stop", "x": 1, "y": 0},
- {"label": "Previous", "x": 2, "y": 0},
- {"label": "Next", "x": 3, "y": 0},
- {"label": "Play/Pause", "x": 4, "y": 0}
+ {"x": 0, "y": 0, "matrix": [0, 0]},
+ {"x": 1, "y": 0, "matrix": [0, 1]},
+ {"x": 2, "y": 0, "matrix": [0, 2]},
+ {"x": 3, "y": 0, "matrix": [0, 3]},
+ {"x": 4, "y": 0, "matrix": [0, 4]}
]
}
}
diff --git a/keyboards/handwired/lemonpad/info.json b/keyboards/handwired/lemonpad/info.json
index 9cbcf4f4f7..4655cde341 100644
--- a/keyboards/handwired/lemonpad/info.json
+++ b/keyboards/handwired/lemonpad/info.json
@@ -19,13 +19,13 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label": "k00", "x": 0, "y": 0},
- {"label": "k01", "x": 1, "y": 0},
- {"label": "k02", "x": 2, "y": 0},
+ {"x": 0, "y": 0, "matrix": [0, 0]},
+ {"x": 1, "y": 0, "matrix": [0, 1]},
+ {"x": 2, "y": 0, "matrix": [0, 2]},
- {"label": "k10", "x": 0, "y": 1},
- {"label": "k11", "x": 1, "y": 1},
- {"label": "k12", "x": 2, "y": 1}
+ {"x": 0, "y": 1, "matrix": [1, 0]},
+ {"x": 1, "y": 1, "matrix": [1, 1]},
+ {"x": 2, "y": 1, "matrix": [1, 2]}
]
}
}
diff --git a/keyboards/handwired/lemonpad/lemonpad.c b/keyboards/handwired/lemonpad/lemonpad.c
deleted file mode 100644
index cb5c1461a5..0000000000
--- a/keyboards/handwired/lemonpad/lemonpad.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 dari-studios (@dari-studios)
- *
- * 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 "lemonpad.h"
diff --git a/keyboards/handwired/lemonpad/lemonpad.h b/keyboards/handwired/lemonpad/lemonpad.h
deleted file mode 100644
index 8f9b64c19a..0000000000
--- a/keyboards/handwired/lemonpad/lemonpad.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2022 dari-studios (@dari-studios)
- *
- * 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"
-
-/* 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.
- */
-
-//Top 3 on the usb port side, bottom 3 on the opposite side
-
-#define LAYOUT( \
- k00, k01, k02, \
- k10, k11, k12 \
-) { \
- { k00, k01, k02 }, \
- { k10, k11, k12 }, \
-}
diff --git a/keyboards/handwired/stream_cheap/2x3/2x3.c b/keyboards/handwired/stream_cheap/2x3/2x3.c
deleted file mode 100644
index 6889747873..0000000000
--- a/keyboards/handwired/stream_cheap/2x3/2x3.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "2x3.h"
diff --git a/keyboards/handwired/stream_cheap/2x3/2x3.h b/keyboards/handwired/stream_cheap/2x3/2x3.h
deleted file mode 100644
index 12e9a46096..0000000000
--- a/keyboards/handwired/stream_cheap/2x3/2x3.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_2x3( \
- K00, K01, K02, \
- K03, K04, K05 \
-) { \
- { K00, K01, K02}, \
- { K03, K04, K05} \
-}
diff --git a/keyboards/handwired/stream_cheap/2x3/info.json b/keyboards/handwired/stream_cheap/2x3/info.json
index 555d9540af..937d462918 100644
--- a/keyboards/handwired/stream_cheap/2x3/info.json
+++ b/keyboards/handwired/stream_cheap/2x3/info.json
@@ -20,12 +20,12 @@
"layouts": {
"LAYOUT_ortho_2x3": {
"layout": [
- {"label":"K00", "x":0, "y":0},
- {"label":"K01", "x":1, "y":0},
- {"label":"K02", "x":2, "y":0},
- {"label":"K03", "x":0, "y":1},
- {"label":"K04", "x":1, "y":1},
- {"label":"K05", "x":2, "y":1}
+ {"x":0, "y":0, "matrix": [0, 0]},
+ {"x":1, "y":0, "matrix": [0, 1]},
+ {"x":2, "y":0, "matrix": [0, 2]},
+ {"x":0, "y":1, "matrix": [1, 0]},
+ {"x":1, "y":1, "matrix": [1, 1]},
+ {"x":2, "y":1, "matrix": [1, 2]}
]
}
}
diff --git a/keyboards/handwired/stream_cheap/2x4/2x4.c b/keyboards/handwired/stream_cheap/2x4/2x4.c
deleted file mode 100644
index a0519d21b7..0000000000
--- a/keyboards/handwired/stream_cheap/2x4/2x4.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "2x4.h"
diff --git a/keyboards/handwired/stream_cheap/2x4/2x4.h b/keyboards/handwired/stream_cheap/2x4/2x4.h
deleted file mode 100644
index 37d37af728..0000000000
--- a/keyboards/handwired/stream_cheap/2x4/2x4.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_2x4(\
- K00, K01, K02, K03, \
- K04, K05, K06, K07 \
-) \
- { \
- { K00,K01,K02,K03}, \
- { K04,K05,K06,K07} \
-}
diff --git a/keyboards/handwired/stream_cheap/2x4/info.json b/keyboards/handwired/stream_cheap/2x4/info.json
index d298a30c14..1e67a91d48 100644
--- a/keyboards/handwired/stream_cheap/2x4/info.json
+++ b/keyboards/handwired/stream_cheap/2x4/info.json
@@ -19,14 +19,14 @@
"layouts": {
"LAYOUT_ortho_2x4": {
"layout": [
- {"label":"K00", "x":0, "y":0},
- {"label":"K01", "x":1, "y":0},
- {"label":"K02", "x":2, "y":0},
- {"label":"K03", "x":3, "y":0},
- {"label":"K04", "x":0, "y":1},
- {"label":"K05", "x":1, "y":1},
- {"label":"K06", "x":2, "y":1},
- {"label":"K07", "x":3, "y":1}
+ {"x":0, "y":0, "matrix": [0, 0]},
+ {"x":1, "y":0, "matrix": [0, 1]},
+ {"x":2, "y":0, "matrix": [0, 2]},
+ {"x":3, "y":0, "matrix": [0, 3]},
+ {"x":0, "y":1, "matrix": [1, 0]},
+ {"x":1, "y":1, "matrix": [1, 1]},
+ {"x":2, "y":1, "matrix": [1, 2]},
+ {"x":3, "y":1, "matrix": [1, 3]}
]
}
}
diff --git a/keyboards/handwired/stream_cheap/2x5/2x5.c b/keyboards/handwired/stream_cheap/2x5/2x5.c
deleted file mode 100644
index 70969a316a..0000000000
--- a/keyboards/handwired/stream_cheap/2x5/2x5.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "2x5.h"
diff --git a/keyboards/handwired/stream_cheap/2x5/2x5.h b/keyboards/handwired/stream_cheap/2x5/2x5.h
deleted file mode 100644
index f01c8302a2..0000000000
--- a/keyboards/handwired/stream_cheap/2x5/2x5.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_2x5( \
- K00, K01, K02, K03, K04, \
- K10, K11, K12, K13, K14 \
-) { \
- { K00, K01, K02, K03, K04 }, \
- { K10, K11, K12, K13, K14 } \
-}
diff --git a/keyboards/handwired/stream_cheap/2x5/info.json b/keyboards/handwired/stream_cheap/2x5/info.json
index 3a81177f31..4bfe269ee6 100644
--- a/keyboards/handwired/stream_cheap/2x5/info.json
+++ b/keyboards/handwired/stream_cheap/2x5/info.json
@@ -19,16 +19,16 @@
"layouts": {
"LAYOUT_ortho_2x5": {
"layout": [
- {"label":"K00", "x":0, "y":0},
- {"label":"K01", "x":1, "y":0},
- {"label":"K02", "x":2, "y":0},
- {"label":"K03", "x":3, "y":0},
- {"label":"K04", "x":4, "y":0},
- {"label":"K10", "x":0, "y":1},
- {"label":"K11", "x":1, "y":1},
- {"label":"K12", "x":2, "y":1},
- {"label":"K13", "x":3, "y":1},
- {"label":"K14", "x":4, "y":1}
+ {"x":0, "y":0, "matrix": [0, 0]},
+ {"x":1, "y":0, "matrix": [0, 1]},
+ {"x":2, "y":0, "matrix": [0, 2]},
+ {"x":3, "y":0, "matrix": [0, 3]},
+ {"x":4, "y":0, "matrix": [0, 4]},
+ {"x":0, "y":1, "matrix": [1, 0]},
+ {"x":1, "y":1, "matrix": [1, 1]},
+ {"x":2, "y":1, "matrix": [1, 2]},
+ {"x":3, "y":1, "matrix": [1, 3]},
+ {"x":4, "y":1, "matrix": [1, 4]}
]
}
}