diff options
Diffstat (limited to 'keyboards/mlego')
-rw-r--r-- | keyboards/mlego/m48/config.h | 3 | ||||
-rw-r--r-- | keyboards/mlego/m48/rev1/config.h | 6 | ||||
-rw-r--r-- | keyboards/mlego/m48/rev1/info.json | 5 | ||||
-rw-r--r-- | keyboards/mlego/m60/config.h | 4 | ||||
-rw-r--r-- | keyboards/mlego/m60/rev1/config.h | 5 | ||||
-rw-r--r-- | keyboards/mlego/m60/rev1/info.json | 5 | ||||
-rw-r--r-- | keyboards/mlego/m60_split/config.h | 3 | ||||
-rw-r--r-- | keyboards/mlego/m60_split/rev1/config.h | 12 | ||||
-rw-r--r-- | keyboards/mlego/m60_split/rev1/info.json | 11 | ||||
-rw-r--r-- | keyboards/mlego/m60_split/rev2/config.h | 12 | ||||
-rw-r--r-- | keyboards/mlego/m60_split/rev2/info.json | 11 | ||||
-rw-r--r-- | keyboards/mlego/m65/config.h | 3 | ||||
-rw-r--r-- | keyboards/mlego/m65/rev1/config.h | 7 | ||||
-rw-r--r-- | keyboards/mlego/m65/rev1/info.json | 5 | ||||
-rw-r--r-- | keyboards/mlego/m65/rev2/config.h | 7 | ||||
-rw-r--r-- | keyboards/mlego/m65/rev2/info.json | 5 | ||||
-rw-r--r-- | keyboards/mlego/m65/rev3/config.h | 7 | ||||
-rw-r--r-- | keyboards/mlego/m65/rev3/info.json | 5 | ||||
-rw-r--r-- | keyboards/mlego/m65/rev4/config.h | 7 | ||||
-rw-r--r-- | keyboards/mlego/m65/rev4/info.json | 5 |
20 files changed, 52 insertions, 76 deletions
diff --git a/keyboards/mlego/m48/config.h b/keyboards/mlego/m48/config.h index 8daaa6e9f8..70e1beb43e 100644 --- a/keyboards/mlego/m48/config.h +++ b/keyboards/mlego/m48/config.h @@ -15,9 +15,6 @@ */ #pragma once -/* COL2ROW, 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 */ diff --git a/keyboards/mlego/m48/rev1/config.h b/keyboards/mlego/m48/rev1/config.h index 04c1bb4509..b872354f60 100644 --- a/keyboards/mlego/m48/rev1/config.h +++ b/keyboards/mlego/m48/rev1/config.h @@ -15,12 +15,6 @@ */ #pragma once - -#define MATRIX_ROW_PINS \ - { A6, A7, B0, B10 } -#define MATRIX_COL_PINS \ - { A10, A15, B3, B4, B5, B7, B6, A1, A2, A3, A4, A5 } - #ifdef RGBLIGHT_ENABLE #define RGBLIGHT_LAYERS #define RGB_DI_PIN B15 diff --git a/keyboards/mlego/m48/rev1/info.json b/keyboards/mlego/m48/rev1/info.json index ecfa4dc940..1e5a70aa92 100644 --- a/keyboards/mlego/m48/rev1/info.json +++ b/keyboards/mlego/m48/rev1/info.json @@ -3,6 +3,11 @@ "pid": "0x6261", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A10", "A15", "B3", "B4", "B5", "B7", "B6", "A1", "A2", "A3", "A4", "A5"], + "rows": ["A6", "A7", "B0", "B10"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "A0", "pin_b": "B8"} diff --git a/keyboards/mlego/m60/config.h b/keyboards/mlego/m60/config.h index 82e327451d..70e1beb43e 100644 --- a/keyboards/mlego/m60/config.h +++ b/keyboards/mlego/m60/config.h @@ -15,10 +15,6 @@ */ #pragma once - -/* COL2ROW, 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 */ diff --git a/keyboards/mlego/m60/rev1/config.h b/keyboards/mlego/m60/rev1/config.h index 7805e6e82b..426e65609d 100644 --- a/keyboards/mlego/m60/rev1/config.h +++ b/keyboards/mlego/m60/rev1/config.h @@ -15,11 +15,6 @@ */ #pragma once -#define MATRIX_ROW_PINS \ - { A6, A7, B0, B1, B10 } -#define MATRIX_COL_PINS \ - { A10, A15, B3, B4, B5, B7, B6, A1, A2, A3, A4, A5 } - #ifdef RGBLIGHT_ENABLE #define RGB_DI_PIN B15 diff --git a/keyboards/mlego/m60/rev1/info.json b/keyboards/mlego/m60/rev1/info.json index e9e03cb189..4af7c4b11d 100644 --- a/keyboards/mlego/m60/rev1/info.json +++ b/keyboards/mlego/m60/rev1/info.json @@ -3,6 +3,11 @@ "pid": "0x6161", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A10", "A15", "B3", "B4", "B5", "B7", "B6", "A1", "A2", "A3", "A4", "A5"], + "rows": ["A6", "A7", "B0", "B1", "B10"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "A0", "pin_b": "B8"} diff --git a/keyboards/mlego/m60_split/config.h b/keyboards/mlego/m60_split/config.h index 8daaa6e9f8..70e1beb43e 100644 --- a/keyboards/mlego/m60_split/config.h +++ b/keyboards/mlego/m60_split/config.h @@ -15,9 +15,6 @@ */ #pragma once -/* COL2ROW, 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 */ diff --git a/keyboards/mlego/m60_split/rev1/config.h b/keyboards/mlego/m60_split/rev1/config.h index a835d8c4f3..3dc80b50ef 100644 --- a/keyboards/mlego/m60_split/rev1/config.h +++ b/keyboards/mlego/m60_split/rev1/config.h @@ -15,18 +15,6 @@ */ #pragma once - -#define MATRIX_ROW_PINS \ - { B0, A6, A7, B1, A5 } -#define MATRIX_COL_PINS \ - { B14, A10, A15, B3, B4, B5 } - -#define MATRIX_ROW_PINS_RIGHT \ - { B1, A4, A5, A6, A7 } - -#define MATRIX_COL_PINS_RIGHT \ - { B0, A3, A2, A1, B7, B5 } // cols are from right to left to match the layout - #define SPLIT_LAYER_STATE_ENABLE #define SPLIT_LED_STATE_ENABLE diff --git a/keyboards/mlego/m60_split/rev1/info.json b/keyboards/mlego/m60_split/rev1/info.json index 237b933eb0..f33c5d04dd 100644 --- a/keyboards/mlego/m60_split/rev1/info.json +++ b/keyboards/mlego/m60_split/rev1/info.json @@ -3,6 +3,11 @@ "pid": "0x6361", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B14", "A10", "A15", "B3", "B4", "B5"], + "rows": ["B0", "A6", "A7", "B1", "A5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "A0", "pin_b": "B8"} @@ -16,6 +21,12 @@ "split": { "bootmagic": { "matrix": [5, 0] + }, + "matrix_pins": { + "right": { + "cols": ["B0", "A3", "A2", "A1", "B7", "B5"], + "rows": ["B1", "A4", "A5", "A6", "A7"] + } } }, "processor": "STM32F401", diff --git a/keyboards/mlego/m60_split/rev2/config.h b/keyboards/mlego/m60_split/rev2/config.h index 2bb9334497..9d5cd08e3e 100644 --- a/keyboards/mlego/m60_split/rev2/config.h +++ b/keyboards/mlego/m60_split/rev2/config.h @@ -15,18 +15,6 @@ */ #pragma once - -#define MATRIX_ROW_PINS \ - { B0, A6, A7, B1, A5 } -#define MATRIX_COL_PINS \ - { B14, A10, A15, B3, B4, B5 } - -#define MATRIX_ROW_PINS_RIGHT \ - { B1, A4, A5, A6, A7 } - -#define MATRIX_COL_PINS_RIGHT \ - { B0, A3, A2, A1, B7, B5 } // cols are from right to left to match the layout - #define SPLIT_LAYER_STATE_ENABLE #define SPLIT_LED_STATE_ENABLE diff --git a/keyboards/mlego/m60_split/rev2/info.json b/keyboards/mlego/m60_split/rev2/info.json index 4e281733e1..5ab7696dbe 100644 --- a/keyboards/mlego/m60_split/rev2/info.json +++ b/keyboards/mlego/m60_split/rev2/info.json @@ -3,6 +3,11 @@ "pid": "0x6362", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B14", "A10", "A15", "B3", "B4", "B5"], + "rows": ["B0", "A6", "A7", "B1", "A5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "A0", "pin_b": "B8"} @@ -16,6 +21,12 @@ "split": { "bootmagic": { "matrix": [5, 0] + }, + "matrix_pins": { + "right": { + "cols": ["B0", "A3", "A2", "A1", "B7", "B5"], + "rows": ["B1", "A4", "A5", "A6", "A7"] + } } }, "processor": "STM32F411", diff --git a/keyboards/mlego/m65/config.h b/keyboards/mlego/m65/config.h index 3810f998d2..bdb0c16621 100644 --- a/keyboards/mlego/m65/config.h +++ b/keyboards/mlego/m65/config.h @@ -17,8 +17,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -#define DIODE_DIRECTION COL2ROW - #define LOCKING_SUPPORT_ENABLE #define LOCKING_RESYNC_ENABLE diff --git a/keyboards/mlego/m65/rev1/config.h b/keyboards/mlego/m65/rev1/config.h index d58ee7627f..83380e9aa4 100644 --- a/keyboards/mlego/m65/rev1/config.h +++ b/keyboards/mlego/m65/rev1/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -// 0 1 2 3 4 -#define MATRIX_ROW_PINS \ - { B11, B0, B1, A2, A3 } -// 0 1 2 3 4 5 6 7 8 9 10 11 12 -#define MATRIX_COL_PINS \ - { A10, A15, B3, B4, B5, B9, B8, B7, B6, C15, A0, A7, B10 } - #define RGB_DI_PIN B15 #define RGBLIGHT_LAYERS diff --git a/keyboards/mlego/m65/rev1/info.json b/keyboards/mlego/m65/rev1/info.json index f4d8ba7578..a638ec0b99 100644 --- a/keyboards/mlego/m65/rev1/info.json +++ b/keyboards/mlego/m65/rev1/info.json @@ -3,6 +3,11 @@ "pid": "0x6061", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A10", "A15", "B3", "B4", "B5", "B9", "B8", "B7", "B6", "C15", "A0", "A7", "B10"], + "rows": ["B11", "B0", "B1", "A2", "A3"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "A8", "pin_b": "A9"} diff --git a/keyboards/mlego/m65/rev2/config.h b/keyboards/mlego/m65/rev2/config.h index 8094879b1c..2d595fc4be 100644 --- a/keyboards/mlego/m65/rev2/config.h +++ b/keyboards/mlego/m65/rev2/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -// 0 1 2 3 4 -#define MATRIX_ROW_PINS \ - { B11, B0, B1, A2, A3 } -// 0 1 2 3 4 5 6 7 8 9 10 11 12 -#define MATRIX_COL_PINS \ - { A10, A15, B3, B4, B5, B9, B8, B7, B6, C15, A0, A7, B10 } - #define RGB_DI_PIN B15 #define RGBLIGHT_LAYERS diff --git a/keyboards/mlego/m65/rev2/info.json b/keyboards/mlego/m65/rev2/info.json index 7d265197ca..00263c47f5 100644 --- a/keyboards/mlego/m65/rev2/info.json +++ b/keyboards/mlego/m65/rev2/info.json @@ -3,6 +3,11 @@ "pid": "0x6061", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["A10", "A15", "B3", "B4", "B5", "B9", "B8", "B7", "B6", "C15", "A0", "A7", "B10"], + "rows": ["B11", "B0", "B1", "A2", "A3"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "A8", "pin_b": "A9"} diff --git a/keyboards/mlego/m65/rev3/config.h b/keyboards/mlego/m65/rev3/config.h index 4a71449cb0..d535b8c229 100644 --- a/keyboards/mlego/m65/rev3/config.h +++ b/keyboards/mlego/m65/rev3/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -// 0 1 2 3 4 -#define MATRIX_ROW_PINS \ - { B10, A5, A6, A7, B0 } -// 0 1 2 3 4 5 6 7 8 9 10 11 12 -#define MATRIX_COL_PINS \ - { A10, A15, B3, B4, B5, B9, B8, B7, A1, A2, A3, A4, B1 } - #ifdef RGBLIGHT_ENABLE #define RGB_DI_PIN B15 diff --git a/keyboards/mlego/m65/rev3/info.json b/keyboards/mlego/m65/rev3/info.json index 39c26191c6..7118b12af0 100644 --- a/keyboards/mlego/m65/rev3/info.json +++ b/keyboards/mlego/m65/rev3/info.json @@ -3,6 +3,11 @@ "pid": "0x6062", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A10", "A15", "B3", "B4", "B5", "B9", "B8", "B7", "A1", "A2", "A3", "A4", "B1"], + "rows": ["B10", "A5", "A6", "A7", "B0"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "A0", "pin_b": "B6"} diff --git a/keyboards/mlego/m65/rev4/config.h b/keyboards/mlego/m65/rev4/config.h index a8b9b596d5..69bdff7cdd 100644 --- a/keyboards/mlego/m65/rev4/config.h +++ b/keyboards/mlego/m65/rev4/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -// 0 1 2 3 4 -#define MATRIX_ROW_PINS \ - { B10, A5, A6, A7, B0 } -// 0 1 2 3 4 5 6 7 8 9 10 11 12 -#define MATRIX_COL_PINS \ - { B14, A8, A10, A15, B3, B4, B5, B7, A1, A2, A3, A4, B1 } - #ifdef RGBLIGHT_ENABLE #define RGB_DI_PIN B15 diff --git a/keyboards/mlego/m65/rev4/info.json b/keyboards/mlego/m65/rev4/info.json index 91af43a6a1..1cfe298f8f 100644 --- a/keyboards/mlego/m65/rev4/info.json +++ b/keyboards/mlego/m65/rev4/info.json @@ -3,6 +3,11 @@ "pid": "0x6062", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["B14", "A8", "A10", "A15", "B3", "B4", "B5", "B7", "A1", "A2", "A3", "A4", "B1"], + "rows": ["B10", "A5", "A6", "A7", "B0"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "A0", "pin_b": "B6"} |