summaryrefslogtreecommitdiff
path: root/keyboards/clawsome
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/clawsome')
-rw-r--r--keyboards/clawsome/bookerboard/bookerboard.h30
-rw-r--r--keyboards/clawsome/bookerboard/info.json27
-rw-r--r--keyboards/clawsome/doodle/doodle.h27
-rw-r--r--keyboards/clawsome/doodle/info.json13
-rw-r--r--keyboards/clawsome/fightpad/fightpad.h26
-rw-r--r--keyboards/clawsome/fightpad/info.json27
-rw-r--r--keyboards/clawsome/gamebuddy/v1_0/info.json56
-rw-r--r--keyboards/clawsome/gamebuddy/v1_0/v1_0.h32
-rw-r--r--keyboards/clawsome/gamebuddy/v1_m/info.json58
-rw-r--r--keyboards/clawsome/gamebuddy/v1_m/v1_m.h33
-rw-r--r--keyboards/clawsome/luggage_rack/info.json30
-rw-r--r--keyboards/clawsome/luggage_rack/luggage_rack.h38
-rw-r--r--keyboards/clawsome/sidekick/info.json58
-rw-r--r--keyboards/clawsome/sidekick/sidekick.h33
14 files changed, 146 insertions, 342 deletions
diff --git a/keyboards/clawsome/bookerboard/bookerboard.h b/keyboards/clawsome/bookerboard/bookerboard.h
deleted file mode 100644
index 11ece7594b..0000000000
--- a/keyboards/clawsome/bookerboard/bookerboard.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2020 AAClawson (AlisGraveNil)
- *
- * 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, K01, K02, \
- K10, K11, K12, \
- K20, K21, K22, \
- K30, K31, K32 \
-) { \
- { K00, K01, K02 }, \
- { K10, K11, K12 }, \
- { K20, K21, K22 }, \
- { K30, K31, K32 }, \
-}
diff --git a/keyboards/clawsome/bookerboard/info.json b/keyboards/clawsome/bookerboard/info.json
index d0ac88f548..8c6a4dc0f9 100644
--- a/keyboards/clawsome/bookerboard/info.json
+++ b/keyboards/clawsome/bookerboard/info.json
@@ -18,18 +18,21 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"K00 (B5,B6)", "x":0, "y":0},
- {"label":"K01 (B5,B2)", "x":1, "y":0},
- {"label":"K02 (B5,B3)", "x":2, "y":0},
- {"label":"K10 (B4,B6)", "x":0, "y":1},
- {"label":"K11 (B4,B2)", "x":1, "y":1},
- {"label":"K12 (B4,B3)", "x":2, "y":1},
- {"label":"K20 (E6,B6)", "x":0, "y":2},
- {"label":"K21 (E6,B2)", "x":1, "y":2},
- {"label":"K22 (E6,B3)", "x":2, "y":2},
- {"label":"K30 (D7,B6)", "x":0, "y":3},
- {"label":"K31 (D7,B2)", "x":1, "y":3},
- {"label":"K32 (D7,B3)", "x":2, "y":3}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "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, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3}
]
}
}
diff --git a/keyboards/clawsome/doodle/doodle.h b/keyboards/clawsome/doodle/doodle.h
deleted file mode 100644
index 131d50ad26..0000000000
--- a/keyboards/clawsome/doodle/doodle.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2021 AAClawson (AlisGraveNil)
- *
- * 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, K01, K02, \
- K10, K11, K12 \
-) { \
- { K00, K01, K02 }, \
- { K10, K11, K12 } \
-}
diff --git a/keyboards/clawsome/doodle/info.json b/keyboards/clawsome/doodle/info.json
index 8b675684eb..e7883a6f1a 100644
--- a/keyboards/clawsome/doodle/info.json
+++ b/keyboards/clawsome/doodle/info.json
@@ -18,12 +18,13 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"K00 (D4,D7)", "x":0, "y":0},
- {"label":"K01 (D4,F4)", "x":1, "y":0},
- {"label":"K02 (D4,E6)", "x":2, "y":0},
- {"label":"K10 (C6,D7)", "x":0, "y":1},
- {"label":"K11 (C6,F4)", "x":1, "y":1},
- {"label":"K12 (C6,E6)", "x":2, "y":1}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1}
]
}
}
diff --git a/keyboards/clawsome/fightpad/fightpad.h b/keyboards/clawsome/fightpad/fightpad.h
deleted file mode 100644
index ff92afd6bb..0000000000
--- a/keyboards/clawsome/fightpad/fightpad.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2020 AAClawson (AlisGraveNil)
- *
- * 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( \
- K01, K03, K04, K05, K06, \
- K10, K11, K12, K13, K14, K15, K16 \
-) { \
- { KC_NO, K01, KC_NO, K03, K04, K05, K06 }, \
- { K10, K11, K12, K13, K14, K15, K16 }, \
-}
diff --git a/keyboards/clawsome/fightpad/info.json b/keyboards/clawsome/fightpad/info.json
index 3aad087486..fbd4673dd7 100644
--- a/keyboards/clawsome/fightpad/info.json
+++ b/keyboards/clawsome/fightpad/info.json
@@ -18,18 +18,21 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"K01 (B5,E6)", "x":1, "y":0},
- {"label":"K03 (B5,B2)", "x":4, "y":0},
- {"label":"K04 (B5,B3)", "x":5, "y":0},
- {"label":"K05 (B5,B1)", "x":6, "y":0},
- {"label":"K06 (B5,F7)", "x":7, "y":0},
- {"label":"K10 (B6,D7)", "x":0, "y":1},
- {"label":"K11 (B6,E6)", "x":1, "y":1},
- {"label":"K12 (B6,B4)", "x":2, "y":1},
- {"label":"K13 (B6,B2)", "x":4, "y":1},
- {"label":"K14 (B6,B3)", "x":5, "y":1},
- {"label":"K15 (B6,B1)", "x":6, "y":1},
- {"label":"K16 (B6,F7)", "x":7, "y":1}
+ {"matrix": [0, 1], "x": 1, "y": 0},
+
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 4], "x": 5, "y": 0},
+ {"matrix": [0, 5], "x": 6, "y": 0},
+ {"matrix": [0, 6], "x": 7, "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": 4, "y": 1},
+ {"matrix": [1, 4], "x": 5, "y": 1},
+ {"matrix": [1, 5], "x": 6, "y": 1},
+ {"matrix": [1, 6], "x": 7, "y": 1}
]
}
}
diff --git a/keyboards/clawsome/gamebuddy/v1_0/info.json b/keyboards/clawsome/gamebuddy/v1_0/info.json
index b4875077f4..269c4b8602 100644
--- a/keyboards/clawsome/gamebuddy/v1_0/info.json
+++ b/keyboards/clawsome/gamebuddy/v1_0/info.json
@@ -18,32 +18,36 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"K00 (D1,F5)", "x":0, "y":0},
- {"label":"K01 (D1,F6)", "x":1, "y":0},
- {"label":"K02 (D1,F7)", "x":2, "y":0},
- {"label":"K03 (D1,B1)", "x":3, "y":0},
- {"label":"K04 (D1,C6)", "x":4, "y":0},
- {"label":"K05 (D1,D7)", "x":5, "y":0},
- {"label":"K10 (D0,F5)", "x":0, "y":1},
- {"label":"K11 (D0,F6)", "x":1, "y":1},
- {"label":"K12 (D0,F7)", "x":2, "y":1},
- {"label":"K13 (D0,B1)", "x":3, "y":1},
- {"label":"K14 (D0,C6)", "x":4, "y":1},
- {"label":"K15 (D0,D7)", "x":5, "y":1},
- {"label":"K20 (E6,F5)", "x":0, "y":2, "w":2},
- {"label":"K22 (E6,F7)", "x":2, "y":2},
- {"label":"K23 (E6,B1)", "x":3, "y":2},
- {"label":"K24 (E6,C6)", "x":4, "y":2},
- {"label":"K25 (E6,D7)", "x":5, "y":2},
- {"label":"K30 (B3,F5)", "x":0, "y":3},
- {"label":"K31 (B3,F6)", "x":1, "y":3},
- {"label":"K32 (B3,F7)", "x":2, "y":3},
- {"label":"K33 (B3,B1)", "x":3, "y":3},
- {"label":"K34 (B3,C6)", "x":4, "y":3},
- {"label":"K35 (B3,D7)", "x":5, "y":3},
- {"label":"K46 (B2,B6)", "x":6, "y":3, "h":2},
- {"label":"K44 (B2,C6)", "x":4, "y":4},
- {"label":"K45 (B2,D7)", "x":5, "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": [0, 5], "x": 5, "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": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [4, 6], "x": 6, "y": 3, "h": 2},
+
+ {"matrix": [4, 4], "x": 4, "y": 4},
+ {"matrix": [4, 5], "x": 5, "y": 4}
]
}
}
diff --git a/keyboards/clawsome/gamebuddy/v1_0/v1_0.h b/keyboards/clawsome/gamebuddy/v1_0/v1_0.h
deleted file mode 100644
index f1ee9ab357..0000000000
--- a/keyboards/clawsome/gamebuddy/v1_0/v1_0.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2020 AAClawson (AlisGraveNil)
- *
- * 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, K01, K02, K03, K04, K05, \
- K10, K11, K12, K13, K14, K15, \
- K20, K22, K23, K24, K25, \
- K30, K31, K32, K33, K34, K35, K46, \
- K44, K45 \
-) { \
- { K00, K01, K02, K03, K04, K05, KC_NO }, \
- { K10, K11, K12, K13, K14, K15, KC_NO }, \
- { K20, KC_NO, K22, K23, K24, K25, KC_NO }, \
- { K30, K31, K32, K33, K34, K35, KC_NO }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, K44, K45, K46 }, \
-}
diff --git a/keyboards/clawsome/gamebuddy/v1_m/info.json b/keyboards/clawsome/gamebuddy/v1_m/info.json
index 3330139b59..3709bbbe3c 100644
--- a/keyboards/clawsome/gamebuddy/v1_m/info.json
+++ b/keyboards/clawsome/gamebuddy/v1_m/info.json
@@ -18,33 +18,37 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"K00 (C6,B1)", "x":0, "y":0},
- {"label":"K01 (C6,F7)", "x":1, "y":0},
- {"label":"K02 (C6,F6)", "x":2, "y":0},
- {"label":"K03 (C6,F5)", "x":3, "y":0},
- {"label":"K04 (C6,E6)", "x":4, "y":0},
- {"label":"K05 (C6,B4)", "x":5, "y":0},
- {"label":"K10 (D7,B1)", "x":0, "y":1},
- {"label":"K11 (D7,F7)", "x":1, "y":1},
- {"label":"K12 (D7,F6)", "x":2, "y":1},
- {"label":"K13 (D7,F5)", "x":3, "y":1},
- {"label":"K14 (D7,E6)", "x":4, "y":1},
- {"label":"K15 (D7,B4)", "x":5, "y":1},
- {"label":"K20 (B5,B1)", "x":0, "y":2},
- {"label":"K21 (B5,F7)", "x":1, "y":2},
- {"label":"K22 (B5,F6)", "x":2, "y":2},
- {"label":"K23 (B5,F5)", "x":3, "y":2},
- {"label":"K24 (B5,E6)", "x":4, "y":2},
- {"label":"K25 (B5,B4)", "x":5, "y":2},
- {"label":"K30 (B3,B1)", "x":0, "y":3},
- {"label":"K31 (B3,F7)", "x":1, "y":3},
- {"label":"K32 (B3,F6)", "x":2, "y":3},
- {"label":"K33 (B3,F5)", "x":3, "y":3},
- {"label":"K34 (B3,E6)", "x":4, "y":3},
- {"label":"K35 (B3,B4)", "x":5, "y":3},
- {"label":"K46 (B2,B6)", "x":6, "y":3, "h":2},
- {"label":"K44 (B2,E6)", "x":4, "y":4},
- {"label":"K45 (B2,B4)", "x":5, "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": [0, 5], "x": 5, "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": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [4, 6], "x": 6, "y": 3, "h": 2},
+
+ {"matrix": [4, 4], "x": 4, "y": 4},
+ {"matrix": [4, 5], "x": 5, "y": 4}
]
}
}
diff --git a/keyboards/clawsome/gamebuddy/v1_m/v1_m.h b/keyboards/clawsome/gamebuddy/v1_m/v1_m.h
deleted file mode 100644
index 23e4d03bbc..0000000000
--- a/keyboards/clawsome/gamebuddy/v1_m/v1_m.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 AAClawson (AlisGraveNil)
- *
- * 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, K01, K02, K03, K04, K05, \
- K10, K11, K12, K13, K14, K15, \
- K20, K21, K22, K23, K24, K25, \
- K30, K31, K32, K33, K34, K35, K46, \
- K44, K45 \
-) { \
- { K00, K01, K02, K03, K04, K05, KC_NO }, \
- { K10, K11, K12, K13, K14, K15, KC_NO }, \
- { K20, K21, K22, K23, K24, K25, KC_NO }, \
- { K30, K31, K32, K33, K34, K35, KC_NO }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, K44, K45, K46 }, \
-}
diff --git a/keyboards/clawsome/luggage_rack/info.json b/keyboards/clawsome/luggage_rack/info.json
index 3c813bd36a..5996c9d8f4 100644
--- a/keyboards/clawsome/luggage_rack/info.json
+++ b/keyboards/clawsome/luggage_rack/info.json
@@ -18,19 +18,23 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"K00 (D3,D4)", "x":0, "y":0},
- {"label":"K11 (F4,D0)", "x":1, "y":0},
- {"label":"K02 (D3,D1)", "x":2, "y":0},
- {"label":"K20 (B0,D4)", "x":0, "y":1.5},
- {"label":"K31 (B2,D0)", "x":1, "y":1.5},
- {"label":"K22 (B0,D1)", "x":2, "y":1.5},
- {"label":"K40 (F7,D4)", "x":0, "y":2.5},
- {"label":"K51 (B6,D0)", "x":1, "y":2.5},
- {"label":"K42 (F7,D1)", "x":2, "y":2.5},
- {"label":"K61 (B1,D0)", "x":1, "y":4.5},
- {"label":"K70 (F5,D4)", "x":0, "y":5.5},
- {"label":"K81 (F6,D0)", "x":1, "y":5.5},
- {"label":"K72 (F5,D1)", "x":2, "y":5.5}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1.5},
+ {"matrix": [3, 1], "x": 1, "y": 1.5},
+ {"matrix": [2, 2], "x": 2, "y": 1.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 2.5},
+ {"matrix": [5, 1], "x": 1, "y": 2.5},
+ {"matrix": [4, 2], "x": 2, "y": 2.5},
+
+ {"matrix": [6, 1], "x": 1, "y": 4.5},
+
+ {"matrix": [7, 0], "x": 0, "y": 5.5},
+ {"matrix": [8, 1], "x": 1, "y": 5.5},
+ {"matrix": [7, 2], "x": 2, "y": 5.5}
]
}
}
diff --git a/keyboards/clawsome/luggage_rack/luggage_rack.h b/keyboards/clawsome/luggage_rack/luggage_rack.h
deleted file mode 100644
index 20c4947bd2..0000000000
--- a/keyboards/clawsome/luggage_rack/luggage_rack.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2021 AAClawson (AlisGraveNil)
- *
- * 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, K11, K02, \
- K20, K31, K22, \
- K40, K51, K42, \
- \
- K61, \
- K70, K81, K72 \
-) { \
- { K00, KC_NO, K02 }, \
- { KC_NO, K11, KC_NO }, \
- { K20, KC_NO, K22 }, \
- { KC_NO, K31, KC_NO }, \
- { K40, KC_NO, K42 }, \
- { KC_NO, K51, KC_NO }, \
- { KC_NO, K61, KC_NO }, \
- { K70, KC_NO, K72 }, \
- { KC_NO, K81, KC_NO }, \
-}
diff --git a/keyboards/clawsome/sidekick/info.json b/keyboards/clawsome/sidekick/info.json
index cfc028476f..ee4df7538c 100644
--- a/keyboards/clawsome/sidekick/info.json
+++ b/keyboards/clawsome/sidekick/info.json
@@ -18,33 +18,37 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"K00 (D0,F6)", "x":0, "y":0},
- {"label":"K01 (D0,F5)", "x":1, "y":0},
- {"label":"K02 (D0,B1)", "x":2, "y":0},
- {"label":"K03 (D0,B3)", "x":3, "y":0},
- {"label":"K04 (D0,E6)", "x":4, "y":0},
- {"label":"K05 (D0,D7)", "x":5, "y":0},
- {"label":"K06 (D0,D4)", "x":6, "y":0},
- {"label":"K10 (C6,F6)", "x":0, "y":1},
- {"label":"K11 (C6,F5)", "x":1, "y":1},
- {"label":"K12 (C6,B1)", "x":2, "y":1},
- {"label":"K13 (C6,B3)", "x":3, "y":1},
- {"label":"K14 (C6,E6)", "x":4, "y":1},
- {"label":"K15 (C6,D7)", "x":5, "y":1},
- {"label":"K16 (C6,D4)", "x":6, "y":1, "h":2},
- {"label":"K23 (B2,B3)", "x":3, "y":2},
- {"label":"K24 (B2,E6)", "x":4, "y":2},
- {"label":"K25 (B2,D7)", "x":5, "y":2},
- {"label":"K31 (B6,F5)", "x":1, "y":3},
- {"label":"K33 (B6,B3)", "x":3, "y":3},
- {"label":"K34 (B6,E6)", "x":4, "y":3},
- {"label":"K35 (B6,D7)", "x":5, "y":3},
- {"label":"K36 (B6,D4)", "x":6, "y":3, "h":2},
- {"label":"K40 (B5,F6)", "x":0, "y":4},
- {"label":"K41 (B5,F5)", "x":1, "y":4},
- {"label":"K42 (B5,B1)", "x":2, "y":4},
- {"label":"K43 (B5,B3)", "x":3, "y":4, "w":2},
- {"label":"K45 (B5,D7)", "x":5, "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": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "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": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1, "h": 2},
+
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3, "h": 2},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4, "w": 2},
+ {"matrix": [4, 5], "x": 5, "y": 4}
]
}
}
diff --git a/keyboards/clawsome/sidekick/sidekick.h b/keyboards/clawsome/sidekick/sidekick.h
deleted file mode 100644
index fcb93a9bb1..0000000000
--- a/keyboards/clawsome/sidekick/sidekick.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2020 AAClawson (AlisGraveNil)
- *
- * 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, K01, K02, K03, K04, K05, K06, \
- K10, K11, K12, K13, K14, K15, K16, \
- K23, K24, K25, \
- K31, K33, K34, K35, K36, \
- K40, K41, K42, K43, K45 \
-) { \
- { K00, K01, K02, K03, K04, K05, K06 }, \
- { K10, K11, K12, K13, K14, K15, K16 }, \
- { KC_NO, KC_NO, KC_NO, K23, K24, K25, KC_NO }, \
- { KC_NO, K31, KC_NO, K33, K34, K35, K36 }, \
- { K40, K41, K42, K43, KC_NO, K45, KC_NO }, \
-}
-