summaryrefslogtreecommitdiff
path: root/keyboards/handwired/slash
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/handwired/slash')
-rw-r--r--keyboards/handwired/slash/config.h16
-rw-r--r--keyboards/handwired/slash/info.json131
-rw-r--r--keyboards/handwired/slash/slash.c16
-rw-r--r--keyboards/handwired/slash/slash.h36
4 files changed, 70 insertions, 129 deletions
diff --git a/keyboards/handwired/slash/config.h b/keyboards/handwired/slash/config.h
index ffa31f3c7a..bde67936ea 100644
--- a/keyboards/handwired/slash/config.h
+++ b/keyboards/handwired/slash/config.h
@@ -17,22 +17,6 @@ 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 { C7, D6, B7, B6, B5, D7, C6, D0 }
-#define MATRIX_COL_PINS { D2, F0, F1, F4, F5, F6, F7, D3 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
/* 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/handwired/slash/info.json b/keyboards/handwired/slash/info.json
index b272ff1ed2..070cbb2c75 100644
--- a/keyboards/handwired/slash/info.json
+++ b/keyboards/handwired/slash/info.json
@@ -8,72 +8,81 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D2", "F0", "F1", "F4", "F5", "F6", "F7", "D3"],
+ "rows": ["C7", "D6", "B7", "B6", "B5", "D7", "C6", "D0"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"`", "x":1.75, "y":0},
- {"label":"1", "x":2.75, "y":0},
- {"label":"2", "x":3.75, "y":0},
- {"label":"3", "x":4.75, "y":0},
- {"label":"4", "x":5.75, "y":0},
- {"label":"5", "x":6.75, "y":0},
- {"label":"6", "x":7.75, "y":0},
- {"label":"7", "x":8.75, "y":0},
- {"label":"8", "x":9.75, "y":0},
- {"label":"9", "x":10.75, "y":0},
- {"label":"0", "x":11.75, "y":0},
- {"label":"-", "x":12.75, "y":0},
- {"label":"=", "x":13.75, "y":0},
- {"label":"Backspace", "x":14.75, "y":0, "w":2},
- {"label":"Tab", "x":1.25, "y":1, "w":1.5},
- {"label":"Q", "x":2.75, "y":1},
- {"label":"W", "x":3.75, "y":1},
- {"label":"E", "x":4.75, "y":1},
- {"label":"R", "x":5.75, "y":1},
- {"label":"T", "x":6.75, "y":1},
- {"label":"Y", "x":7.75, "y":1},
- {"label":"U", "x":8.75, "y":1},
- {"label":"I", "x":9.75, "y":1},
- {"label":"O", "x":10.75, "y":1},
- {"label":"P", "x":11.75, "y":1},
- {"label":"[", "x":12.75, "y":1},
- {"label":"]", "x":13.75, "y":1},
- {"label":"\\", "x":14.75, "y":1, "w":1.5},
- {"label":"Caps Lock", "x":1, "y":2, "w":1.75},
- {"label":"A", "x":2.75, "y":2},
- {"label":"S", "x":3.75, "y":2},
- {"label":"D", "x":4.75, "y":2},
- {"label":"F", "x":5.75, "y":2},
- {"label":"G", "x":6.75, "y":2},
- {"label":"H", "x":7.75, "y":2},
- {"label":"J", "x":8.75, "y":2},
- {"label":"K", "x":9.75, "y":2},
- {"label":"L", "x":10.75, "y":2},
- {"label":";", "x":11.75, "y":2},
- {"label":"'", "x":12.75, "y":2},
- {"label":"Enter", "x":13.75, "y":2, "w":2.25},
- {"label":"Shift", "x":0.5, "y":3, "w":2.25},
- {"label":"Z", "x":2.75, "y":3},
- {"label":"X", "x":3.75, "y":3},
- {"label":"C", "x":4.75, "y":3},
- {"label":"V", "x":5.75, "y":3},
- {"label":"B", "x":6.75, "y":3},
- {"label":"N", "x":7.75, "y":3},
- {"label":"M", "x":8.75, "y":3},
- {"label":",", "x":9.75, "y":3},
- {"label":".", "x":10.75, "y":3},
- {"label":"/", "x":11.75, "y":3},
- {"label":"Shift", "x":12.75, "y":3, "w":2.75},
- {"label":"Ctrl", "x":0, "y":4, "w":1.25},
- {"label":"GUI", "x":1.25, "y":4, "w":1.25},
- {"label":"Alt", "x":2.5, "y":4, "w":1.25},
- {"label":"Space", "x":3.75, "y":4, "w":6.25},
- {"label":"Alt", "x":10, "y":4, "w":1.25},
- {"label":"GUI", "x":11.25, "y":4, "w":1.25},
- {"label":"Menu", "x":12.5, "y":4, "w":1.25},
- {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
+ {"matrix": [0, 0], "x": 1.75, "y": 0},
+ {"matrix": [1, 0], "x": 2.75, "y": 0},
+ {"matrix": [0, 1], "x": 3.75, "y": 0},
+ {"matrix": [1, 1], "x": 4.75, "y": 0},
+ {"matrix": [0, 2], "x": 5.75, "y": 0},
+ {"matrix": [1, 2], "x": 6.75, "y": 0},
+ {"matrix": [0, 3], "x": 7.75, "y": 0},
+ {"matrix": [1, 3], "x": 8.75, "y": 0},
+ {"matrix": [0, 4], "x": 9.75, "y": 0},
+ {"matrix": [1, 4], "x": 10.75, "y": 0},
+ {"matrix": [0, 5], "x": 11.75, "y": 0},
+ {"matrix": [1, 5], "x": 12.75, "y": 0},
+ {"matrix": [0, 6], "x": 13.75, "y": 0},
+ {"matrix": [1, 6], "x": 14.75, "y": 0, "w": 2},
+
+ {"matrix": [2, 0], "x": 1.25, "y": 1, "w": 1.5},
+ {"matrix": [3, 0], "x": 2.75, "y": 1},
+ {"matrix": [2, 1], "x": 3.75, "y": 1},
+ {"matrix": [3, 1], "x": 4.75, "y": 1},
+ {"matrix": [2, 2], "x": 5.75, "y": 1},
+ {"matrix": [3, 2], "x": 6.75, "y": 1},
+ {"matrix": [2, 3], "x": 7.75, "y": 1},
+ {"matrix": [3, 3], "x": 8.75, "y": 1},
+ {"matrix": [2, 4], "x": 9.75, "y": 1},
+ {"matrix": [3, 4], "x": 10.75, "y": 1},
+ {"matrix": [2, 5], "x": 11.75, "y": 1},
+ {"matrix": [3, 5], "x": 12.75, "y": 1},
+ {"matrix": [2, 6], "x": 13.75, "y": 1},
+ {"matrix": [3, 6], "x": 14.75, "y": 1, "w": 1.5},
+
+ {"matrix": [5, 0], "x": 1, "y": 2, "w": 1.75},
+ {"matrix": [4, 0], "x": 2.75, "y": 2},
+ {"matrix": [5, 1], "x": 3.75, "y": 2},
+ {"matrix": [4, 1], "x": 4.75, "y": 2},
+ {"matrix": [5, 2], "x": 5.75, "y": 2},
+ {"matrix": [4, 2], "x": 6.75, "y": 2},
+ {"matrix": [5, 3], "x": 7.75, "y": 2},
+ {"matrix": [4, 3], "x": 8.75, "y": 2},
+ {"matrix": [5, 4], "x": 9.75, "y": 2},
+ {"matrix": [4, 4], "x": 10.75, "y": 2},
+ {"matrix": [5, 5], "x": 11.75, "y": 2},
+ {"matrix": [4, 5], "x": 12.75, "y": 2},
+ {"matrix": [5, 6], "x": 13.75, "y": 2, "w": 2.25},
+
+ {"matrix": [7, 0], "x": 0.5, "y": 3, "w": 2.25},
+ {"matrix": [6, 0], "x": 2.75, "y": 3},
+ {"matrix": [7, 1], "x": 3.75, "y": 3},
+ {"matrix": [6, 1], "x": 4.75, "y": 3},
+ {"matrix": [7, 2], "x": 5.75, "y": 3},
+ {"matrix": [6, 2], "x": 6.75, "y": 3},
+ {"matrix": [7, 3], "x": 7.75, "y": 3},
+ {"matrix": [6, 3], "x": 8.75, "y": 3},
+ {"matrix": [7, 4], "x": 9.75, "y": 3},
+ {"matrix": [6, 4], "x": 10.75, "y": 3},
+ {"matrix": [7, 5], "x": 11.75, "y": 3},
+ {"matrix": [6, 5], "x": 12.75, "y": 3, "w": 2.75},
+
+ {"matrix": [6, 7], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [7, 7], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [5, 7], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [3, 7], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [2, 7], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [7, 6], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [6, 6], "x": 13.75, "y": 4, "w": 1.25}
]
}
}
diff --git a/keyboards/handwired/slash/slash.c b/keyboards/handwired/slash/slash.c
deleted file mode 100644
index 59902b5074..0000000000
--- a/keyboards/handwired/slash/slash.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 4sdftemp
- *
- * 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 "slash.h"
diff --git a/keyboards/handwired/slash/slash.h b/keyboards/handwired/slash/slash.h
deleted file mode 100644
index 6c1342d6b2..0000000000
--- a/keyboards/handwired/slash/slash.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2019 asdftemp
- *
- * 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, k0C, k0D, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, \
- k40, k41, k42, k43, k44, k45, k46, k47 \
-) \
-{ \
- { k00, k02, k04, k06, k08, k0A, k0C, KC_NO }, \
- { k01, k03, k05, k07, k09, k0B, k0D, KC_NO }, \
- { k10, k12, k14, k16, k18, k1A, k1C, k45 }, \
- { k11, k13, k15, k17, k19, k1B, k1D, k44 }, \
- { k21, k23, k25, k27, k29, k2B, KC_NO, k42 }, \
- { k20, k22, k24, k26, k28, k2A, k2C, k43 }, \
- { k31, k33, k35, k37, k39, k3B, k47, k40 }, \
- { k30, k32, k34, k36, k38, k3A, k46, k41 } \
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-02 20:42:48 +0000