summaryrefslogtreecommitdiff
path: root/keyboards/basketweave
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/basketweave')
-rw-r--r--keyboards/basketweave/basketweave.c17
-rw-r--r--keyboards/basketweave/basketweave.h35
-rw-r--r--keyboards/basketweave/config.h9
-rw-r--r--keyboards/basketweave/info.json156
-rw-r--r--keyboards/basketweave/keymaps/default/keymap.c2
5 files changed, 87 insertions, 132 deletions
diff --git a/keyboards/basketweave/basketweave.c b/keyboards/basketweave/basketweave.c
deleted file mode 100644
index 388810c9c8..0000000000
--- a/keyboards/basketweave/basketweave.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 null-ll
- *
- * 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 "basketweave.h"
diff --git a/keyboards/basketweave/basketweave.h b/keyboards/basketweave/basketweave.h
deleted file mode 100644
index b08254406c..0000000000
--- a/keyboards/basketweave/basketweave.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 null-ll
- *
- * 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 ____ KC_NO
-
-#include "quantum.h"
-
-#define LAYOUT_default( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K414, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, \
- K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K214, \
- K401, K402, K404, K406, K408, K410, K411, K412, K413, K314 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \
- { ____, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
- { ____, K401, K402, ____, K404, ____, K406, ____, K408, ____, K410, K411, K412, K413, K414 } \
-}
diff --git a/keyboards/basketweave/config.h b/keyboards/basketweave/config.h
index 2c3f6f97f2..36054e7bb6 100644
--- a/keyboards/basketweave/config.h
+++ b/keyboards/basketweave/config.h
@@ -16,15 +16,6 @@
#pragma once
-
-#define MATRIX_ROW_PINS { A6, C6, C7, A7, A5 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, B0, B1, B2, D5, D6, C5, C4, C3, C2, C1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define USB_MAX_POWER_CONSUMPTION 100
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/basketweave/info.json b/keyboards/basketweave/info.json
index 3ef505854e..8f9be9b406 100644
--- a/keyboards/basketweave/info.json
+++ b/keyboards/basketweave/info.json
@@ -6,8 +6,14 @@
"usb": {
"vid": "0x6B62",
"pid": "0x8989",
- "device_version": "0.0.1"
+ "device_version": "0.0.1",
+ "max_power": 100
},
+ "matrix_pins": {
+ "cols": ["A0", "A1", "A2", "A3", "A4", "B0", "B1", "B2", "D5", "D6", "C5", "C4", "C3", "C2", "C1"],
+ "rows": ["A6", "C6", "C7", "A7", "A5"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "D7", "pin_b": "C0"}
@@ -18,75 +24,85 @@
"layouts": {
"LAYOUT_default": {
"layout": [
- {"label":"Esc", "x":0, "y":0},
- {"label":"~", "x":1.5, "y":0},
- {"label":"!", "x":2.5, "y":0},
- {"label":"@", "x":3.5, "y":0},
- {"label":"#", "x":4.5, "y":0},
- {"label":"$", "x":5.5, "y":0},
- {"label":"%", "x":6.5, "y":0},
- {"label":"^", "x":7.5, "y":0},
- {"label":"&", "x":10.5, "y":0},
- {"label":"*", "x":11.5, "y":0},
- {"label":"(", "x":12.5, "y":0},
- {"label":")", "x":13.5, "y":0},
- {"label":"_", "x":14.5, "y":0},
- {"label":"+", "x":15.5, "y":0},
- {"label":"Backspace", "x":16.5, "y":0, "w":2},
- {"label":"Insert", "x":0, "y":1},
- {"label":"Tab", "x":1.5, "y":1, "w":1.5},
- {"label":"Q", "x":3, "y":1},
- {"label":"W", "x":4, "y":1},
- {"label":"E", "x":5, "y":1},
- {"label":"R", "x":6, "y":1},
- {"label":"T", "x":7, "y":1},
- {"label":"Y", "x":10, "y":1},
- {"label":"U", "x":11, "y":1},
- {"label":"I", "x":12, "y":1},
- {"label":"O", "x":13, "y":1},
- {"label":"P", "x":14, "y":1},
- {"label":"{", "x":15, "y":1},
- {"label":"}", "x":16, "y":1},
- {"label":"|", "x":17, "y":1, "w":1.5},
- {"label":"Mute", "x":19, "y":0.5},
- {"label":"Delete", "x":0, "y":2},
- {"label":"Caps Lock", "x":1.5, "y":2, "w":1.75},
- {"label":"A", "x":3.25, "y":2},
- {"label":"S", "x":4.25, "y":2},
- {"label":"D", "x":5.25, "y":2},
- {"label":"F", "x":6.25, "y":2},
- {"label":"G", "x":7.25, "y":2},
- {"label":"H", "x":10.25, "y":2},
- {"label":"J", "x":11.25, "y":2},
- {"label":"K", "x":12.25, "y":2},
- {"label":"L", "x":13.25, "y":2},
- {"label":":", "x":14.25, "y":2},
- {"label":"\"", "x":15.25, "y":2},
- {"label":"Enter", "x":16.25, "y":2, "w":2.25},
- {"label":"Shift", "x":1.5, "y":3, "w":2.25},
- {"label":"Z", "x":3.75, "y":3},
- {"label":"X", "x":4.75, "y":3},
- {"label":"C", "x":5.75, "y":3},
- {"label":"V", "x":6.75, "y":3},
- {"label":"B", "x":7.75, "y":3},
- {"label":"B", "x":9.75, "y":3},
- {"label":"N", "x":10.75, "y":3},
- {"label":"M", "x":11.75, "y":3},
- {"label":"<", "x":12.75, "y":3},
- {"label":">", "x":13.75, "y":3},
- {"label":"?", "x":14.75, "y":3},
- {"label":"Shift", "x":15.75, "y":3, "w":1.75},
- {"label":"Up", "x":17.75, "y":3.25},
- {"label":"Ctrl", "x":1.5, "y":4, "w":1.5},
- {"label":"Alt", "x":4.5, "y":4, "w":1.5},
- {"label":"Space", "x":6, "y":4, "w":2},
- {"label":"Fn", "x":8, "y":4},
- {"label":"Space", "x":9.75, "y":4, "w":2.75},
- {"label":"Alt", "x":12.5, "y":4, "w":1.5},
- {"label":"Ctrl", "x":15, "y":4, "w":1.5},
- {"label":"Left", "x":16.75, "y":4.25},
- {"label":"Down", "x":17.75, "y":4.25},
- {"label":"Right", "x":18.75, "y":4.25}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.5, "y": 0},
+ {"matrix": [0, 2], "x": 2.5, "y": 0},
+ {"matrix": [0, 3], "x": 3.5, "y": 0},
+ {"matrix": [0, 4], "x": 4.5, "y": 0},
+ {"matrix": [0, 5], "x": 5.5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 10.5, "y": 0},
+ {"matrix": [0, 9], "x": 11.5, "y": 0},
+ {"matrix": [0, 10], "x": 12.5, "y": 0},
+ {"matrix": [0, 11], "x": 13.5, "y": 0},
+ {"matrix": [0, 12], "x": 14.5, "y": 0},
+ {"matrix": [0, 13], "x": 15.5, "y": 0},
+ {"matrix": [0, 14], "x": 16.5, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 3, "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},
+ {"matrix": [1, 7], "x": 10, "y": 1},
+ {"matrix": [1, 8], "x": 11, "y": 1},
+ {"matrix": [1, 9], "x": 12, "y": 1},
+ {"matrix": [1, 10], "x": 13, "y": 1},
+ {"matrix": [1, 11], "x": 14, "y": 1},
+ {"matrix": [1, 12], "x": 15, "y": 1},
+ {"matrix": [1, 13], "x": 16, "y": 1},
+ {"matrix": [1, 14], "x": 17, "y": 1, "w": 1.5},
+
+ {"matrix": [4, 14], "x": 19, "y": 0.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 3.25, "y": 2},
+ {"matrix": [2, 3], "x": 4.25, "y": 2},
+ {"matrix": [2, 4], "x": 5.25, "y": 2},
+ {"matrix": [2, 5], "x": 6.25, "y": 2},
+ {"matrix": [2, 6], "x": 7.25, "y": 2},
+ {"matrix": [2, 7], "x": 10.25, "y": 2},
+ {"matrix": [2, 8], "x": 11.25, "y": 2},
+ {"matrix": [2, 9], "x": 12.25, "y": 2},
+ {"matrix": [2, 10], "x": 13.25, "y": 2},
+ {"matrix": [2, 11], "x": 14.25, "y": 2},
+ {"matrix": [2, 12], "x": 15.25, "y": 2},
+ {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 3.75, "y": 3},
+ {"matrix": [3, 3], "x": 4.75, "y": 3},
+ {"matrix": [3, 4], "x": 5.75, "y": 3},
+ {"matrix": [3, 5], "x": 6.75, "y": 3},
+ {"matrix": [3, 6], "x": 7.75, "y": 3},
+ {"matrix": [3, 7], "x": 9.75, "y": 3},
+ {"matrix": [3, 8], "x": 10.75, "y": 3},
+ {"matrix": [3, 9], "x": 11.75, "y": 3},
+ {"matrix": [3, 10], "x": 12.75, "y": 3},
+ {"matrix": [3, 11], "x": 13.75, "y": 3},
+ {"matrix": [3, 12], "x": 14.75, "y": 3},
+ {"matrix": [3, 13], "x": 15.75, "y": 3, "w": 1.75},
+
+ {"matrix": [2, 14], "x": 17.75, "y": 3.25},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 4], "x": 6, "y": 4, "w": 2},
+ {"matrix": [4, 6], "x": 8, "y": 4},
+ {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 11], "x": 15, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 12], "x": 16.75, "y": 4.25},
+ {"matrix": [4, 13], "x": 17.75, "y": 4.25},
+ {"matrix": [3, 14], "x": 18.75, "y": 4.25}
]
}
}
diff --git a/keyboards/basketweave/keymaps/default/keymap.c b/keyboards/basketweave/keymaps/default/keymap.c
index 379c9f7985..efe70b32ec 100644
--- a/keyboards/basketweave/keymaps/default/keymap.c
+++ b/keyboards/basketweave/keymaps/default/keymap.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "basketweave.h"
+#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-02 02:13:07 +0000