diff options
| author | Ryan <fauxpark@gmail.com> | 2023-02-19 18:55:12 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-19 18:55:12 +1100 |
| commit | e837a32b2b4d6eb96ffacad0022699d67c0f8f1e (patch) | |
| tree | f5628f3adb0c1403aa919c909c6a768d2bee0588 /keyboards/macro3 | |
| parent | 2222836f092ff52e0e93250ff91048cbb9071877 (diff) | |
Move layouts for direct_pins boards to data driven (#19872)
Diffstat (limited to 'keyboards/macro3')
| -rw-r--r-- | keyboards/macro3/info.json | 16 | ||||
| -rw-r--r-- | keyboards/macro3/macro3.c | 2 | ||||
| -rw-r--r-- | keyboards/macro3/macro3.h | 16 |
3 files changed, 9 insertions, 25 deletions
diff --git a/keyboards/macro3/info.json b/keyboards/macro3/info.json index d8479b2a00..89720d9b70 100644 --- a/keyboards/macro3/info.json +++ b/keyboards/macro3/info.json @@ -22,15 +22,15 @@ "layouts": { "LAYOUT_ortho_2x4": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, + {"x": 0, "y": 0, "matrix": [0, 0]}, + {"x": 1, "y": 0, "matrix": [0, 1]}, + {"x": 2, "y": 0, "matrix": [0, 2]}, + {"x": 3, "y": 0, "matrix": [0, 3]}, - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1} + {"x": 0, "y": 1, "matrix": [1, 0]}, + {"x": 1, "y": 1, "matrix": [1, 1]}, + {"x": 2, "y": 1, "matrix": [1, 2]}, + {"x": 3, "y": 1, "matrix": [1, 3]} ] } } diff --git a/keyboards/macro3/macro3.c b/keyboards/macro3/macro3.c index 0937abfc83..54fce243ab 100644 --- a/keyboards/macro3/macro3.c +++ b/keyboards/macro3/macro3.c @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-2.0+ */ -#include "macro3.h" +#include "quantum.h" #ifdef ENCODER_ENABLE bool encoder_update_kb(uint8_t index, bool clockwise) { diff --git a/keyboards/macro3/macro3.h b/keyboards/macro3/macro3.h deleted file mode 100644 index 4a5071cbfe..0000000000 --- a/keyboards/macro3/macro3.h +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 David Philip Barr <@davidphilipbarr> - * Copyright 2021 @filterpaper - * SPDX-License-Identifier: GPL-2.0+ - */ - -#include "quantum.h" - -#define LAYOUT_ortho_2x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13 \ -) \ -{ \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 } \ -} - |