diff options
| author | Ryan <fauxpark@gmail.com> | 2023-03-06 09:53:52 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-05 22:53:52 +0000 |
| commit | 23c365b023e409885e6f201f12df56e5145dde47 (patch) | |
| tree | 062e72be726939d5f6ddda944facb423bbf386cf /keyboards/jacky_studio/s7_elephant | |
| parent | b34d51d08d7083fc790db2562a4d39890f34886f (diff) | |
Move matrix config to info.json, part 1 (#19985)
Diffstat (limited to 'keyboards/jacky_studio/s7_elephant')
| -rw-r--r-- | keyboards/jacky_studio/s7_elephant/rev1/config.h | 14 | ||||
| -rw-r--r-- | keyboards/jacky_studio/s7_elephant/rev1/info.json | 5 | ||||
| -rw-r--r-- | keyboards/jacky_studio/s7_elephant/rev2/config.h | 17 | ||||
| -rw-r--r-- | keyboards/jacky_studio/s7_elephant/rev2/info.json | 5 |
4 files changed, 10 insertions, 31 deletions
diff --git a/keyboards/jacky_studio/s7_elephant/rev1/config.h b/keyboards/jacky_studio/s7_elephant/rev1/config.h index d7a8bf543b..7b1324e3f3 100644 --- a/keyboards/jacky_studio/s7_elephant/rev1/config.h +++ b/keyboards/jacky_studio/s7_elephant/rev1/config.h @@ -16,20 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 } -#define MATRIX_COL_PINS { B6, D0, D1, D2, D3, D4, D5, D6, D7, C6, C7, F4, F5, F6, F7, F1 } - -/* COL2ROW or 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 */ -#define LOCKING_RESYNC_ENABLE - #define RGB_DI_PIN E6 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/jacky_studio/s7_elephant/rev1/info.json b/keyboards/jacky_studio/s7_elephant/rev1/info.json index f2e51f63ac..685504afb1 100644 --- a/keyboards/jacky_studio/s7_elephant/rev1/info.json +++ b/keyboards/jacky_studio/s7_elephant/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "C6", "C7", "F4", "F5", "F6", "F7", "F1"], + "rows": ["B0", "B1", "B2", "B3", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/jacky_studio/s7_elephant/rev2/config.h b/keyboards/jacky_studio/s7_elephant/rev2/config.h index 1a6e9cea9e..1359eafc9a 100644 --- a/keyboards/jacky_studio/s7_elephant/rev2/config.h +++ b/keyboards/jacky_studio/s7_elephant/rev2/config.h @@ -16,23 +16,6 @@ #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) - * - * - * 0 1 2 3 4 5 6 7 8 9 A B C D E F */ -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, F7, F6, F5, F4, F1, F0, E6 } - -#define DIODE_DIRECTION ROW2COL - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/jacky_studio/s7_elephant/rev2/info.json b/keyboards/jacky_studio/s7_elephant/rev2/info.json index 639b5a3897..dac233ecc1 100644 --- a/keyboards/jacky_studio/s7_elephant/rev2/info.json +++ b/keyboards/jacky_studio/s7_elephant/rev2/info.json @@ -8,6 +8,11 @@ "pid": "0x0008", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0", "E6"], + "rows": ["B0", "B1", "B2", "B3", "B7"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B6", "levels": 15 |