diff options
| author | Ryan <fauxpark@gmail.com> | 2023-03-10 22:16:56 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-10 22:16:56 +1100 |
| commit | dd086a51d82a574a55eb3b89e8943301d72296f3 (patch) | |
| tree | db49e94d90e9f3a8a6cf72a9da0d5549dd2a9bcb /keyboards/owlab/voice65 | |
| parent | 80661e5f1981af4d50a32d41e136e9586d5f5a43 (diff) | |
Move matrix config to info.json, part 2 (#19987)
Diffstat (limited to 'keyboards/owlab/voice65')
| -rw-r--r-- | keyboards/owlab/voice65/hotswap/config.h | 8 | ||||
| -rw-r--r-- | keyboards/owlab/voice65/hotswap/info.json | 5 | ||||
| -rw-r--r-- | keyboards/owlab/voice65/soldered/config.h | 8 | ||||
| -rw-r--r-- | keyboards/owlab/voice65/soldered/info.json | 5 |
4 files changed, 10 insertions, 16 deletions
diff --git a/keyboards/owlab/voice65/hotswap/config.h b/keyboards/owlab/voice65/hotswap/config.h index 9a1aacc4fa..fb7ee7f1cc 100644 --- a/keyboards/owlab/voice65/hotswap/config.h +++ b/keyboards/owlab/voice65/hotswap/config.h @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* Keyboard Matrix Assignments */ -#define MATRIX_ROW_PINS { B0, B1, B2, B10, B11 } -#define MATRIX_COL_PINS { A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A15, B8, B9, B12, B13 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* NKRO */ #define FORCE_NKRO diff --git a/keyboards/owlab/voice65/hotswap/info.json b/keyboards/owlab/voice65/hotswap/info.json index 7a5215bf86..ad7641b65d 100644 --- a/keyboards/owlab/voice65/hotswap/info.json +++ b/keyboards/owlab/voice65/hotswap/info.json @@ -8,6 +8,11 @@ "pid": "0x564F", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9", "A10", "A15", "B8", "B9", "B12", "B13"], + "rows": ["B0", "B1", "B2", "B10", "B11"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B4", "pin_b": "B5"} diff --git a/keyboards/owlab/voice65/soldered/config.h b/keyboards/owlab/voice65/soldered/config.h index fc5aafd1ce..444ca29714 100644 --- a/keyboards/owlab/voice65/soldered/config.h +++ b/keyboards/owlab/voice65/soldered/config.h @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* Keyboard Matrix Assignments */ -#define MATRIX_ROW_PINS { B0, B1, B2, B10, B11 } -#define MATRIX_COL_PINS { A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A15, B8, B9, B12, B13 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* NKRO */ #define FORCE_NKRO diff --git a/keyboards/owlab/voice65/soldered/info.json b/keyboards/owlab/voice65/soldered/info.json index 4a3c8a6936..7922e9400c 100644 --- a/keyboards/owlab/voice65/soldered/info.json +++ b/keyboards/owlab/voice65/soldered/info.json @@ -8,6 +8,11 @@ "pid": "0x5657", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9", "A10", "A15", "B8", "B9", "B12", "B13"], + "rows": ["B0", "B1", "B2", "B10", "B11"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B4", "pin_b": "B5"} |