summaryrefslogtreecommitdiff
path: root/keyboards/mlego/m60_split
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/mlego/m60_split')
-rw-r--r--keyboards/mlego/m60_split/config.h3
-rw-r--r--keyboards/mlego/m60_split/info.json72
-rw-r--r--keyboards/mlego/m60_split/m60_split.c17
-rw-r--r--keyboards/mlego/m60_split/m60_split.h20
-rw-r--r--keyboards/mlego/m60_split/rev1/config.h13
-rw-r--r--keyboards/mlego/m60_split/rev1/info.json14
-rw-r--r--keyboards/mlego/m60_split/rev2/config.h13
-rw-r--r--keyboards/mlego/m60_split/rev2/info.json14
8 files changed, 99 insertions, 67 deletions
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/info.json b/keyboards/mlego/m60_split/info.json
index de8a558eb1..9a332e2c33 100644
--- a/keyboards/mlego/m60_split/info.json
+++ b/keyboards/mlego/m60_split/info.json
@@ -9,7 +9,77 @@
"community_layouts": ["ortho_5x12"],
"layouts": {
"LAYOUT_ortho_5x12": {
- "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+
+ {"matrix": [5, 5], "x": 6, "y": 0},
+ {"matrix": [5, 4], "x": 7, "y": 0},
+ {"matrix": [5, 3], "x": 8, "y": 0},
+ {"matrix": [5, 2], "x": 9, "y": 0},
+ {"matrix": [5, 1], "x": 10, "y": 0},
+ {"matrix": [5, 0], "x": 11, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+
+ {"matrix": [6, 5], "x": 6, "y": 1},
+ {"matrix": [6, 4], "x": 7, "y": 1},
+ {"matrix": [6, 3], "x": 8, "y": 1},
+ {"matrix": [6, 2], "x": 9, "y": 1},
+ {"matrix": [6, 1], "x": 10, "y": 1},
+ {"matrix": [6, 0], "x": 11, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+
+ {"matrix": [7, 5], "x": 6, "y": 2},
+ {"matrix": [7, 4], "x": 7, "y": 2},
+ {"matrix": [7, 3], "x": 8, "y": 2},
+ {"matrix": [7, 2], "x": 9, "y": 2},
+ {"matrix": [7, 1], "x": 10, "y": 2},
+ {"matrix": [7, 0], "x": 11, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+
+ {"matrix": [8, 5], "x": 6, "y": 3},
+ {"matrix": [8, 4], "x": 7, "y": 3},
+ {"matrix": [8, 3], "x": 8, "y": 3},
+ {"matrix": [8, 2], "x": 9, "y": 3},
+ {"matrix": [8, 1], "x": 10, "y": 3},
+ {"matrix": [8, 0], "x": 11, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4},
+ {"matrix": [4, 5], "x": 5, "y": 4},
+
+ {"matrix": [9, 5], "x": 6, "y": 4},
+ {"matrix": [9, 4], "x": 7, "y": 4},
+ {"matrix": [9, 3], "x": 8, "y": 4},
+ {"matrix": [9, 2], "x": 9, "y": 4},
+ {"matrix": [9, 1], "x": 10, "y": 4},
+ {"matrix": [9, 0], "x": 11, "y": 4}
+ ]
}
}
}
diff --git a/keyboards/mlego/m60_split/m60_split.c b/keyboards/mlego/m60_split/m60_split.c
deleted file mode 100644
index 49fa10457a..0000000000
--- a/keyboards/mlego/m60_split/m60_split.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021-2022 alin elena <alin@elena.space>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#include "m60_split.h"
-
diff --git a/keyboards/mlego/m60_split/m60_split.h b/keyboards/mlego/m60_split/m60_split.h
index 11cbd5be60..10be6662c4 100644
--- a/keyboards/mlego/m60_split/m60_split.h
+++ b/keyboards/mlego/m60_split/m60_split.h
@@ -17,26 +17,6 @@
#include "quantum.h"
-#define LAYOUT_ortho_5x12( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
- L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \
- L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45 \
-) { \
- { L00, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { L30, L31, L32, L33, L34, L35 }, \
- { L40, L41, L42, L43, L44, L45 }, \
- { R05, R04, R03, R02, R01, R00 }, \
- { R15, R14, R13, R12, R11, R10 }, \
- { R25, R24, R23, R22, R21, R20 }, \
- { R35, R34, R33, R32, R31, R30 }, \
- { R45, R44, R43, R42, R41, R40 } \
-}
-
-
static inline void led_lwr(const bool on) {
#ifdef LED_NUM_LOCK_PIN
writePin(LED_NUM_LOCK_PIN, on);
diff --git a/keyboards/mlego/m60_split/rev1/config.h b/keyboards/mlego/m60_split/rev1/config.h
index a835d8c4f3..88a208b8f4 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
@@ -36,7 +24,6 @@
#define SERIAL_USART_SPEED 921600
#ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN B15
#define RGBLIGHT_SPLIT
#define RGBLIGHT_LAYERS
diff --git a/keyboards/mlego/m60_split/rev1/info.json b/keyboards/mlego/m60_split/rev1/info.json
index 237b933eb0..d316d64105 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"}
@@ -13,9 +18,18 @@
"num_lock": "B12",
"scroll_lock": "B13"
},
+ "ws2812": {
+ "pin": "B15"
+ },
"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..cfcb26edc1 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
@@ -38,7 +26,6 @@
#ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN B15
#define RGBLIGHT_SPLIT
#define RGBLIGHT_LAYERS
#define RGBLED_NUM 16
diff --git a/keyboards/mlego/m60_split/rev2/info.json b/keyboards/mlego/m60_split/rev2/info.json
index 4e281733e1..40718aa647 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"}
@@ -13,9 +18,18 @@
"num_lock": "B12",
"scroll_lock": "B13"
},
+ "ws2812": {
+ "pin": "B15"
+ },
"split": {
"bootmagic": {
"matrix": [5, 0]
+ },
+ "matrix_pins": {
+ "right": {
+ "cols": ["B0", "A3", "A2", "A1", "B7", "B5"],
+ "rows": ["B1", "A4", "A5", "A6", "A7"]
+ }
}
},
"processor": "STM32F411",
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 01:32:02 +0000