diff options
author | Ryan <[email protected]> | 2023-03-11 00:39:56 +1100 |
---|---|---|
committer | GitHub <[email protected]> | 2023-03-11 00:39:56 +1100 |
commit | caa8c81086a806ea048c91ba142d424dc6a49f50 (patch) | |
tree | 824de64449d9cfaeba176288d379a282c733ae1a /keyboards/marksard/treadstone32 | |
parent | ace372d90de13dafc815df5d8049497cb351b69b (diff) | |
download | qmk_firmware-caa8c81086a806ea048c91ba142d424dc6a49f50.tar.gz qmk_firmware-caa8c81086a806ea048c91ba142d424dc6a49f50.zip |
Move matrix config to info.json, part 7 (#20020)
Diffstat (limited to 'keyboards/marksard/treadstone32')
-rw-r--r-- | keyboards/marksard/treadstone32/lite/config.h | 16 | ||||
-rw-r--r-- | keyboards/marksard/treadstone32/lite/info.json | 5 | ||||
-rw-r--r-- | keyboards/marksard/treadstone32/rev1/config.h | 17 | ||||
-rw-r--r-- | keyboards/marksard/treadstone32/rev1/info.json | 5 |
4 files changed, 10 insertions, 33 deletions
diff --git a/keyboards/marksard/treadstone32/lite/config.h b/keyboards/marksard/treadstone32/lite/config.h index a460abd0ef..1da59006d4 100644 --- a/keyboards/marksard/treadstone32/lite/config.h +++ b/keyboards/marksard/treadstone32/lite/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 { B6, B2, F7, F6, B3, B1, F4, F5 } -#define MATRIX_COL_PINS { B5, B4, E6, D7, C6 } - -/* COL2ROW, ROW2COL, or CUSTOM_MATRIX */ -#define DIODE_DIRECTION COL2ROW #define RGB_DI_PIN D3 #ifdef RGB_DI_PIN #define RGBLED_NUM 6 diff --git a/keyboards/marksard/treadstone32/lite/info.json b/keyboards/marksard/treadstone32/lite/info.json index 040083b968..a66783b8c9 100644 --- a/keyboards/marksard/treadstone32/lite/info.json +++ b/keyboards/marksard/treadstone32/lite/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "0.1.5" }, + "matrix_pins": { + "cols": ["B5", "B4", "E6", "D7", "C6"], + "rows": ["B6", "B2", "F7", "F6", "B3", "B1", "F4", "F5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina" } diff --git a/keyboards/marksard/treadstone32/rev1/config.h b/keyboards/marksard/treadstone32/rev1/config.h index db39ee477c..573427ff75 100644 --- a/keyboards/marksard/treadstone32/rev1/config.h +++ b/keyboards/marksard/treadstone32/rev1/config.h @@ -17,23 +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 { F1, F0, E6, B2, B4, D7, D6, D4 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, C7 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D3 #ifdef RGB_DI_PIN #define RGBLED_NUM 6 diff --git a/keyboards/marksard/treadstone32/rev1/info.json b/keyboards/marksard/treadstone32/rev1/info.json index 51b46b22d2..f7b19c63fa 100644 --- a/keyboards/marksard/treadstone32/rev1/info.json +++ b/keyboards/marksard/treadstone32/rev1/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "0.1.0" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "C7"], + "rows": ["F1", "F0", "E6", "B2", "B4", "D7", "D6", "D4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu" } |