diff options
| author | Ryan <fauxpark@gmail.com> | 2023-03-11 00:00:24 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-11 00:00:24 +1100 |
| commit | 9e64300e67720a5468c2585391250ca5579b311b (patch) | |
| tree | d8c471bb33cd5d0e38e90d925d69b3c6b3cb2d59 /keyboards/ducky | |
| parent | dd086a51d82a574a55eb3b89e8943301d72296f3 (diff) | |
Move matrix config to info.json, part 4 (#20001)
Diffstat (limited to 'keyboards/ducky')
| -rw-r--r-- | keyboards/ducky/one2mini/1861st/config.h | 16 | ||||
| -rw-r--r-- | keyboards/ducky/one2mini/1861st/info.json | 5 | ||||
| -rw-r--r-- | keyboards/ducky/one2sf/1967st/config.h | 16 | ||||
| -rw-r--r-- | keyboards/ducky/one2sf/1967st/info.json | 5 |
4 files changed, 10 insertions, 32 deletions
diff --git a/keyboards/ducky/one2mini/1861st/config.h b/keyboards/ducky/one2mini/1861st/config.h index a50ce96ac3..123779a7ab 100644 --- a/keyboards/ducky/one2mini/1861st/config.h +++ b/keyboards/ducky/one2mini/1861st/config.h @@ -17,24 +17,8 @@ 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 { D11, B4, B5, B6, B7 } -#define MATRIX_COL_PINS { B10, B9, C13, C12, C11, C10, C9, C8, A15, A14, A13, D0, D1, D2, B8 } #define DIP_SWITCH_MATRIX_GRID { {0,14}, {1,14}, {2,14}, {3,14} } -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define FORCE_NKRO #define GPIO_INPUT_PIN_DELAY (NUC123_HCLK / 6 / 1000000L) diff --git a/keyboards/ducky/one2mini/1861st/info.json b/keyboards/ducky/one2mini/1861st/info.json index 04138d2dc2..151eee80c1 100644 --- a/keyboards/ducky/one2mini/1861st/info.json +++ b/keyboards/ducky/one2mini/1861st/info.json @@ -6,6 +6,11 @@ "pid": "0x0123", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B10", "B9", "C13", "C12", "C11", "C10", "C9", "C8", "A15", "A14", "A13", "D0", "D1", "D2", "B8"], + "rows": ["D11", "B4", "B5", "B6", "B7"] + }, + "diode_direction": "COL2ROW", "layout_aliases": { "LAYOUT_iso": "LAYOUT_60_iso" }, diff --git a/keyboards/ducky/one2sf/1967st/config.h b/keyboards/ducky/one2sf/1967st/config.h index 8b29e8c3d4..123779a7ab 100644 --- a/keyboards/ducky/one2sf/1967st/config.h +++ b/keyboards/ducky/one2sf/1967st/config.h @@ -17,24 +17,8 @@ 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 { D11, B4, B5, B6, B7 } -#define MATRIX_COL_PINS { B10, B9, C13, C12, C11, C10, C9, C8, A15, A14, A13, D0, D1, D2,B15,B8 } #define DIP_SWITCH_MATRIX_GRID { {0,14}, {1,14}, {2,14}, {3,14} } -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define FORCE_NKRO #define GPIO_INPUT_PIN_DELAY (NUC123_HCLK / 6 / 1000000L) diff --git a/keyboards/ducky/one2sf/1967st/info.json b/keyboards/ducky/one2sf/1967st/info.json index 2b085cf8da..81ce8eb2d5 100644 --- a/keyboards/ducky/one2sf/1967st/info.json +++ b/keyboards/ducky/one2sf/1967st/info.json @@ -7,6 +7,11 @@ "pid": "0x07AF", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B10", "B9", "C13", "C12", "C11", "C10", "C9", "C8", "A15", "A14", "A13", "D0", "D1", "D2", "B15", "B8"], + "rows": ["D11", "B4", "B5", "B6", "B7"] + }, + "diode_direction": "COL2ROW", "layouts": { "LAYOUT_all": { "layout": [ |