summaryrefslogtreecommitdiff
path: root/keyboards/clawsome
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/clawsome')
-rw-r--r--keyboards/clawsome/bookerboard/bookerboard.c16
-rw-r--r--keyboards/clawsome/bookerboard/bookerboard.h30
-rw-r--r--keyboards/clawsome/bookerboard/config.h34
-rw-r--r--keyboards/clawsome/bookerboard/info.json32
-rw-r--r--keyboards/clawsome/coupe/config.h34
-rw-r--r--keyboards/clawsome/coupe/coupe.c16
-rw-r--r--keyboards/clawsome/coupe/info.json5
-rw-r--r--keyboards/clawsome/doodle/config.h33
-rw-r--r--keyboards/clawsome/doodle/doodle.c17
-rw-r--r--keyboards/clawsome/doodle/doodle.h27
-rw-r--r--keyboards/clawsome/doodle/info.json18
-rw-r--r--keyboards/clawsome/fightpad/config.h34
-rw-r--r--keyboards/clawsome/fightpad/fightpad.c16
-rw-r--r--keyboards/clawsome/fightpad/fightpad.h26
-rw-r--r--keyboards/clawsome/fightpad/info.json32
-rw-r--r--keyboards/clawsome/gamebuddy/v1_0/config.h24
-rw-r--r--keyboards/clawsome/gamebuddy/v1_0/info.json61
-rw-r--r--keyboards/clawsome/gamebuddy/v1_0/v1_0.c16
-rw-r--r--keyboards/clawsome/gamebuddy/v1_0/v1_0.h32
-rw-r--r--keyboards/clawsome/gamebuddy/v1_m/config.h33
-rw-r--r--keyboards/clawsome/gamebuddy/v1_m/info.json63
-rw-r--r--keyboards/clawsome/gamebuddy/v1_m/v1_m.c16
-rw-r--r--keyboards/clawsome/gamebuddy/v1_m/v1_m.h33
-rw-r--r--keyboards/clawsome/hatchback/config.h33
-rw-r--r--keyboards/clawsome/hatchback/hatchback.c17
-rw-r--r--keyboards/clawsome/hatchback/hatchback.h43
-rw-r--r--keyboards/clawsome/hatchback/info.json196
-rw-r--r--keyboards/clawsome/luggage_rack/config.h33
-rw-r--r--keyboards/clawsome/luggage_rack/info.json35
-rw-r--r--keyboards/clawsome/luggage_rack/luggage_rack.c17
-rw-r--r--keyboards/clawsome/luggage_rack/luggage_rack.h38
-rw-r--r--keyboards/clawsome/numeros/config.h34
-rw-r--r--keyboards/clawsome/numeros/info.json39
-rw-r--r--keyboards/clawsome/numeros/numeros.c16
-rw-r--r--keyboards/clawsome/numeros/numeros.h32
-rw-r--r--keyboards/clawsome/roadster/config.h34
-rw-r--r--keyboards/clawsome/roadster/info.json96
-rw-r--r--keyboards/clawsome/roadster/roadster.c16
-rw-r--r--keyboards/clawsome/roadster/roadster.h30
-rw-r--r--keyboards/clawsome/sedan/config.h34
-rw-r--r--keyboards/clawsome/sedan/info.json145
-rw-r--r--keyboards/clawsome/sedan/sedan.c16
-rw-r--r--keyboards/clawsome/sedan/sedan.h32
-rw-r--r--keyboards/clawsome/sidekick/config.h24
-rw-r--r--keyboards/clawsome/sidekick/info.json63
-rw-r--r--keyboards/clawsome/sidekick/sidekick.c16
-rw-r--r--keyboards/clawsome/sidekick/sidekick.h33
-rw-r--r--keyboards/clawsome/suv/config.h33
-rw-r--r--keyboards/clawsome/suv/info.json235
-rw-r--r--keyboards/clawsome/suv/suv.c17
-rw-r--r--keyboards/clawsome/suv/suv.h41
51 files changed, 573 insertions, 1473 deletions
diff --git a/keyboards/clawsome/bookerboard/bookerboard.c b/keyboards/clawsome/bookerboard/bookerboard.c
deleted file mode 100644
index 2cf132de59..0000000000
--- a/keyboards/clawsome/bookerboard/bookerboard.c
+++ /dev/null
@@ -1,16 +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/>.
- */
-#include "bookerboard.h" \ No newline at end of file
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/config.h b/keyboards/clawsome/bookerboard/config.h
deleted file mode 100644
index 60c531b89f..0000000000
--- a/keyboards/clawsome/bookerboard/config.h
+++ /dev/null
@@ -1,34 +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
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B5, B4, E6, D7 }
-#define MATRIX_COL_PINS { B6, B2, B3 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/clawsome/bookerboard/info.json b/keyboards/clawsome/bookerboard/info.json
index 2e153f567d..8c6a4dc0f9 100644
--- a/keyboards/clawsome/bookerboard/info.json
+++ b/keyboards/clawsome/bookerboard/info.json
@@ -8,23 +8,31 @@
"pid": "0x41CE",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B6", "B2", "B3"],
+ "rows": ["B5", "B4", "E6", "D7"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"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/coupe/config.h b/keyboards/clawsome/coupe/config.h
deleted file mode 100644
index bad945e802..0000000000
--- a/keyboards/clawsome/coupe/config.h
+++ /dev/null
@@ -1,34 +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
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D7, D2, C6, B5, D4, B4, D0, D3, D1, E6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B6, B3, B2 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/clawsome/coupe/coupe.c b/keyboards/clawsome/coupe/coupe.c
deleted file mode 100644
index 80aca53943..0000000000
--- a/keyboards/clawsome/coupe/coupe.c
+++ /dev/null
@@ -1,16 +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/>.
- */
-#include "coupe.h" \ No newline at end of file
diff --git a/keyboards/clawsome/coupe/info.json b/keyboards/clawsome/coupe/info.json
index be50f5c13e..7bbc577308 100644
--- a/keyboards/clawsome/coupe/info.json
+++ b/keyboards/clawsome/coupe/info.json
@@ -8,6 +8,11 @@
"pid": "0x7E94",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B6", "B3", "B2"],
+ "rows": ["D7", "D2", "C6", "B5", "D4", "B4", "D0", "D3", "D1", "E6"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"community_layouts": ["60_ansi"],
diff --git a/keyboards/clawsome/doodle/config.h b/keyboards/clawsome/doodle/config.h
deleted file mode 100644
index 7dcdcc03a8..0000000000
--- a/keyboards/clawsome/doodle/config.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
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D4, C6 }
-#define MATRIX_COL_PINS { D7, F4, E6 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/clawsome/doodle/doodle.c b/keyboards/clawsome/doodle/doodle.c
deleted file mode 100644
index 4f1b773512..0000000000
--- a/keyboards/clawsome/doodle/doodle.c
+++ /dev/null
@@ -1,17 +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/>.
- */
-
-#include "doodle.h" \ No newline at end of file
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 6c40392ec8..e7883a6f1a 100644
--- a/keyboards/clawsome/doodle/info.json
+++ b/keyboards/clawsome/doodle/info.json
@@ -8,17 +8,23 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D7", "F4", "E6"],
+ "rows": ["D4", "C6"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"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/config.h b/keyboards/clawsome/fightpad/config.h
deleted file mode 100644
index a62845a6af..0000000000
--- a/keyboards/clawsome/fightpad/config.h
+++ /dev/null
@@ -1,34 +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
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B5, B6 }
-#define MATRIX_COL_PINS { D7, E6, B4, B2, B3, B1, F7 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/clawsome/fightpad/fightpad.c b/keyboards/clawsome/fightpad/fightpad.c
deleted file mode 100644
index f0dae8eaf3..0000000000
--- a/keyboards/clawsome/fightpad/fightpad.c
+++ /dev/null
@@ -1,16 +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/>.
- */
-#include "fightpad.h" \ No newline at end of file
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 df9c621627..fbd4673dd7 100644
--- a/keyboards/clawsome/fightpad/info.json
+++ b/keyboards/clawsome/fightpad/info.json
@@ -8,23 +8,31 @@
"pid": "0x481C",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D7", "E6", "B4", "B2", "B3", "B1", "F7"],
+ "rows": ["B5", "B6"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"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/config.h b/keyboards/clawsome/gamebuddy/v1_0/config.h
deleted file mode 100644
index bf867467f2..0000000000
--- a/keyboards/clawsome/gamebuddy/v1_0/config.h
+++ /dev/null
@@ -1,24 +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
-
-
-#define MATRIX_ROW_PINS { D1, D0, E6, B3, B2 }
-#define MATRIX_COL_PINS { F5, F6, F7, B1, C6, D7, B6 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/clawsome/gamebuddy/v1_0/info.json b/keyboards/clawsome/gamebuddy/v1_0/info.json
index 273755e62c..269c4b8602 100644
--- a/keyboards/clawsome/gamebuddy/v1_0/info.json
+++ b/keyboards/clawsome/gamebuddy/v1_0/info.json
@@ -8,37 +8,46 @@
"pid": "0x17B9",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F5", "F6", "F7", "B1", "C6", "D7", "B6"],
+ "rows": ["D1", "D0", "E6", "B3", "B2"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"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.c b/keyboards/clawsome/gamebuddy/v1_0/v1_0.c
deleted file mode 100644
index b63474c28a..0000000000
--- a/keyboards/clawsome/gamebuddy/v1_0/v1_0.c
+++ /dev/null
@@ -1,16 +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/>.
- */
-#include "v1_0.h"
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/config.h b/keyboards/clawsome/gamebuddy/v1_m/config.h
deleted file mode 100644
index 5c2f368800..0000000000
--- a/keyboards/clawsome/gamebuddy/v1_m/config.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
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { C6, D7, B5, B3, B2 }
-#define MATRIX_COL_PINS { B1, F7, F6, F5, E6, B4, B6 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/clawsome/gamebuddy/v1_m/info.json b/keyboards/clawsome/gamebuddy/v1_m/info.json
index 9c9ee3938b..3709bbbe3c 100644
--- a/keyboards/clawsome/gamebuddy/v1_m/info.json
+++ b/keyboards/clawsome/gamebuddy/v1_m/info.json
@@ -8,38 +8,47 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B1", "F7", "F6", "F5", "E6", "B4", "B6"],
+ "rows": ["C6", "D7", "B5", "B3", "B2"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"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.c b/keyboards/clawsome/gamebuddy/v1_m/v1_m.c
deleted file mode 100644
index 88db72d27b..0000000000
--- a/keyboards/clawsome/gamebuddy/v1_m/v1_m.c
+++ /dev/null
@@ -1,16 +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/>.
- */
-#include "v1_m.h"
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/hatchback/config.h b/keyboards/clawsome/hatchback/config.h
deleted file mode 100644
index 0c0cd52041..0000000000
--- a/keyboards/clawsome/hatchback/config.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
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B0, B6, D4, B4, D0, B5, D1, E6, D2, D7, D3, C6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, D5, C7, F1 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/clawsome/hatchback/hatchback.c b/keyboards/clawsome/hatchback/hatchback.c
deleted file mode 100644
index 117593a688..0000000000
--- a/keyboards/clawsome/hatchback/hatchback.c
+++ /dev/null
@@ -1,17 +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/>.
- */
-
-#include "hatchback.h"
diff --git a/keyboards/clawsome/hatchback/hatchback.h b/keyboards/clawsome/hatchback/hatchback.h
deleted file mode 100644
index b55f6adc28..0000000000
--- a/keyboards/clawsome/hatchback/hatchback.h
+++ /dev/null
@@ -1,43 +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"
-
-// clang-format off
-#define LAYOUT( \
- K00, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K18, K09, \
- K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27, K38, K29, \
- K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56, K47, K58, K49, \
- K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K76, \
- K80, K90, K81, K91, K82, K92, K83, K93, K84, K94, K85, K96, K98, \
- KA0, KB0, KA1, KA2, KA3, KA4, KA5, KB5, KA6, KB6, KA7, KB8, KA9 \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, KC_NO, K09 }, \
- { KC_NO, K11, K12, K13, K14, K15, K16, KC_NO, K18, KC_NO }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, KC_NO, K29 }, \
- { K30, K31, K32, K33, K34, K35, K36, KC_NO, K38, KC_NO }, \
- { K40, K41, K42, K43, K44, K45, K46, K47, KC_NO, K49 }, \
- { K50, K51, K52, K53, K54, K55, K56, KC_NO, K58, KC_NO }, \
- { K60, K61, K62, K63, K64, K65, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { K70, K71, K72, K73, K74, K75, K76, KC_NO, KC_NO, KC_NO }, \
- { K80, K81, K82, K83, K84, K85, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { K90, K91, K92, K93, K94, KC_NO, K96, KC_NO, K98, KC_NO }, \
- { KA0, KA1, KA2, KA3, KA4, KA5, KA6, KA7, KC_NO, KA9 }, \
- { KB0, KC_NO, KC_NO, KC_NO, KC_NO, KB5, KB6, KC_NO, KB8, KC_NO }, \
-}
-// clang-format on
diff --git a/keyboards/clawsome/hatchback/info.json b/keyboards/clawsome/hatchback/info.json
index 63cd7a80d7..90d1ad6ee2 100644
--- a/keyboards/clawsome/hatchback/info.json
+++ b/keyboards/clawsome/hatchback/info.json
@@ -8,100 +8,118 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "D5", "C7", "F1"],
+ "rows": ["B0", "B6", "D4", "B4", "D0", "B5", "D1", "E6", "D2", "D7", "D3", "C6"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"K00 (B0,F4)", "x":0, "y":0},
- {"label":"K01 (B0,F5)", "x":2, "y":0},
- {"label":"K11 (B6,F5)", "x":3, "y":0},
- {"label":"K02 (B0,F6)", "x":4, "y":0},
- {"label":"K12 (B6,F6)", "x":5, "y":0},
- {"label":"K03 (B0,F7)", "x":6.5, "y":0},
- {"label":"K13 (B6,F7)", "x":7.5, "y":0},
- {"label":"K04 (B0,B1)", "x":8.5, "y":0},
- {"label":"K14 (B6,B1)", "x":9.5, "y":0},
- {"label":"K05 (B0,B3)", "x":11, "y":0},
- {"label":"K15 (B6,B3)", "x":12, "y":0},
- {"label":"K06 (B0,B2)", "x":13, "y":0},
- {"label":"K16 (B6,B2)", "x":14, "y":0},
- {"label":"K07 (B0,D5)", "x":15.25, "y":0},
- {"label":"K18 (B6,C7)", "x":16.25, "y":0},
- {"label":"K09 (B0,F1)", "x":17.25, "y":0},
- {"label":"K20 (D4,F4)", "x":0, "y":1.5},
- {"label":"K30 (B4,F4)", "x":1, "y":1.5},
- {"label":"K21 (D4,F5)", "x":2, "y":1.5},
- {"label":"K31 (B4,F5)", "x":3, "y":1.5},
- {"label":"K22 (D4,F6)", "x":4, "y":1.5},
- {"label":"K32 (B4,F6)", "x":5, "y":1.5},
- {"label":"K23 (D4,F7)", "x":6, "y":1.5},
- {"label":"K33 (B4,F7)", "x":7, "y":1.5},
- {"label":"K24 (D4,B1)", "x":8, "y":1.5},
- {"label":"K34 (B4,B1)", "x":9, "y":1.5},
- {"label":"K25 (D4,B3)", "x":10, "y":1.5},
- {"label":"K35 (B4,B3)", "x":11, "y":1.5},
- {"label":"K26 (D4,B2)", "x":12, "y":1.5},
- {"label":"K36 (B4,B2)", "x":13, "y":1.5, "w":2},
- {"label":"K27 (D4,D5)", "x":15.25, "y":1.5},
- {"label":"K38 (B4,C7)", "x":16.25, "y":1.5},
- {"label":"K29 (D4,F1)", "x":17.25, "y":1.5},
- {"label":"K40 (D0,F4)", "x":0, "y":2.5, "w":1.5},
- {"label":"K50 (B5,F4)", "x":1.5, "y":2.5},
- {"label":"K41 (D0,F5)", "x":2.5, "y":2.5},
- {"label":"K51 (B5,F5)", "x":3.5, "y":2.5},
- {"label":"K42 (D0,F6)", "x":4.5, "y":2.5},
- {"label":"K52 (B5,F6)", "x":5.5, "y":2.5},
- {"label":"K43 (D0,F7)", "x":6.5, "y":2.5},
- {"label":"K53 (B5,F7)", "x":7.5, "y":2.5},
- {"label":"K44 (D0,B1)", "x":8.5, "y":2.5},
- {"label":"K54 (B5,B1)", "x":9.5, "y":2.5},
- {"label":"K45 (D0,B3)", "x":10.5, "y":2.5},
- {"label":"K55 (B5,B3)", "x":11.5, "y":2.5},
- {"label":"K46 (D0,B2)", "x":12.5, "y":2.5},
- {"label":"K56 (B5,B2)", "x":13.5, "y":2.5, "w":1.5},
- {"label":"K47 (D0,D5)", "x":15.25, "y":2.5},
- {"label":"K58 (B5,C7)", "x":16.25, "y":2.5},
- {"label":"K49 (D0,F1)", "x":17.25, "y":2.5},
- {"label":"K60 (D1,F4)", "x":0, "y":3.5, "w":1.75},
- {"label":"K70 (E6,F4)", "x":1.75, "y":3.5},
- {"label":"K61 (D1,F5)", "x":2.75, "y":3.5},
- {"label":"K71 (E6,F5)", "x":3.75, "y":3.5},
- {"label":"K62 (D1,F6)", "x":4.75, "y":3.5},
- {"label":"K72 (E6,F6)", "x":5.75, "y":3.5},
- {"label":"K63 (D1,F7)", "x":6.75, "y":3.5},
- {"label":"K73 (E6,F7)", "x":7.75, "y":3.5},
- {"label":"K64 (D1,B1)", "x":8.75, "y":3.5},
- {"label":"K74 (E6,B1)", "x":9.75, "y":3.5},
- {"label":"K65 (D1,B3)", "x":10.75, "y":3.5},
- {"label":"K75 (E6,B3)", "x":11.75, "y":3.5},
- {"label":"K76 (E6,B2)", "x":12.75, "y":3.5, "w":2.25},
- {"label":"K80 (D2,F4)", "x":0, "y":4.5, "w":2.25},
- {"label":"K90 (D7,F4)", "x":2.25, "y":4.5},
- {"label":"K81 (D2,F5)", "x":3.25, "y":4.5},
- {"label":"K91 (D7,F5)", "x":4.25, "y":4.5},
- {"label":"K82 (D2,F6)", "x":5.25, "y":4.5},
- {"label":"K92 (D7,F6)", "x":6.25, "y":4.5},
- {"label":"K83 (D2,F7)", "x":7.25, "y":4.5},
- {"label":"K93 (D7,F7)", "x":8.25, "y":4.5},
- {"label":"K84 (D2,B1)", "x":9.25, "y":4.5},
- {"label":"K94 (D7,B1)", "x":10.25, "y":4.5},
- {"label":"K85 (D2,B3)", "x":11.25, "y":4.5},
- {"label":"K96 (D7,B2)", "x":12.25, "y":4.5, "w":2.75},
- {"label":"K98 (D7,C7)", "x":16.25, "y":4.5},
- {"label":"KA0 (D3,F4)", "x":0, "y":5.5, "w":1.25},
- {"label":"KB0 (C6,F4)", "x":1.25, "y":5.5, "w":1.25},
- {"label":"KA1 (D3,F5)", "x":2.5, "y":5.5, "w":1.25},
- {"label":"KA2 (D3,F6)", "x":3.75, "y":5.5, "w":2.25},
- {"label":"KA3 (D3,F7)", "x":6, "y":5.5, "w":1.75},
- {"label":"KA4 (D3,B1)", "x":7.75, "y":5.5, "w":2.25},
- {"label":"KA5 (D3,B3)", "x":10, "y":5.5, "w":1.25},
- {"label":"KB5 (C6,B3)", "x":11.25, "y":5.5, "w":1.25},
- {"label":"KA6 (D3,B2)", "x":12.5, "y":5.5, "w":1.25},
- {"label":"KB6 (C6,B2)", "x":13.75, "y":5.5, "w":1.25},
- {"label":"KA7 (D3,D5)", "x":15.25, "y":5.5},
- {"label":"KB8 (C6,C7)", "x":16.25, "y":5.5},
- {"label":"KA9 (D3,F1)", "x":17.25, "y":5.5}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [1, 1], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+ {"matrix": [1, 2], "x": 5, "y": 0},
+
+ {"matrix": [0, 3], "x": 6.5, "y": 0},
+ {"matrix": [1, 3], "x": 7.5, "y": 0},
+ {"matrix": [0, 4], "x": 8.5, "y": 0},
+ {"matrix": [1, 4], "x": 9.5, "y": 0},
+
+ {"matrix": [0, 5], "x": 11, "y": 0},
+ {"matrix": [1, 5], "x": 12, "y": 0},
+ {"matrix": [0, 6], "x": 13, "y": 0},
+ {"matrix": [1, 6], "x": 14, "y": 0},
+
+ {"matrix": [0, 7], "x": 15.25, "y": 0},
+ {"matrix": [1, 8], "x": 16.25, "y": 0},
+ {"matrix": [0, 9], "x": 17.25, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1.5},
+ {"matrix": [3, 0], "x": 1, "y": 1.5},
+ {"matrix": [2, 1], "x": 2, "y": 1.5},
+ {"matrix": [3, 1], "x": 3, "y": 1.5},
+ {"matrix": [2, 2], "x": 4, "y": 1.5},
+ {"matrix": [3, 2], "x": 5, "y": 1.5},
+ {"matrix": [2, 3], "x": 6, "y": 1.5},
+ {"matrix": [3, 3], "x": 7, "y": 1.5},
+ {"matrix": [2, 4], "x": 8, "y": 1.5},
+ {"matrix": [3, 4], "x": 9, "y": 1.5},
+ {"matrix": [2, 5], "x": 10, "y": 1.5},
+ {"matrix": [3, 5], "x": 11, "y": 1.5},
+ {"matrix": [2, 6], "x": 12, "y": 1.5},
+ {"matrix": [3, 6], "x": 13, "y": 1.5, "w": 2},
+
+ {"matrix": [2, 7], "x": 15.25, "y": 1.5},
+ {"matrix": [3, 8], "x": 16.25, "y": 1.5},
+ {"matrix": [2, 9], "x": 17.25, "y": 1.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [5, 0], "x": 1.5, "y": 2.5},
+ {"matrix": [4, 1], "x": 2.5, "y": 2.5},
+ {"matrix": [5, 1], "x": 3.5, "y": 2.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 2.5},
+ {"matrix": [5, 2], "x": 5.5, "y": 2.5},
+ {"matrix": [4, 3], "x": 6.5, "y": 2.5},
+ {"matrix": [5, 3], "x": 7.5, "y": 2.5},
+ {"matrix": [4, 4], "x": 8.5, "y": 2.5},
+ {"matrix": [5, 4], "x": 9.5, "y": 2.5},
+ {"matrix": [4, 5], "x": 10.5, "y": 2.5},
+ {"matrix": [5, 5], "x": 11.5, "y": 2.5},
+ {"matrix": [4, 6], "x": 12.5, "y": 2.5},
+ {"matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5},
+
+ {"matrix": [4, 7], "x": 15.25, "y": 2.5},
+ {"matrix": [5, 8], "x": 16.25, "y": 2.5},
+ {"matrix": [4, 9], "x": 17.25, "y": 2.5},
+
+ {"matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [7, 0], "x": 1.75, "y": 3.5},
+ {"matrix": [6, 1], "x": 2.75, "y": 3.5},
+ {"matrix": [7, 1], "x": 3.75, "y": 3.5},
+ {"matrix": [6, 2], "x": 4.75, "y": 3.5},
+ {"matrix": [7, 2], "x": 5.75, "y": 3.5},
+ {"matrix": [6, 3], "x": 6.75, "y": 3.5},
+ {"matrix": [7, 3], "x": 7.75, "y": 3.5},
+ {"matrix": [6, 4], "x": 8.75, "y": 3.5},
+ {"matrix": [7, 4], "x": 9.75, "y": 3.5},
+ {"matrix": [6, 5], "x": 10.75, "y": 3.5},
+ {"matrix": [7, 5], "x": 11.75, "y": 3.5},
+ {"matrix": [7, 6], "x": 12.75, "y": 3.5, "w": 2.25},
+
+ {"matrix": [8, 0], "x": 0, "y": 4.5, "w": 2.25},
+ {"matrix": [9, 0], "x": 2.25, "y": 4.5},
+ {"matrix": [8, 1], "x": 3.25, "y": 4.5},
+ {"matrix": [9, 1], "x": 4.25, "y": 4.5},
+ {"matrix": [8, 2], "x": 5.25, "y": 4.5},
+ {"matrix": [9, 2], "x": 6.25, "y": 4.5},
+ {"matrix": [8, 3], "x": 7.25, "y": 4.5},
+ {"matrix": [9, 3], "x": 8.25, "y": 4.5},
+ {"matrix": [8, 4], "x": 9.25, "y": 4.5},
+ {"matrix": [9, 4], "x": 10.25, "y": 4.5},
+ {"matrix": [8, 5], "x": 11.25, "y": 4.5},
+ {"matrix": [9, 6], "x": 12.25, "y": 4.5, "w": 2.75},
+
+ {"matrix": [9, 8], "x": 16.25, "y": 4.5},
+
+ {"matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.25},
+ {"matrix": [11, 0], "x": 1.25, "y": 5.5, "w": 1.25},
+ {"matrix": [10, 1], "x": 2.5, "y": 5.5, "w": 1.25},
+ {"matrix": [10, 2], "x": 3.75, "y": 5.5, "w": 2.25},
+ {"matrix": [10, 3], "x": 6, "y": 5.5, "w": 1.75},
+ {"matrix": [10, 4], "x": 7.75, "y": 5.5, "w": 2.25},
+ {"matrix": [10, 5], "x": 10, "y": 5.5, "w": 1.25},
+ {"matrix": [11, 5], "x": 11.25, "y": 5.5, "w": 1.25},
+ {"matrix": [10, 6], "x": 12.5, "y": 5.5, "w": 1.25},
+ {"matrix": [11, 6], "x": 13.75, "y": 5.5, "w": 1.25},
+
+ {"matrix": [10, 7], "x": 15.25, "y": 5.5},
+ {"matrix": [11, 8], "x": 16.25, "y": 5.5},
+ {"matrix": [10, 9], "x": 17.25, "y": 5.5}
]
}
}
diff --git a/keyboards/clawsome/luggage_rack/config.h b/keyboards/clawsome/luggage_rack/config.h
deleted file mode 100644
index b6df355827..0000000000
--- a/keyboards/clawsome/luggage_rack/config.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
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D3, F4, B0, B2, F7, B6, B1, F5, F6 }
-#define MATRIX_COL_PINS { D4, D0, D1 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/clawsome/luggage_rack/info.json b/keyboards/clawsome/luggage_rack/info.json
index e903890122..5996c9d8f4 100644
--- a/keyboards/clawsome/luggage_rack/info.json
+++ b/keyboards/clawsome/luggage_rack/info.json
@@ -8,24 +8,33 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D4", "D0", "D1"],
+ "rows": ["D3", "F4", "B0", "B2", "F7", "B6", "B1", "F5", "F6"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"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.c b/keyboards/clawsome/luggage_rack/luggage_rack.c
deleted file mode 100644
index 3a49c797d0..0000000000
--- a/keyboards/clawsome/luggage_rack/luggage_rack.c
+++ /dev/null
@@ -1,17 +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/>.
- */
-
-#include "luggage_rack.h"
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/numeros/config.h b/keyboards/clawsome/numeros/config.h
deleted file mode 100644
index a1ee98579f..0000000000
--- a/keyboards/clawsome/numeros/config.h
+++ /dev/null
@@ -1,34 +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
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D0, C6, B2, B6, B5 }
-#define MATRIX_COL_PINS { B3, E6, D7, D4 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/clawsome/numeros/info.json b/keyboards/clawsome/numeros/info.json
index 06e9ba9751..c1b3565b63 100644
--- a/keyboards/clawsome/numeros/info.json
+++ b/keyboards/clawsome/numeros/info.json
@@ -8,33 +8,38 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B3", "E6", "D7", "D4"],
+ "rows": ["D0", "C6", "B2", "B6", "B5"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"community_layouts": ["numpad_5x4"],
"layouts": {
"LAYOUT_numpad_5x4": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
- {"x":2, "y":0},
- {"x":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},
- {"x":0, "y":1},
- {"x":1, "y":1},
- {"x":2, "y":1},
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
- {"x":0, "y":2},
- {"x":1, "y":2},
- {"x":2, "y":2},
- {"x":3, "y":1, "h":2},
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [1, 3], "x": 3, "y": 1, "h": 2},
- {"x":0, "y":3},
- {"x":1, "y":3},
- {"x":2, "y":3},
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
- {"x":0, "y":4, "w":2},
- {"x":2, "y":4},
- {"x":3, "y":3, "h":2}
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [3, 3], "x": 3, "y": 3, "h": 2}
]
}
}
diff --git a/keyboards/clawsome/numeros/numeros.c b/keyboards/clawsome/numeros/numeros.c
deleted file mode 100644
index daa7fb1b8d..0000000000
--- a/keyboards/clawsome/numeros/numeros.c
+++ /dev/null
@@ -1,16 +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/>.
- */
-#include "numeros.h"
diff --git a/keyboards/clawsome/numeros/numeros.h b/keyboards/clawsome/numeros/numeros.h
deleted file mode 100644
index a7a8ee1e09..0000000000
--- a/keyboards/clawsome/numeros/numeros.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_numpad_5x4( \
- K00, K01, K02, K03, \
- K10, K11, K12, \
- K20, K21, K22, K13, \
- K30, K31, K32, \
- K40, K42, K33 \
-) { \
- { K00, K01, K02, K03 }, \
- { K10, K11, K12, K13 }, \
- { K20, K21, K22, KC_NO }, \
- { K30, K31, K32, K33 }, \
- { K40, KC_NO, K42, KC_NO }, \
-}
diff --git a/keyboards/clawsome/roadster/config.h b/keyboards/clawsome/roadster/config.h
deleted file mode 100644
index 30294c7cfb..0000000000
--- a/keyboards/clawsome/roadster/config.h
+++ /dev/null
@@ -1,34 +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
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D2, D3, D0, D1 }
-#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5, B6, B2, B3, B1, F7, F6 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/clawsome/roadster/info.json b/keyboards/clawsome/roadster/info.json
index 4e486b037e..2e5bc24484 100644
--- a/keyboards/clawsome/roadster/info.json
+++ b/keyboards/clawsome/roadster/info.json
@@ -8,55 +8,63 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6"],
+ "rows": ["D2", "D3", "D0", "D1"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"K00 (D2,D4)", "x":0, "y":0},
- {"label":"K01 (D2,C6)", "x":1, "y":0},
- {"label":"K02 (D2,D7)", "x":2, "y":0},
- {"label":"K03 (D2,E6)", "x":3, "y":0},
- {"label":"K04 (D2,B4)", "x":4, "y":0},
- {"label":"K05 (D2,B5)", "x":5, "y":0},
- {"label":"K06 (D2,B6)", "x":6, "y":0},
- {"label":"K07 (D2,B2)", "x":7, "y":0},
- {"label":"K08 (D2,B3)", "x":8, "y":0},
- {"label":"K09 (D2,B1)", "x":9, "y":0},
- {"label":"K0A (D2,F7)", "x":10, "y":0},
- {"label":"K0B (D2,F6)", "x":11, "y":0},
- {"label":"K10 (D3,D4)", "x":0, "y":1, "w":1.5},
- {"label":"K11 (D3,C6)", "x":1.5, "y":1},
- {"label":"K12 (D3,D7)", "x":2.5, "y":1},
- {"label":"K13 (D3,E6)", "x":3.5, "y":1},
- {"label":"K14 (D3,B4)", "x":4.5, "y":1},
- {"label":"K15 (D3,B5)", "x":5.5, "y":1},
- {"label":"K16 (D3,B6)", "x":6.5, "y":1},
- {"label":"K17 (D3,B2)", "x":7.5, "y":1},
- {"label":"K18 (D3,B3)", "x":8.5, "y":1},
- {"label":"K19 (D3,B1)", "x":9.5, "y":1},
- {"label":"K1B (D3,F6)", "x":10.5, "y":1, "w":1.5},
- {"label":"K20 (D0,D4)", "x":0, "y":2},
- {"label":"K21 (D0,C6)", "x":1, "y":2},
- {"label":"K22 (D0,D7)", "x":2, "y":2},
- {"label":"K23 (D0,E6)", "x":3, "y":2},
- {"label":"K24 (D0,B4)", "x":4, "y":2},
- {"label":"K25 (D0,B5)", "x":5, "y":2},
- {"label":"K26 (D0,B6)", "x":6, "y":2},
- {"label":"K27 (D0,B2)", "x":7, "y":2},
- {"label":"K28 (D0,B3)", "x":8, "y":2},
- {"label":"K29 (D0,B1)", "x":9, "y":2},
- {"label":"K2A (D0,F7)", "x":10, "y":2},
- {"label":"K2B (D0,F6)", "x":11, "y":2},
- {"label":"K30 (D1,D4)", "x":0, "y":3},
- {"label":"K31 (D1,C6)", "x":1, "y":3},
- {"label":"K32 (D1,D7)", "x":2, "y":3},
- {"label":"K34 (D1,B4)", "x":3, "y":3, "w":2},
- {"label":"K36 (D1,B6)", "x":5, "y":3, "w":2},
- {"label":"K38 (D1,B3)", "x":7, "y":3, "w":2},
- {"label":"K39 (D1,B1)", "x":9, "y":3},
- {"label":"K3A (D1,F7)", "x":10, "y":3},
- {"label":"K3B (D1,F6)", "x":11, "y":3}
+ {"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": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+
+ {"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},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 11], "x": 10.5, "y": 1, "w": 1.5},
+
+ {"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": [2, 6], "x": 6, "y": 2},
+ {"matrix": [2, 7], "x": 7, "y": 2},
+ {"matrix": [2, 8], "x": 8, "y": 2},
+ {"matrix": [2, 9], "x": 9, "y": 2},
+ {"matrix": [2, 10], "x": 10, "y": 2},
+ {"matrix": [2, 11], "x": 11, "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, 4], "x": 3, "y": 3, "w": 2},
+ {"matrix": [3, 6], "x": 5, "y": 3, "w": 2},
+ {"matrix": [3, 8], "x": 7, "y": 3, "w": 2},
+ {"matrix": [3, 9], "x": 9, "y": 3},
+ {"matrix": [3, 10], "x": 10, "y": 3},
+ {"matrix": [3, 11], "x": 11, "y": 3}
]
}
}
diff --git a/keyboards/clawsome/roadster/roadster.c b/keyboards/clawsome/roadster/roadster.c
deleted file mode 100644
index be57d7c2f4..0000000000
--- a/keyboards/clawsome/roadster/roadster.c
+++ /dev/null
@@ -1,16 +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/>.
- */
-#include "roadster.h" \ No newline at end of file
diff --git a/keyboards/clawsome/roadster/roadster.h b/keyboards/clawsome/roadster/roadster.h
deleted file mode 100644
index a306085173..0000000000
--- a/keyboards/clawsome/roadster/roadster.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, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1B, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
- K30, K31, K32, K34, K36, K38, K39, K3A, K3B \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, KC_NO, K1B }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
- { K30, K31, K32, KC_NO, K34, KC_NO, K36, KC_NO, K38, K39, K3A, K3B }, \
-}
diff --git a/keyboards/clawsome/sedan/config.h b/keyboards/clawsome/sedan/config.h
deleted file mode 100644
index b7fe854916..0000000000
--- a/keyboards/clawsome/sedan/config.h
+++ /dev/null
@@ -1,34 +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
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { C6, D4, D0, D1, D3 }
-#define MATRIX_COL_PINS { B0, F4, F7, B1, B3, B2, B6, F0, F1, C7, D5, B7, B5, B4, E6 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/clawsome/sedan/info.json b/keyboards/clawsome/sedan/info.json
index fc6ddd8a78..dd116e6487 100644
--- a/keyboards/clawsome/sedan/info.json
+++ b/keyboards/clawsome/sedan/info.json
@@ -8,80 +8,89 @@
"pid": "0x8C78",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B0", "F4", "F7", "B1", "B3", "B2", "B6", "F0", "F1", "C7", "D5", "B7", "B5", "B4", "E6"],
+ "rows": ["C6", "D4", "D0", "D1", "D3"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"community_layouts": ["65_ansi"],
"layouts": {
"LAYOUT_65_ansi": {
"layout": [
- {"label":"K00 (B0,B5)", "x":0, "y":0},
- {"label":"K01 (B0,B6)", "x":1, "y":0},
- {"label":"K02 (B0,B7)", "x":2, "y":0},
- {"label":"K03 (B0,C0)", "x":3, "y":0},
- {"label":"K04 (B0,C1)", "x":4, "y":0},
- {"label":"K05 (B0,C2)", "x":5, "y":0},
- {"label":"K06 (B0,C3)", "x":6, "y":0},
- {"label":"K07 (B0,C4)", "x":7, "y":0},
- {"label":"K08 (B0,C5)", "x":8, "y":0},
- {"label":"K09 (B0,C6)", "x":9, "y":0},
- {"label":"K0A (B0,C7)", "x":10, "y":0},
- {"label":"K0B (B0,D0)", "x":11, "y":0},
- {"label":"K0C (B0,D1)", "x":12, "y":0},
- {"label":"K0D (B0,D2)", "x":13, "y":0, "w":2},
- {"label":"K0E (B0,D3)", "x":15, "y":0},
- {"label":"K10 (B1,B5)", "x":0, "y":1, "w":1.5},
- {"label":"K11 (B1,B6)", "x":1.5, "y":1},
- {"label":"K12 (B1,B7)", "x":2.5, "y":1},
- {"label":"K13 (B1,C0)", "x":3.5, "y":1},
- {"label":"K14 (B1,C1)", "x":4.5, "y":1},
- {"label":"K15 (B1,C2)", "x":5.5, "y":1},
- {"label":"K16 (B1,C3)", "x":6.5, "y":1},
- {"label":"K17 (B1,C4)", "x":7.5, "y":1},
- {"label":"K18 (B1,C5)", "x":8.5, "y":1},
- {"label":"K19 (B1,C6)", "x":9.5, "y":1},
- {"label":"K1A (B1,C7)", "x":10.5, "y":1},
- {"label":"K1B (B1,D0)", "x":11.5, "y":1},
- {"label":"K1C (B1,D1)", "x":12.5, "y":1},
- {"label":"K1D (B1,D2)", "x":13.5, "y":1, "w":1.5},
- {"label":"K1E (B1,D3)", "x":15, "y":1},
- {"label":"K20 (B2,B5)", "x":0, "y":2, "w":1.75},
- {"label":"K21 (B2,B6)", "x":1.75, "y":2},
- {"label":"K22 (B2,B7)", "x":2.75, "y":2},
- {"label":"K23 (B2,C0)", "x":3.75, "y":2},
- {"label":"K24 (B2,C1)", "x":4.75, "y":2},
- {"label":"K25 (B2,C2)", "x":5.75, "y":2},
- {"label":"K26 (B2,C3)", "x":6.75, "y":2},
- {"label":"K27 (B2,C4)", "x":7.75, "y":2},
- {"label":"K28 (B2,C5)", "x":8.75, "y":2},
- {"label":"K29 (B2,C6)", "x":9.75, "y":2},
- {"label":"K2A (B2,C7)", "x":10.75, "y":2},
- {"label":"K2B (B2,D0)", "x":11.75, "y":2},
- {"label":"K2D (B2,D2)", "x":12.75, "y":2, "w":2.25},
- {"label":"K2E (B2,D3)", "x":15, "y":2},
- {"label":"K30 (B3,B5)", "x":0, "y":3, "w":2.25},
- {"label":"K31 (B3,B6)", "x":2.25, "y":3},
- {"label":"K32 (B3,B7)", "x":3.25, "y":3},
- {"label":"K33 (B3,C0)", "x":4.25, "y":3},
- {"label":"K34 (B3,C1)", "x":5.25, "y":3},
- {"label":"K35 (B3,C2)", "x":6.25, "y":3},
- {"label":"K36 (B3,C3)", "x":7.25, "y":3},
- {"label":"K37 (B3,C4)", "x":8.25, "y":3},
- {"label":"K38 (B3,C5)", "x":9.25, "y":3},
- {"label":"K39 (B3,C6)", "x":10.25, "y":3},
- {"label":"K3A (B3,C7)", "x":11.25, "y":3},
- {"label":"K3B (B3,D0)", "x":12.25, "y":3, "w":1.75},
- {"label":"K3D (B3,D2)", "x":14, "y":3},
- {"label":"K3E (B3,D3)", "x":15, "y":3},
- {"label":"K40 (B4,B5)", "x":0, "y":4, "w":1.25},
- {"label":"K41 (B4,B6)", "x":1.25, "y":4, "w":1.25},
- {"label":"K42 (B4,B7)", "x":2.5, "y":4, "w":1.25},
- {"label":"K45 (B4,C2)", "x":3.75, "y":4, "w":6.25},
- {"label":"K49 (B4,C6)", "x":10, "y":4},
- {"label":"K4A (B4,C7)", "x":11, "y":4},
- {"label":"K4B (B4,D0)", "x":12, "y":4},
- {"label":"K4C (B4,D1)", "x":13, "y":4},
- {"label":"K4D (B4,D2)", "x":14, "y":4},
- {"label":"K4E (B4,D3)", "x":15, "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": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+
+ {"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},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "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": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "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": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 10], "x": 11.25, "y": 3},
+ {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4},
+ {"matrix": [4, 10], "x": 11, "y": 4},
+ {"matrix": [4, 11], "x": 12, "y": 4},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
]
}
}
diff --git a/keyboards/clawsome/sedan/sedan.c b/keyboards/clawsome/sedan/sedan.c
deleted file mode 100644
index 4977bf6978..0000000000
--- a/keyboards/clawsome/sedan/sedan.c
+++ /dev/null
@@ -1,16 +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/>.
- */
-#include "sedan.h" \ No newline at end of file
diff --git a/keyboards/clawsome/sedan/sedan.h b/keyboards/clawsome/sedan/sedan.h
deleted file mode 100644
index 7af9476676..0000000000
--- a/keyboards/clawsome/sedan/sedan.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_65_ansi( \
- 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, K2D, K2E, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
- K40, K41, K42, K45, K49, K4A, K4B, 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, KC_NO, K2D, K2E }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, K3E }, \
- { K40, K41, K42, KC_NO, KC_NO, K45, KC_NO, KC_NO, KC_NO, K49, K4A, K4B, K4C, K4D, K4E }, \
-}
diff --git a/keyboards/clawsome/sidekick/config.h b/keyboards/clawsome/sidekick/config.h
deleted file mode 100644
index be550c7a71..0000000000
--- a/keyboards/clawsome/sidekick/config.h
+++ /dev/null
@@ -1,24 +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
-
-
-#define MATRIX_ROW_PINS { D0, C6, B2, B6, B5 }
-#define MATRIX_COL_PINS { F6, F5, B1, B3, E6, D7, D4 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/clawsome/sidekick/info.json b/keyboards/clawsome/sidekick/info.json
index 93e170a09a..ee4df7538c 100644
--- a/keyboards/clawsome/sidekick/info.json
+++ b/keyboards/clawsome/sidekick/info.json
@@ -8,38 +8,47 @@
"pid": "0xDB9F",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F6", "F5", "B1", "B3", "E6", "D7", "D4"],
+ "rows": ["D0", "C6", "B2", "B6", "B5"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"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.c b/keyboards/clawsome/sidekick/sidekick.c
deleted file mode 100644
index 4f52b1ba12..0000000000
--- a/keyboards/clawsome/sidekick/sidekick.c
+++ /dev/null
@@ -1,16 +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/>.
- */
-#include "sidekick.h"
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 }, \
-}
-
diff --git a/keyboards/clawsome/suv/config.h b/keyboards/clawsome/suv/config.h
deleted file mode 100644
index 915ec1cf5b..0000000000
--- a/keyboards/clawsome/suv/config.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
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F0, B6, D0, F6, D4, F7, B3, B1, B0, C6, B2, D7 }
-#define MATRIX_COL_PINS { D3, D2, D1, B4, B5, B7, D5, C7, F1, F5, F4 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/clawsome/suv/info.json b/keyboards/clawsome/suv/info.json
index 2dadb4f79d..2f0b2d6bfe 100644
--- a/keyboards/clawsome/suv/info.json
+++ b/keyboards/clawsome/suv/info.json
@@ -8,117 +8,140 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D3", "D2", "D1", "B4", "B5", "B7", "D5", "C7", "F1", "F5", "F4"],
+ "rows": ["F0", "B6", "D0", "F6", "D4", "F7", "B3", "B1", "B0", "C6", "B2", "D7"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"K00 (F0,D3)", "x":0, "y":0},
- {"label":"K01 (F0,D2)", "x":2, "y":0},
- {"label":"K11 (B6,D2)", "x":3, "y":0},
- {"label":"K02 (F0,D1)", "x":4, "y":0},
- {"label":"K12 (B6,D1)", "x":5, "y":0},
- {"label":"K03 (F0,B4)", "x":6.5, "y":0},
- {"label":"K13 (B6,B4)", "x":7.5, "y":0},
- {"label":"K04 (F0,B5)", "x":8.5, "y":0},
- {"label":"K14 (B6,B5)", "x":9.5, "y":0},
- {"label":"K05 (F0,B7)", "x":11, "y":0},
- {"label":"K15 (B6,B7)", "x":12, "y":0},
- {"label":"K06 (F0,D5)", "x":13, "y":0},
- {"label":"K16 (B6,D5)", "x":14, "y":0},
- {"label":"K07 (F0,C7)", "x":15.25, "y":0},
- {"label":"K17 (B6,C7)", "x":16.25, "y":0},
- {"label":"K08 (F0,F1)", "x":17.25, "y":0},
- {"label":"K20 (D0,D3)", "x":0, "y":1.5},
- {"label":"K30 (F6,D3)", "x":1, "y":1.5},
- {"label":"K21 (D0,D2)", "x":2, "y":1.5},
- {"label":"K31 (F6,D2)", "x":3, "y":1.5},
- {"label":"K22 (D0,D1)", "x":4, "y":1.5},
- {"label":"K32 (F6,D1)", "x":5, "y":1.5},
- {"label":"K23 (D0,B4)", "x":6, "y":1.5},
- {"label":"K33 (F6,B4)", "x":7, "y":1.5},
- {"label":"K24 (D0,B5)", "x":8, "y":1.5},
- {"label":"K34 (F6,B5)", "x":9, "y":1.5},
- {"label":"K25 (D0,B7)", "x":10, "y":1.5},
- {"label":"K35 (F6,B7)", "x":11, "y":1.5},
- {"label":"K26 (D0,D5)", "x":12, "y":1.5},
- {"label":"K36 (F6,D5)", "x":13, "y":1.5, "w":2},
- {"label":"K27 (D0,C7)", "x":15.25, "y":1.5},
- {"label":"K37 (F6,C7)", "x":16.25, "y":1.5},
- {"label":"K28 (D0,F1)", "x":17.25, "y":1.5},
- {"label":"K38 (F6,F1)", "x":18.5, "y":1.5},
- {"label":"K29 (D0,F5)", "x":19.5, "y":1.5},
- {"label":"K39 (F6,F5)", "x":20.5, "y":1.5},
- {"label":"K2A (D0,F4)", "x":21.5, "y":1.5},
- {"label":"K40 (D4,D3)", "x":0, "y":2.5, "w":1.5},
- {"label":"K50 (F7,D3)", "x":1.5, "y":2.5},
- {"label":"K41 (D4,D2)", "x":2.5, "y":2.5},
- {"label":"K51 (F7,D2)", "x":3.5, "y":2.5},
- {"label":"K42 (D4,D1)", "x":4.5, "y":2.5},
- {"label":"K52 (F7,D1)", "x":5.5, "y":2.5},
- {"label":"K43 (D4,B4)", "x":6.5, "y":2.5},
- {"label":"K53 (F7,B4)", "x":7.5, "y":2.5},
- {"label":"K44 (D4,B5)", "x":8.5, "y":2.5},
- {"label":"K54 (F7,B5)", "x":9.5, "y":2.5},
- {"label":"K45 (D4,B7)", "x":10.5, "y":2.5},
- {"label":"K55 (F7,B7)", "x":11.5, "y":2.5},
- {"label":"K46 (D4,D5)", "x":12.5, "y":2.5},
- {"label":"K56 (F7,D5)", "x":13.5, "y":2.5, "w":1.5},
- {"label":"K47 (D4,C7)", "x":15.25, "y":2.5},
- {"label":"K57 (F7,C7)", "x":16.25, "y":2.5},
- {"label":"K48 (D4,F1)", "x":17.25, "y":2.5},
- {"label":"K58 (F7,F1)", "x":18.5, "y":2.5},
- {"label":"K49 (D4,F5)", "x":19.5, "y":2.5},
- {"label":"K59 (F7,F5)", "x":20.5, "y":2.5},
- {"label":"K4A (D4,F4)", "x":21.5, "y":2.5, "h":2},
- {"label":"K60 (B3,D3)", "x":0, "y":3.5, "w":1.75},
- {"label":"K70 (B1,D3)", "x":1.75, "y":3.5},
- {"label":"K61 (B3,D2)", "x":2.75, "y":3.5},
- {"label":"K71 (B1,D2)", "x":3.75, "y":3.5},
- {"label":"K62 (B3,D1)", "x":4.75, "y":3.5},
- {"label":"K72 (B1,D1)", "x":5.75, "y":3.5},
- {"label":"K63 (B3,B4)", "x":6.75, "y":3.5},
- {"label":"K73 (B1,B4)", "x":7.75, "y":3.5},
- {"label":"K64 (B3,B5)", "x":8.75, "y":3.5},
- {"label":"K74 (B1,B5)", "x":9.75, "y":3.5},
- {"label":"K65 (B3,B7)", "x":10.75, "y":3.5},
- {"label":"K75 (B1,B7)", "x":11.75, "y":3.5},
- {"label":"K76 (B1,D5)", "x":12.75, "y":3.5, "w":2.25},
- {"label":"K78 (B1,F1)", "x":18.5, "y":3.5},
- {"label":"K69 (B3,F5)", "x":19.5, "y":3.5},
- {"label":"K79 (B1,F5)", "x":20.5, "y":3.5},
- {"label":"K80 (B0,D3)", "x":0, "y":4.5, "w":2.25},
- {"label":"K90 (C6,D3)", "x":2.25, "y":4.5},
- {"label":"K81 (B0,D2)", "x":3.25, "y":4.5},
- {"label":"K91 (C6,D2)", "x":4.25, "y":4.5},
- {"label":"K82 (B0,D1)", "x":5.25, "y":4.5},
- {"label":"K92 (C6,D1)", "x":6.25, "y":4.5},
- {"label":"K83 (B0,B4)", "x":7.25, "y":4.5},
- {"label":"K93 (C6,B4)", "x":8.25, "y":4.5},
- {"label":"K84 (B0,B5)", "x":9.25, "y":4.5},
- {"label":"K94 (C6,B5)", "x":10.25, "y":4.5},
- {"label":"K85 (B0,B7)", "x":11.25, "y":4.5},
- {"label":"K96 (C6,D5)", "x":12.25, "y":4.5, "w":2.75},
- {"label":"K97 (C6,C7)", "x":16.25, "y":4.5},
- {"label":"K98 (C6,F1)", "x":18.5, "y":4.5},
- {"label":"K89 (B0,F5)", "x":19.5, "y":4.5},
- {"label":"K99 (C6,F5)", "x":20.5, "y":4.5},
- {"label":"K8A (B0,F4)", "x":21.5, "y":4.5, "h":2},
- {"label":"KA0 (B2,D3)", "x":0, "y":5.5, "w":1.25},
- {"label":"KB0 (D7,D3)", "x":1.25, "y":5.5, "w":1.25},
- {"label":"KA1 (B2,D2)", "x":2.5, "y":5.5, "w":1.25},
- {"label":"KA2 (B2,D1)", "x":3.75, "y":5.5, "w":2.25},
- {"label":"KA3 (B2,B4)", "x":6, "y":5.5, "w":1.75},
- {"label":"KA4 (B2,B5)", "x":7.75, "y":5.5, "w":2.25},
- {"label":"KA5 (B2,B7)", "x":10, "y":5.5, "w":1.25},
- {"label":"KB5 (D7,B7)", "x":11.25, "y":5.5, "w":1.25},
- {"label":"KA6 (B2,D5)", "x":12.5, "y":5.5, "w":1.25},
- {"label":"KB6 (D7,D5)", "x":13.75, "y":5.5, "w":1.25},
- {"label":"KA7 (B2,C7)", "x":15.25, "y":5.5},
- {"label":"KB7 (D7,C7)", "x":16.25, "y":5.5},
- {"label":"KA8 (B2,F1)", "x":17.25, "y":5.5},
- {"label":"KB8 (D7,F1)", "x":18.5, "y":5.5, "w":2},
- {"label":"KB9 (D7,F5)", "x":20.5, "y":5.5}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [1, 1], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+ {"matrix": [1, 2], "x": 5, "y": 0},
+
+ {"matrix": [0, 3], "x": 6.5, "y": 0},
+ {"matrix": [1, 3], "x": 7.5, "y": 0},
+ {"matrix": [0, 4], "x": 8.5, "y": 0},
+ {"matrix": [1, 4], "x": 9.5, "y": 0},
+
+ {"matrix": [0, 5], "x": 11, "y": 0},
+ {"matrix": [1, 5], "x": 12, "y": 0},
+ {"matrix": [0, 6], "x": 13, "y": 0},
+ {"matrix": [1, 6], "x": 14, "y": 0},
+
+ {"matrix": [0, 7], "x": 15.25, "y": 0},
+ {"matrix": [1, 7], "x": 16.25, "y": 0},
+ {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1.5},
+ {"matrix": [3, 0], "x": 1, "y": 1.5},
+ {"matrix": [2, 1], "x": 2, "y": 1.5},
+ {"matrix": [3, 1], "x": 3, "y": 1.5},
+ {"matrix": [2, 2], "x": 4, "y": 1.5},
+ {"matrix": [3, 2], "x": 5, "y": 1.5},
+ {"matrix": [2, 3], "x": 6, "y": 1.5},
+ {"matrix": [3, 3], "x": 7, "y": 1.5},
+ {"matrix": [2, 4], "x": 8, "y": 1.5},
+ {"matrix": [3, 4], "x": 9, "y": 1.5},
+ {"matrix": [2, 5], "x": 10, "y": 1.5},
+ {"matrix": [3, 5], "x": 11, "y": 1.5},
+ {"matrix": [2, 6], "x": 12, "y": 1.5},
+ {"matrix": [3, 6], "x": 13, "y": 1.5, "w": 2},
+
+ {"matrix": [2, 7], "x": 15.25, "y": 1.5},
+ {"matrix": [3, 7], "x": 16.25, "y": 1.5},
+ {"matrix": [2, 8], "x": 17.25, "y": 1.5},
+
+ {"matrix": [3, 8], "x": 18.5, "y": 1.5},
+ {"matrix": [2, 9], "x": 19.5, "y": 1.5},
+ {"matrix": [3, 9], "x": 20.5, "y": 1.5},
+ {"matrix": [2, 10], "x": 21.5, "y": 1.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [5, 0], "x": 1.5, "y": 2.5},
+ {"matrix": [4, 1], "x": 2.5, "y": 2.5},
+ {"matrix": [5, 1], "x": 3.5, "y": 2.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 2.5},
+ {"matrix": [5, 2], "x": 5.5, "y": 2.5},
+ {"matrix": [4, 3], "x": 6.5, "y": 2.5},
+ {"matrix": [5, 3], "x": 7.5, "y": 2.5},
+ {"matrix": [4, 4], "x": 8.5, "y": 2.5},
+ {"matrix": [5, 4], "x": 9.5, "y": 2.5},
+ {"matrix": [4, 5], "x": 10.5, "y": 2.5},
+ {"matrix": [5, 5], "x": 11.5, "y": 2.5},
+ {"matrix": [4, 6], "x": 12.5, "y": 2.5},
+ {"matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5},
+
+ {"matrix": [4, 7], "x": 15.25, "y": 2.5},
+ {"matrix": [5, 7], "x": 16.25, "y": 2.5},
+ {"matrix": [4, 8], "x": 17.25, "y": 2.5},
+
+ {"matrix": [5, 8], "x": 18.5, "y": 2.5},
+ {"matrix": [4, 9], "x": 19.5, "y": 2.5},
+ {"matrix": [5, 9], "x": 20.5, "y": 2.5},
+ {"matrix": [4, 10], "x": 21.5, "y": 2.5, "h": 2},
+
+ {"matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [7, 0], "x": 1.75, "y": 3.5},
+ {"matrix": [6, 1], "x": 2.75, "y": 3.5},
+ {"matrix": [7, 1], "x": 3.75, "y": 3.5},
+ {"matrix": [6, 2], "x": 4.75, "y": 3.5},
+ {"matrix": [7, 2], "x": 5.75, "y": 3.5},
+ {"matrix": [6, 3], "x": 6.75, "y": 3.5},
+ {"matrix": [7, 3], "x": 7.75, "y": 3.5},
+ {"matrix": [6, 4], "x": 8.75, "y": 3.5},
+ {"matrix": [7, 4], "x": 9.75, "y": 3.5},
+ {"matrix": [6, 5], "x": 10.75, "y": 3.5},
+ {"matrix": [7, 5], "x": 11.75, "y": 3.5},
+ {"matrix": [7, 6], "x": 12.75, "y": 3.5, "w": 2.25},
+
+ {"matrix": [7, 8], "x": 18.5, "y": 3.5},
+ {"matrix": [6, 9], "x": 19.5, "y": 3.5},
+ {"matrix": [7, 9], "x": 20.5, "y": 3.5},
+
+ {"matrix": [8, 0], "x": 0, "y": 4.5, "w": 2.25},
+ {"matrix": [9, 0], "x": 2.25, "y": 4.5},
+ {"matrix": [8, 1], "x": 3.25, "y": 4.5},
+ {"matrix": [9, 1], "x": 4.25, "y": 4.5},
+ {"matrix": [8, 2], "x": 5.25, "y": 4.5},
+ {"matrix": [9, 2], "x": 6.25, "y": 4.5},
+ {"matrix": [8, 3], "x": 7.25, "y": 4.5},
+ {"matrix": [9, 3], "x": 8.25, "y": 4.5},
+ {"matrix": [8, 4], "x": 9.25, "y": 4.5},
+ {"matrix": [9, 4], "x": 10.25, "y": 4.5},
+ {"matrix": [8, 5], "x": 11.25, "y": 4.5},
+ {"matrix": [9, 6], "x": 12.25, "y": 4.5, "w": 2.75},
+
+ {"matrix": [9, 7], "x": 16.25, "y": 4.5},
+
+ {"matrix": [9, 8], "x": 18.5, "y": 4.5},
+ {"matrix": [8, 9], "x": 19.5, "y": 4.5},
+ {"matrix": [9, 9], "x": 20.5, "y": 4.5},
+ {"matrix": [8, 10], "x": 21.5, "y": 4.5, "h": 2},
+
+ {"matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.25},
+ {"matrix": [11, 0], "x": 1.25, "y": 5.5, "w": 1.25},
+ {"matrix": [10, 1], "x": 2.5, "y": 5.5, "w": 1.25},
+ {"matrix": [10, 2], "x": 3.75, "y": 5.5, "w": 2.25},
+ {"matrix": [10, 3], "x": 6, "y": 5.5, "w": 1.75},
+ {"matrix": [10, 4], "x": 7.75, "y": 5.5, "w": 2.25},
+ {"matrix": [10, 5], "x": 10, "y": 5.5, "w": 1.25},
+ {"matrix": [11, 5], "x": 11.25, "y": 5.5, "w": 1.25},
+ {"matrix": [10, 6], "x": 12.5, "y": 5.5, "w": 1.25},
+ {"matrix": [11, 6], "x": 13.75, "y": 5.5, "w": 1.25},
+
+ {"matrix": [10, 7], "x": 15.25, "y": 5.5},
+ {"matrix": [11, 7], "x": 16.25, "y": 5.5},
+ {"matrix": [10, 8], "x": 17.25, "y": 5.5},
+
+ {"matrix": [11, 8], "x": 18.5, "y": 5.5, "w": 2},
+ {"matrix": [11, 9], "x": 20.5, "y": 5.5}
]
}
}
diff --git a/keyboards/clawsome/suv/suv.c b/keyboards/clawsome/suv/suv.c
deleted file mode 100644
index d456be8850..0000000000
--- a/keyboards/clawsome/suv/suv.c
+++ /dev/null
@@ -1,17 +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/>.
- */
-
-#include "suv.h" \ No newline at end of file
diff --git a/keyboards/clawsome/suv/suv.h b/keyboards/clawsome/suv/suv.h
deleted file mode 100644
index 64ed0e7d0f..0000000000
--- a/keyboards/clawsome/suv/suv.h
+++ /dev/null
@@ -1,41 +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, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K17, K08, \
- K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27, K37, K28, K38, K29, K39, K2A, \
- K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56, K47, K57, K48, K58, K49, K59, K4A, \
- K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K76, K78, K69, K79, \
- K80, K90, K81, K91, K82, K92, K83, K93, K84, K94, K85, K96, K97, K98, K89, K99, K8A, \
- KA0, KB0, KA1, KA2, KA3, KA4, KA5, KB5, KA6, KB6, KA7, KB7, KA8, KB8, KB9 \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, KC_NO, KC_NO }, \
- { KC_NO, K11, K12, K13, K14, K15, K16, K17, KC_NO, KC_NO, KC_NO }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, KC_NO }, \
- { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A }, \
- { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, KC_NO }, \
- { K60, K61, K62, K63, K64, K65, KC_NO, KC_NO, KC_NO, K69, KC_NO }, \
- { K70, K71, K72, K73, K74, K75, K76, KC_NO, K78, K79, KC_NO }, \
- { K80, K81, K82, K83, K84, K85, KC_NO, KC_NO, KC_NO, K89, K8A }, \
- { K90, K91, K92, K93, K94, KC_NO, K96, K97, K98, K99, KC_NO }, \
- { KA0, KA1, KA2, KA3, KA4, KA5, KA6, KA7, KA8, KC_NO, KC_NO }, \
- { KB0, KC_NO, KC_NO, KC_NO, KC_NO, KB5, KB6, KB7, KB8, KB9, KC_NO }, \
-}