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/ogre | |
| parent | 80661e5f1981af4d50a32d41e136e9586d5f5a43 (diff) | |
Move matrix config to info.json, part 2 (#19987)
Diffstat (limited to 'keyboards/ogre')
| -rw-r--r-- | keyboards/ogre/ergo_single/config.h | 8 | ||||
| -rw-r--r-- | keyboards/ogre/ergo_single/info.json | 5 | ||||
| -rw-r--r-- | keyboards/ogre/ergo_split/config.h | 8 | ||||
| -rw-r--r-- | keyboards/ogre/ergo_split/info.json | 5 |
4 files changed, 10 insertions, 16 deletions
diff --git a/keyboards/ogre/ergo_single/config.h b/keyboards/ogre/ergo_single/config.h index 8069bd427b..46b598cf02 100644 --- a/keyboards/ogre/ergo_single/config.h +++ b/keyboards/ogre/ergo_single/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 { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B6 #define RGBLED_NUM 14 #define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, 6, 13, 12,11, 10, 9, 8, 7} diff --git a/keyboards/ogre/ergo_single/info.json b/keyboards/ogre/ergo_single/info.json index 04db9ff8d5..c6e8eea75c 100644 --- a/keyboards/ogre/ergo_single/info.json +++ b/keyboards/ogre/ergo_single/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], + "rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/ogre/ergo_split/config.h b/keyboards/ogre/ergo_split/config.h index 017d4792ff..724905efd7 100644 --- a/keyboards/ogre/ergo_split/config.h +++ b/keyboards/ogre/ergo_split/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 { C6, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define SPLIT_HAND_PIN D1 #define RGB_DI_PIN B6 diff --git a/keyboards/ogre/ergo_split/info.json b/keyboards/ogre/ergo_split/info.json index 42cc158acf..e01e6873d1 100644 --- a/keyboards/ogre/ergo_split/info.json +++ b/keyboards/ogre/ergo_split/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], + "rows": ["C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D3" }, |