From d0ebafaea6847926e6391a6920821bcb17b3c39c Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sun, 1 Jan 2023 00:54:12 +0000 Subject: Align definition of unicode_map (#19452) --- keyboards/mlego/m65/keymaps/uk/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/mlego') diff --git a/keyboards/mlego/m65/keymaps/uk/keymap.c b/keyboards/mlego/m65/keymaps/uk/keymap.c index 2d8e597f07..8a711234b5 100644 --- a/keyboards/mlego/m65/keymaps/uk/keymap.c +++ b/keyboards/mlego/m65/keymaps/uk/keymap.c @@ -24,7 +24,7 @@ along with this program. If not, see . #endif -const uint32_t PROGMEM unicode_map[] = { +const uint32_t unicode_map[] PROGMEM = { [la] = 0x03B1 , // α [lA] = 0x0391 , // Α [lb] = 0x03B2 , // β -- cgit v1.2.3 From 56555c61e1396a0b1f85105abe78f0a2b3a7c4f3 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 10 Jan 2023 13:48:20 +1100 Subject: Migrate `LAYOUTS` to data driven (#19541) * Migrate `LAYOUTS` to data driven, 0-9 * Migrate `LAYOUTS` to data driven, A * Migrate `LAYOUTS` to data driven, B * Migrate `LAYOUTS` to data driven, C * Migrate `LAYOUTS` to data driven, D * Migrate `LAYOUTS` to data driven, E * Migrate `LAYOUTS` to data driven, F * Migrate `LAYOUTS` to data driven, G * Migrate `LAYOUTS` to data driven, H * Migrate `LAYOUTS` to data driven, handwired * Migrate `LAYOUTS` to data driven, I * Migrate `LAYOUTS` to data driven, J * Migrate `LAYOUTS` to data driven, K * Migrate `LAYOUTS` to data driven, L * Migrate `LAYOUTS` to data driven, M * Migrate `LAYOUTS` to data driven, N * Migrate `LAYOUTS` to data driven, O * Migrate `LAYOUTS` to data driven, P * Migrate `LAYOUTS` to data driven, Q * Migrate `LAYOUTS` to data driven, R * Migrate `LAYOUTS` to data driven, S * Migrate `LAYOUTS` to data driven, T * Migrate `LAYOUTS` to data driven, U * Migrate `LAYOUTS` to data driven, V * Migrate `LAYOUTS` to data driven, W * Migrate `LAYOUTS` to data driven, X * Migrate `LAYOUTS` to data driven, Y * Migrate `LAYOUTS` to data driven, Z --- keyboards/mlego/m48/info.json | 1 + keyboards/mlego/m48/rev1/rules.mk | 2 -- keyboards/mlego/m60/info.json | 1 + keyboards/mlego/m60/rev1/rules.mk | 2 -- keyboards/mlego/m60_split/info.json | 1 + keyboards/mlego/m60_split/rev1/rules.mk | 2 -- keyboards/mlego/m60_split/rev2/rules.mk | 2 -- 7 files changed, 3 insertions(+), 8 deletions(-) (limited to 'keyboards/mlego') diff --git a/keyboards/mlego/m48/info.json b/keyboards/mlego/m48/info.json index c67c06fb76..0a9d879ad4 100644 --- a/keyboards/mlego/m48/info.json +++ b/keyboards/mlego/m48/info.json @@ -6,6 +6,7 @@ "usb": { "vid": "0xBABA" }, + "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT_ortho_4x12": { "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}] diff --git a/keyboards/mlego/m48/rev1/rules.mk b/keyboards/mlego/m48/rev1/rules.mk index 20a1e60817..3a1c9a94ab 100644 --- a/keyboards/mlego/m48/rev1/rules.mk +++ b/keyboards/mlego/m48/rev1/rules.mk @@ -19,5 +19,3 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes # Enable encoder - -LAYOUTS = ortho_4x12 diff --git a/keyboards/mlego/m60/info.json b/keyboards/mlego/m60/info.json index fc1a46cc23..61b720a843 100644 --- a/keyboards/mlego/m60/info.json +++ b/keyboards/mlego/m60/info.json @@ -6,6 +6,7 @@ "usb": { "vid": "0xBABA" }, + "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}] diff --git a/keyboards/mlego/m60/rev1/rules.mk b/keyboards/mlego/m60/rev1/rules.mk index 6c3ff56a08..b3b349f6f7 100644 --- a/keyboards/mlego/m60/rev1/rules.mk +++ b/keyboards/mlego/m60/rev1/rules.mk @@ -20,5 +20,3 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes # Enable encoder - -LAYOUTS = ortho_5x12 diff --git a/keyboards/mlego/m60_split/info.json b/keyboards/mlego/m60_split/info.json index 3212b0c613..de8a558eb1 100644 --- a/keyboards/mlego/m60_split/info.json +++ b/keyboards/mlego/m60_split/info.json @@ -6,6 +6,7 @@ "usb": { "vid": "0xBABA" }, + "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}] diff --git a/keyboards/mlego/m60_split/rev1/rules.mk b/keyboards/mlego/m60_split/rev1/rules.mk index 076a334510..6463d57d37 100644 --- a/keyboards/mlego/m60_split/rev1/rules.mk +++ b/keyboards/mlego/m60_split/rev1/rules.mk @@ -22,5 +22,3 @@ SPLIT_KEYBOARD = yes SERIAL_DRIVER = usart ENCODER_ENABLE = yes # Enable encoder -LAYOUTS = ortho_5x12 - diff --git a/keyboards/mlego/m60_split/rev2/rules.mk b/keyboards/mlego/m60_split/rev2/rules.mk index c10aed3e16..72f146cc82 100644 --- a/keyboards/mlego/m60_split/rev2/rules.mk +++ b/keyboards/mlego/m60_split/rev2/rules.mk @@ -20,5 +20,3 @@ AUDIO_ENABLE = no # Audio output SPLIT_KEYBOARD = yes SERIAL_DRIVER = usart ENCODER_ENABLE = yes # Enable encoder - -LAYOUTS = ortho_5x12 -- cgit v1.2.3 From f6dd8dea2e493dc549a60fee99de871c4088d09a Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Tue, 31 Jan 2023 06:03:30 +1100 Subject: Remove usages of config_common.h from config.h files. (#19714) --- keyboards/mlego/m48/config.h | 1 - keyboards/mlego/m48/rev1/config.h | 1 - keyboards/mlego/m60/config.h | 1 - keyboards/mlego/m60/rev1/config.h | 1 - keyboards/mlego/m60_split/config.h | 1 - keyboards/mlego/m60_split/rev1/config.h | 1 - keyboards/mlego/m60_split/rev2/config.h | 1 - keyboards/mlego/m65/config.h | 1 - 8 files changed, 8 deletions(-) (limited to 'keyboards/mlego') diff --git a/keyboards/mlego/m48/config.h b/keyboards/mlego/m48/config.h index 29bc9f07e7..ef1fb45171 100644 --- a/keyboards/mlego/m48/config.h +++ b/keyboards/mlego/m48/config.h @@ -15,7 +15,6 @@ */ #pragma once -#include "config_common.h" #define MATRIX_ROWS 4 // Rows are doubled-up #define MATRIX_COLS 12 diff --git a/keyboards/mlego/m48/rev1/config.h b/keyboards/mlego/m48/rev1/config.h index b0fa3e95a5..d443d9b110 100644 --- a/keyboards/mlego/m48/rev1/config.h +++ b/keyboards/mlego/m48/rev1/config.h @@ -15,7 +15,6 @@ */ #pragma once -#include "config_common.h" #define MATRIX_ROW_PINS \ { A6, A7, B0, B10 } diff --git a/keyboards/mlego/m60/config.h b/keyboards/mlego/m60/config.h index 6cf70e5c41..06b6a1f815 100644 --- a/keyboards/mlego/m60/config.h +++ b/keyboards/mlego/m60/config.h @@ -15,7 +15,6 @@ */ #pragma once -#include "config_common.h" #define MATRIX_ROWS 5 #define MATRIX_COLS 12 diff --git a/keyboards/mlego/m60/rev1/config.h b/keyboards/mlego/m60/rev1/config.h index 7507dcd427..0d504568cb 100644 --- a/keyboards/mlego/m60/rev1/config.h +++ b/keyboards/mlego/m60/rev1/config.h @@ -15,7 +15,6 @@ */ #pragma once -#include "config_common.h" #define LED_NUM_LOCK_PIN B12 #define LED_SCROLL_LOCK_PIN B13 diff --git a/keyboards/mlego/m60_split/config.h b/keyboards/mlego/m60_split/config.h index 241ea77a22..38f6909cbf 100644 --- a/keyboards/mlego/m60_split/config.h +++ b/keyboards/mlego/m60_split/config.h @@ -15,7 +15,6 @@ */ #pragma once -#include "config_common.h" #define MATRIX_ROWS 10 // Rows are doubled-up #define MATRIX_COLS 6 diff --git a/keyboards/mlego/m60_split/rev1/config.h b/keyboards/mlego/m60_split/rev1/config.h index d1053a2291..89266fd0b8 100644 --- a/keyboards/mlego/m60_split/rev1/config.h +++ b/keyboards/mlego/m60_split/rev1/config.h @@ -15,7 +15,6 @@ */ #pragma once -#include "config_common.h" #define MATRIX_ROW_PINS \ { B0, A6, A7, B1, A5 } diff --git a/keyboards/mlego/m60_split/rev2/config.h b/keyboards/mlego/m60_split/rev2/config.h index ce2726e19a..9d0fdc7351 100644 --- a/keyboards/mlego/m60_split/rev2/config.h +++ b/keyboards/mlego/m60_split/rev2/config.h @@ -15,7 +15,6 @@ */ #pragma once -#include "config_common.h" #define MATRIX_ROW_PINS \ { B0, A6, A7, B1, A5 } diff --git a/keyboards/mlego/m65/config.h b/keyboards/mlego/m65/config.h index 7ac1f7271c..bffd4c1923 100644 --- a/keyboards/mlego/m65/config.h +++ b/keyboards/mlego/m65/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" #define MATRIX_ROWS 5 #define MATRIX_COLS 13 -- cgit v1.2.3 From ebb512db827e84619e7151fcf76e3daf9328fe59 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 4 Feb 2023 06:19:58 +1100 Subject: Debounce defines cleanup (#19742) * Clean up `DEBOUNCE` in config.h, 0-9 * Clean up `DEBOUNCE` in config.h, A * Clean up `DEBOUNCE` in config.h, B * Clean up `DEBOUNCE` in config.h, C * Clean up `DEBOUNCE` in config.h, D * Clean up `DEBOUNCE` in config.h, E * Clean up `DEBOUNCE` in config.h, F * Clean up `DEBOUNCE` in config.h, G * Clean up `DEBOUNCE` in config.h, H * Clean up `DEBOUNCE` in config.h, handwired * Clean up `DEBOUNCE` in config.h, I * Clean up `DEBOUNCE` in config.h, J * Clean up `DEBOUNCE` in config.h, K * Clean up `DEBOUNCE` in config.h, L * Clean up `DEBOUNCE` in config.h, M * Clean up `DEBOUNCE` in config.h, N * Clean up `DEBOUNCE` in config.h, O * Clean up `DEBOUNCE` in config.h, P * Clean up `DEBOUNCE` in config.h, Q * Clean up `DEBOUNCE` in config.h, R * Clean up `DEBOUNCE` in config.h, S * Clean up `DEBOUNCE` in config.h, T * Clean up `DEBOUNCE` in config.h, U * Clean up `DEBOUNCE` in config.h, V * Clean up `DEBOUNCE` in config.h, W * Clean up `DEBOUNCE` in config.h, X * Clean up `DEBOUNCE` in config.h, Y * Clean up `DEBOUNCE` in config.h, Z * Remove default debounce from info.json * Migrate non-default debounce to info.json --- keyboards/mlego/m48/config.h | 2 -- keyboards/mlego/m60/config.h | 2 -- keyboards/mlego/m60_split/config.h | 1 - keyboards/mlego/m65/config.h | 1 - 4 files changed, 6 deletions(-) (limited to 'keyboards/mlego') diff --git a/keyboards/mlego/m48/config.h b/keyboards/mlego/m48/config.h index ef1fb45171..a64c35392f 100644 --- a/keyboards/mlego/m48/config.h +++ b/keyboards/mlego/m48/config.h @@ -19,8 +19,6 @@ #define MATRIX_ROWS 4 // Rows are doubled-up #define MATRIX_COLS 12 -#define DEBOUNCE 5 - /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/mlego/m60/config.h b/keyboards/mlego/m60/config.h index 06b6a1f815..4e7572f361 100644 --- a/keyboards/mlego/m60/config.h +++ b/keyboards/mlego/m60/config.h @@ -22,8 +22,6 @@ /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define DEBOUNCE 5 - /* 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/config.h b/keyboards/mlego/m60_split/config.h index 38f6909cbf..93dbfb92c8 100644 --- a/keyboards/mlego/m60_split/config.h +++ b/keyboards/mlego/m60_split/config.h @@ -19,7 +19,6 @@ #define MATRIX_ROWS 10 // Rows are doubled-up #define MATRIX_COLS 6 -#define DEBOUNCE 5 /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/mlego/m65/config.h b/keyboards/mlego/m65/config.h index bffd4c1923..d98007a9cf 100644 --- a/keyboards/mlego/m65/config.h +++ b/keyboards/mlego/m65/config.h @@ -22,7 +22,6 @@ along with this program. If not, see . #define MATRIX_COLS 13 #define DIODE_DIRECTION COL2ROW -#define DEBOUNCE 5 #define LOCKING_SUPPORT_ENABLE #define LOCKING_RESYNC_ENABLE -- cgit v1.2.3 From f9aeea64c1f85d388485503e52035b5f7533ed26 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 8 Feb 2023 18:41:46 +1100 Subject: Migrate `MCU` and `BOOTLOADER` to data-driven (#19529) --- keyboards/mlego/m48/rev1/info.json | 5 ++++- keyboards/mlego/m48/rev1/rules.mk | 8 -------- keyboards/mlego/m60/rev1/info.json | 5 ++++- keyboards/mlego/m60/rev1/rules.mk | 8 -------- keyboards/mlego/m60_split/rev1/info.json | 5 ++++- keyboards/mlego/m60_split/rev1/rules.mk | 8 -------- keyboards/mlego/m60_split/rev2/info.json | 5 ++++- keyboards/mlego/m60_split/rev2/rules.mk | 7 ------- keyboards/mlego/m65/rev1/info.json | 4 +++- keyboards/mlego/m65/rev1/rules.mk | 6 ------ keyboards/mlego/m65/rev2/info.json | 4 +++- keyboards/mlego/m65/rev2/rules.mk | 6 ------ keyboards/mlego/m65/rev3/info.json | 5 ++++- keyboards/mlego/m65/rev3/rules.mk | 8 -------- keyboards/mlego/m65/rev4/info.json | 5 ++++- keyboards/mlego/m65/rev4/rules.mk | 8 -------- 16 files changed, 30 insertions(+), 67 deletions(-) (limited to 'keyboards/mlego') diff --git a/keyboards/mlego/m48/rev1/info.json b/keyboards/mlego/m48/rev1/info.json index 68c73096c4..24b283fc26 100644 --- a/keyboards/mlego/m48/rev1/info.json +++ b/keyboards/mlego/m48/rev1/info.json @@ -2,5 +2,8 @@ "usb": { "pid": "0x6261", "device_version": "0.0.1" - } + }, + "processor": "STM32F401", + "bootloader": "tinyuf2", + "board": "BLACKPILL_STM32_F401" } diff --git a/keyboards/mlego/m48/rev1/rules.mk b/keyboards/mlego/m48/rev1/rules.mk index 3a1c9a94ab..52fd5e68dc 100644 --- a/keyboards/mlego/m48/rev1/rules.mk +++ b/keyboards/mlego/m48/rev1/rules.mk @@ -1,11 +1,3 @@ -# MCU name -MCU = STM32F401 -BOARD = BLACKPILL_STM32_F401 - -# Bootloader selection -BOOTLOADER = tinyuf2 -#BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mlego/m60/rev1/info.json b/keyboards/mlego/m60/rev1/info.json index 865399a460..dc653ed762 100644 --- a/keyboards/mlego/m60/rev1/info.json +++ b/keyboards/mlego/m60/rev1/info.json @@ -2,5 +2,8 @@ "usb": { "pid": "0x6161", "device_version": "0.0.1" - } + }, + "processor": "STM32F401", + "bootloader": "tinyuf2", + "board": "BLACKPILL_STM32_F401" } diff --git a/keyboards/mlego/m60/rev1/rules.mk b/keyboards/mlego/m60/rev1/rules.mk index b3b349f6f7..a8c86807b4 100644 --- a/keyboards/mlego/m60/rev1/rules.mk +++ b/keyboards/mlego/m60/rev1/rules.mk @@ -1,11 +1,3 @@ -# MCU name -MCU = STM32F401 -BOARD = BLACKPILL_STM32_F401 - -# Bootloader selection -BOOTLOADER = tinyuf2 -#BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mlego/m60_split/rev1/info.json b/keyboards/mlego/m60_split/rev1/info.json index 90303c33c5..b1cfbd3d4b 100644 --- a/keyboards/mlego/m60_split/rev1/info.json +++ b/keyboards/mlego/m60_split/rev1/info.json @@ -2,5 +2,8 @@ "usb": { "pid": "0x6361", "device_version": "0.0.1" - } + }, + "processor": "STM32F401", + "bootloader": "tinyuf2", + "board": "BLACKPILL_STM32_F401" } diff --git a/keyboards/mlego/m60_split/rev1/rules.mk b/keyboards/mlego/m60_split/rev1/rules.mk index 6463d57d37..497e86c8cb 100644 --- a/keyboards/mlego/m60_split/rev1/rules.mk +++ b/keyboards/mlego/m60_split/rev1/rules.mk @@ -1,11 +1,3 @@ -# MCU name -MCU = STM32F401 -BOARD = BLACKPILL_STM32_F401 - -# Bootloader selection -BOOTLOADER = tinyuf2 -#BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mlego/m60_split/rev2/info.json b/keyboards/mlego/m60_split/rev2/info.json index bee03f611f..936c6fbdad 100644 --- a/keyboards/mlego/m60_split/rev2/info.json +++ b/keyboards/mlego/m60_split/rev2/info.json @@ -2,5 +2,8 @@ "usb": { "pid": "0x6362", "device_version": "0.0.1" - } + }, + "processor": "STM32F411", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F411" } diff --git a/keyboards/mlego/m60_split/rev2/rules.mk b/keyboards/mlego/m60_split/rev2/rules.mk index 72f146cc82..ac47e053a2 100644 --- a/keyboards/mlego/m60_split/rev2/rules.mk +++ b/keyboards/mlego/m60_split/rev2/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F411 -BOARD = BLACKPILL_STM32_F411 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mlego/m65/rev1/info.json b/keyboards/mlego/m65/rev1/info.json index e495c94992..553fe3b7d2 100644 --- a/keyboards/mlego/m65/rev1/info.json +++ b/keyboards/mlego/m65/rev1/info.json @@ -2,5 +2,7 @@ "usb": { "pid": "0x6061", "device_version": "0.0.1" - } + }, + "processor": "STM32F103", + "bootloader": "stm32duino" } diff --git a/keyboards/mlego/m65/rev1/rules.mk b/keyboards/mlego/m65/rev1/rules.mk index 5e456c2606..fa351eadba 100644 --- a/keyboards/mlego/m65/rev1/rules.mk +++ b/keyboards/mlego/m65/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F103 - -# Bootloader selection -BOOTLOADER = stm32duino - # Build Options # change yes to no to disable # diff --git a/keyboards/mlego/m65/rev2/info.json b/keyboards/mlego/m65/rev2/info.json index 470262ed85..3e6ef2d0bc 100644 --- a/keyboards/mlego/m65/rev2/info.json +++ b/keyboards/mlego/m65/rev2/info.json @@ -2,5 +2,7 @@ "usb": { "pid": "0x6061", "device_version": "0.0.2" - } + }, + "processor": "STM32F103", // GD32F303CCT6 + "bootloader": "stm32duino" } diff --git a/keyboards/mlego/m65/rev2/rules.mk b/keyboards/mlego/m65/rev2/rules.mk index 1b7c586b71..51070f9718 100644 --- a/keyboards/mlego/m65/rev2/rules.mk +++ b/keyboards/mlego/m65/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F103 #GD32F303CCT6 weact - -# Bootloader selection -BOOTLOADER = stm32duino - # Build Options # change yes to no to disable # diff --git a/keyboards/mlego/m65/rev3/info.json b/keyboards/mlego/m65/rev3/info.json index e42ab50857..cf330be7c9 100644 --- a/keyboards/mlego/m65/rev3/info.json +++ b/keyboards/mlego/m65/rev3/info.json @@ -2,5 +2,8 @@ "usb": { "pid": "0x6062", "device_version": "0.0.1" - } + }, + "processor": "STM32F401", + "bootloader": "tinyuf2", + "board": "BLACKPILL_STM32_F401" } diff --git a/keyboards/mlego/m65/rev3/rules.mk b/keyboards/mlego/m65/rev3/rules.mk index 57908335fd..fa351eadba 100644 --- a/keyboards/mlego/m65/rev3/rules.mk +++ b/keyboards/mlego/m65/rev3/rules.mk @@ -1,11 +1,3 @@ -# MCU name -MCU = STM32F401 -BOARD = BLACKPILL_STM32_F401 - -# Bootloader selection -BOOTLOADER = tinyuf2 -#BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mlego/m65/rev4/info.json b/keyboards/mlego/m65/rev4/info.json index c94ea38e22..dee2b86933 100644 --- a/keyboards/mlego/m65/rev4/info.json +++ b/keyboards/mlego/m65/rev4/info.json @@ -2,5 +2,8 @@ "usb": { "pid": "0x6062", "device_version": "0.0.2" - } + }, + "processor": "STM32F401", + "bootloader": "tinyuf2", + "board": "BLACKPILL_STM32_F401" } diff --git a/keyboards/mlego/m65/rev4/rules.mk b/keyboards/mlego/m65/rev4/rules.mk index a16dbefe32..bf9405e1d1 100644 --- a/keyboards/mlego/m65/rev4/rules.mk +++ b/keyboards/mlego/m65/rev4/rules.mk @@ -1,11 +1,3 @@ -# MCU name -MCU = STM32F401 -BOARD = BLACKPILL_STM32_F401 - -# Bootloader selection -BOOTLOADER = tinyuf2 -#BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # -- cgit v1.2.3 From d784f78bd0a034c1d6085379615014fd701536ab Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Feb 2023 08:49:49 +1100 Subject: Move Bootmagic config to data driven (#19860) --- keyboards/mlego/m60_split/rev1/config.h | 6 ------ keyboards/mlego/m60_split/rev1/info.json | 5 +++++ keyboards/mlego/m60_split/rev2/config.h | 7 ------- keyboards/mlego/m60_split/rev2/info.json | 5 +++++ 4 files changed, 10 insertions(+), 13 deletions(-) (limited to 'keyboards/mlego') diff --git a/keyboards/mlego/m60_split/rev1/config.h b/keyboards/mlego/m60_split/rev1/config.h index 89266fd0b8..5e376563fc 100644 --- a/keyboards/mlego/m60_split/rev1/config.h +++ b/keyboards/mlego/m60_split/rev1/config.h @@ -70,10 +70,4 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE - -/* Bootmagic Lite key configuration */ -#define BOOTMAGIC_LITE_ROW 0 -#define BOOTMAGIC_LITE_COLUMN 0 -#define BOOTMAGIC_LITE_ROW_RIGHT 5 -#define BOOTMAGIC_LITE_COLUMN_RIGHT 0 #endif diff --git a/keyboards/mlego/m60_split/rev1/info.json b/keyboards/mlego/m60_split/rev1/info.json index b1cfbd3d4b..e306bb804f 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" }, + "split": { + "bootmagic": { + "matrix": [5, 0] + } + }, "processor": "STM32F401", "bootloader": "tinyuf2", "board": "BLACKPILL_STM32_F401" diff --git a/keyboards/mlego/m60_split/rev2/config.h b/keyboards/mlego/m60_split/rev2/config.h index 9d0fdc7351..524bb9daa1 100644 --- a/keyboards/mlego/m60_split/rev2/config.h +++ b/keyboards/mlego/m60_split/rev2/config.h @@ -69,10 +69,3 @@ #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE #endif - -/* Bootmagic Lite key configuration */ -#define BOOTMAGIC_LITE_ROW 0 -#define BOOTMAGIC_LITE_COLUMN 0 -#define BOOTMAGIC_LITE_ROW_RIGHT 5 -#define BOOTMAGIC_LITE_COLUMN_RIGHT 0 - diff --git a/keyboards/mlego/m60_split/rev2/info.json b/keyboards/mlego/m60_split/rev2/info.json index 936c6fbdad..f51c758847 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" }, + "split": { + "bootmagic": { + "matrix": [5, 0] + } + }, "processor": "STM32F411", "bootloader": "stm32-dfu", "board": "BLACKPILL_STM32_F411" -- cgit v1.2.3 From f4ba17c4a0ee59603c167b04f2d6f6eee8b2cf1b Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Feb 2023 13:14:29 +1100 Subject: Move LED indicator config to data driven (#19800) --- keyboards/mlego/m48/rev1/config.h | 4 ---- keyboards/mlego/m48/rev1/info.json | 5 +++++ keyboards/mlego/m60/rev1/config.h | 5 ----- keyboards/mlego/m60/rev1/info.json | 5 +++++ keyboards/mlego/m60_split/rev1/config.h | 4 ---- keyboards/mlego/m60_split/rev1/info.json | 5 +++++ keyboards/mlego/m60_split/rev2/config.h | 3 --- keyboards/mlego/m60_split/rev2/info.json | 5 +++++ keyboards/mlego/m65/rev1/config.h | 4 ---- keyboards/mlego/m65/rev1/info.json | 5 +++++ keyboards/mlego/m65/rev2/config.h | 4 ---- keyboards/mlego/m65/rev2/info.json | 5 +++++ keyboards/mlego/m65/rev3/config.h | 4 ---- keyboards/mlego/m65/rev3/info.json | 5 +++++ keyboards/mlego/m65/rev4/config.h | 4 ---- keyboards/mlego/m65/rev4/info.json | 5 +++++ 16 files changed, 40 insertions(+), 32 deletions(-) (limited to 'keyboards/mlego') diff --git a/keyboards/mlego/m48/rev1/config.h b/keyboards/mlego/m48/rev1/config.h index d443d9b110..ab6ad48938 100644 --- a/keyboards/mlego/m48/rev1/config.h +++ b/keyboards/mlego/m48/rev1/config.h @@ -29,10 +29,6 @@ #define ENCODER_RESOLUTION 4 #endif -#define LED_NUM_LOCK_PIN B12 -#define LED_SCROLL_LOCK_PIN B13 -#define LED_CAPS_LOCK_PIN C13 - #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 24b283fc26..83eda36107 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" }, + "indicators": { + "caps_lock": "C13", + "num_lock": "B12", + "scroll_lock": "B13" + }, "processor": "STM32F401", "bootloader": "tinyuf2", "board": "BLACKPILL_STM32_F401" diff --git a/keyboards/mlego/m60/rev1/config.h b/keyboards/mlego/m60/rev1/config.h index 0d504568cb..5931171440 100644 --- a/keyboards/mlego/m60/rev1/config.h +++ b/keyboards/mlego/m60/rev1/config.h @@ -15,11 +15,6 @@ */ #pragma once - -#define LED_NUM_LOCK_PIN B12 -#define LED_SCROLL_LOCK_PIN B13 -#define LED_CAPS_LOCK_PIN C13 - #ifdef ENCODER_ENABLE #define MATRIX_ROW_PINS \ { A6, A7, B0, B1, B10 } diff --git a/keyboards/mlego/m60/rev1/info.json b/keyboards/mlego/m60/rev1/info.json index dc653ed762..9363527fe9 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" }, + "indicators": { + "caps_lock": "C13", + "num_lock": "B12", + "scroll_lock": "B13" + }, "processor": "STM32F401", "bootloader": "tinyuf2", "board": "BLACKPILL_STM32_F401" diff --git a/keyboards/mlego/m60_split/rev1/config.h b/keyboards/mlego/m60_split/rev1/config.h index 5e376563fc..adb8bd0783 100644 --- a/keyboards/mlego/m60_split/rev1/config.h +++ b/keyboards/mlego/m60_split/rev1/config.h @@ -36,10 +36,6 @@ { 4 } #endif -#define LED_NUM_LOCK_PIN B12 -#define LED_SCROLL_LOCK_PIN B13 -#define LED_CAPS_LOCK_PIN C13 - #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 e306bb804f..fc9a608c9e 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" }, + "indicators": { + "caps_lock": "C13", + "num_lock": "B12", + "scroll_lock": "B13" + }, "split": { "bootmagic": { "matrix": [5, 0] diff --git a/keyboards/mlego/m60_split/rev2/config.h b/keyboards/mlego/m60_split/rev2/config.h index 524bb9daa1..e5ebf93438 100644 --- a/keyboards/mlego/m60_split/rev2/config.h +++ b/keyboards/mlego/m60_split/rev2/config.h @@ -38,9 +38,6 @@ #endif -#define LED_NUM_LOCK_PIN B12 -#define LED_SCROLL_LOCK_PIN B13 -#define LED_CAPS_LOCK_PIN C13 #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 f51c758847..b2b49279c1 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" }, + "indicators": { + "caps_lock": "C13", + "num_lock": "B12", + "scroll_lock": "B13" + }, "split": { "bootmagic": { "matrix": [5, 0] diff --git a/keyboards/mlego/m65/rev1/config.h b/keyboards/mlego/m65/rev1/config.h index d296bf9954..ac1f935350 100644 --- a/keyboards/mlego/m65/rev1/config.h +++ b/keyboards/mlego/m65/rev1/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define LED_NUM_LOCK_PIN B12 -#define LED_SCROLL_LOCK_PIN B13 -#define LED_CAPS_LOCK_PIN C13 - // 0 1 2 3 4 #define MATRIX_ROW_PINS \ { B11, B0, B1, A2, A3 } diff --git a/keyboards/mlego/m65/rev1/info.json b/keyboards/mlego/m65/rev1/info.json index 553fe3b7d2..9635b31e59 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" }, + "indicators": { + "caps_lock": "C13", + "num_lock": "B12", + "scroll_lock": "B13" + }, "processor": "STM32F103", "bootloader": "stm32duino" } diff --git a/keyboards/mlego/m65/rev2/config.h b/keyboards/mlego/m65/rev2/config.h index d5575d24a9..3c2e877550 100644 --- a/keyboards/mlego/m65/rev2/config.h +++ b/keyboards/mlego/m65/rev2/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define LED_NUM_LOCK_PIN B12 -#define LED_SCROLL_LOCK_PIN B13 -#define LED_CAPS_LOCK_PIN B2 - // 0 1 2 3 4 #define MATRIX_ROW_PINS \ { B11, B0, B1, A2, A3 } diff --git a/keyboards/mlego/m65/rev2/info.json b/keyboards/mlego/m65/rev2/info.json index 3e6ef2d0bc..2bde6bdef1 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" }, + "indicators": { + "caps_lock": "B2", + "num_lock": "B12", + "scroll_lock": "B13" + }, "processor": "STM32F103", // GD32F303CCT6 "bootloader": "stm32duino" } diff --git a/keyboards/mlego/m65/rev3/config.h b/keyboards/mlego/m65/rev3/config.h index e58a84f3d8..abeaeffc88 100644 --- a/keyboards/mlego/m65/rev3/config.h +++ b/keyboards/mlego/m65/rev3/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define LED_NUM_LOCK_PIN B12 -#define LED_SCROLL_LOCK_PIN B13 -#define LED_CAPS_LOCK_PIN C13 - // 0 1 2 3 4 #define MATRIX_ROW_PINS \ { B10, A5, A6, A7, B0 } diff --git a/keyboards/mlego/m65/rev3/info.json b/keyboards/mlego/m65/rev3/info.json index cf330be7c9..8240ae7ace 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" }, + "indicators": { + "caps_lock": "C13", + "num_lock": "B12", + "scroll_lock": "B13" + }, "processor": "STM32F401", "bootloader": "tinyuf2", "board": "BLACKPILL_STM32_F401" diff --git a/keyboards/mlego/m65/rev4/config.h b/keyboards/mlego/m65/rev4/config.h index afd8c86bcc..c2bd69f363 100644 --- a/keyboards/mlego/m65/rev4/config.h +++ b/keyboards/mlego/m65/rev4/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define LED_NUM_LOCK_PIN B12 -#define LED_SCROLL_LOCK_PIN B13 -#define LED_CAPS_LOCK_PIN C13 - // 0 1 2 3 4 #define MATRIX_ROW_PINS \ { B10, A5, A6, A7, B0 } diff --git a/keyboards/mlego/m65/rev4/info.json b/keyboards/mlego/m65/rev4/info.json index dee2b86933..465b61f2aa 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" }, + "indicators": { + "caps_lock": "C13", + "num_lock": "B12", + "scroll_lock": "B13" + }, "processor": "STM32F401", "bootloader": "tinyuf2", "board": "BLACKPILL_STM32_F401" -- cgit v1.2.3 From 2da0827d4ffbcba161126d6001f370e97d0172a8 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Feb 2023 16:08:25 +1100 Subject: Remove matrix size defines (#19581) --- keyboards/mlego/m48/config.h | 4 ---- keyboards/mlego/m60/config.h | 3 --- keyboards/mlego/m60_split/config.h | 4 ---- keyboards/mlego/m65/config.h | 3 --- 4 files changed, 14 deletions(-) (limited to 'keyboards/mlego') diff --git a/keyboards/mlego/m48/config.h b/keyboards/mlego/m48/config.h index a64c35392f..8daaa6e9f8 100644 --- a/keyboards/mlego/m48/config.h +++ b/keyboards/mlego/m48/config.h @@ -15,10 +15,6 @@ */ #pragma once - -#define MATRIX_ROWS 4 // Rows are doubled-up -#define MATRIX_COLS 12 - /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/mlego/m60/config.h b/keyboards/mlego/m60/config.h index 4e7572f361..82e327451d 100644 --- a/keyboards/mlego/m60/config.h +++ b/keyboards/mlego/m60/config.h @@ -16,9 +16,6 @@ #pragma once -#define MATRIX_ROWS 5 -#define MATRIX_COLS 12 - /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/mlego/m60_split/config.h b/keyboards/mlego/m60_split/config.h index 93dbfb92c8..8daaa6e9f8 100644 --- a/keyboards/mlego/m60_split/config.h +++ b/keyboards/mlego/m60_split/config.h @@ -15,10 +15,6 @@ */ #pragma once - -#define MATRIX_ROWS 10 // Rows are doubled-up -#define MATRIX_COLS 6 - /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/mlego/m65/config.h b/keyboards/mlego/m65/config.h index d98007a9cf..3810f998d2 100644 --- a/keyboards/mlego/m65/config.h +++ b/keyboards/mlego/m65/config.h @@ -18,9 +18,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_ROWS 5 -#define MATRIX_COLS 13 - #define DIODE_DIRECTION COL2ROW #define LOCKING_SUPPORT_ENABLE -- cgit v1.2.3 From 7e0299117b389b1c7fcdfa2f20891ba2287ea771 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 26 Feb 2023 09:45:12 +1100 Subject: Move encoder config to data driven (#19923) Co-authored-by: Nick Brassel --- keyboards/mlego/m48/rev1/config.h | 8 -------- keyboards/mlego/m48/rev1/info.json | 5 +++++ keyboards/mlego/m60/rev1/config.h | 8 -------- keyboards/mlego/m60/rev1/info.json | 5 +++++ keyboards/mlego/m60_split/rev1/config.h | 9 --------- keyboards/mlego/m60_split/rev1/info.json | 5 +++++ keyboards/mlego/m60_split/rev2/config.h | 11 ----------- keyboards/mlego/m60_split/rev2/info.json | 5 +++++ keyboards/mlego/m65/rev1/config.h | 7 ------- keyboards/mlego/m65/rev1/info.json | 5 +++++ keyboards/mlego/m65/rev2/config.h | 7 ------- keyboards/mlego/m65/rev2/info.json | 5 +++++ keyboards/mlego/m65/rev3/config.h | 8 -------- keyboards/mlego/m65/rev3/info.json | 5 +++++ keyboards/mlego/m65/rev4/config.h | 8 -------- keyboards/mlego/m65/rev4/info.json | 5 +++++ 16 files changed, 40 insertions(+), 66 deletions(-) (limited to 'keyboards/mlego') diff --git a/keyboards/mlego/m48/rev1/config.h b/keyboards/mlego/m48/rev1/config.h index ab6ad48938..04c1bb4509 100644 --- a/keyboards/mlego/m48/rev1/config.h +++ b/keyboards/mlego/m48/rev1/config.h @@ -21,14 +21,6 @@ #define MATRIX_COL_PINS \ { A10, A15, B3, B4, B5, B7, B6, A1, A2, A3, A4, A5 } -#ifdef ENCODER_ENABLE -#define ENCODERS_PAD_A \ - { A0 } -#define ENCODERS_PAD_B \ - { B8 } -#define ENCODER_RESOLUTION 4 -#endif - #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 83eda36107..ecfa4dc940 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" }, + "encoder": { + "rotary": [ + {"pin_a": "A0", "pin_b": "B8"} + ] + }, "indicators": { "caps_lock": "C13", "num_lock": "B12", diff --git a/keyboards/mlego/m60/rev1/config.h b/keyboards/mlego/m60/rev1/config.h index 5931171440..7805e6e82b 100644 --- a/keyboards/mlego/m60/rev1/config.h +++ b/keyboards/mlego/m60/rev1/config.h @@ -15,19 +15,11 @@ */ #pragma once -#ifdef ENCODER_ENABLE #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 } -#define ENCODERS_PAD_A \ - { A0 } -#define ENCODERS_PAD_B \ - { B8 } - -#endif - #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 9363527fe9..e9e03cb189 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" }, + "encoder": { + "rotary": [ + {"pin_a": "A0", "pin_b": "B8"} + ] + }, "indicators": { "caps_lock": "C13", "num_lock": "B12", diff --git a/keyboards/mlego/m60_split/rev1/config.h b/keyboards/mlego/m60_split/rev1/config.h index adb8bd0783..a835d8c4f3 100644 --- a/keyboards/mlego/m60_split/rev1/config.h +++ b/keyboards/mlego/m60_split/rev1/config.h @@ -27,15 +27,6 @@ #define MATRIX_COL_PINS_RIGHT \ { B0, A3, A2, A1, B7, B5 } // cols are from right to left to match the layout -#ifdef ENCODER_ENABLE -#define ENCODERS_PAD_A \ - { A0 } -#define ENCODERS_PAD_B \ - { B8 } -#define ENCODER_RESOLUTIONS \ - { 4 } -#endif - #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 fc9a608c9e..237b933eb0 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" }, + "encoder": { + "rotary": [ + {"pin_a": "A0", "pin_b": "B8"} + ] + }, "indicators": { "caps_lock": "C13", "num_lock": "B12", diff --git a/keyboards/mlego/m60_split/rev2/config.h b/keyboards/mlego/m60_split/rev2/config.h index e5ebf93438..2bb9334497 100644 --- a/keyboards/mlego/m60_split/rev2/config.h +++ b/keyboards/mlego/m60_split/rev2/config.h @@ -27,17 +27,6 @@ #define MATRIX_COL_PINS_RIGHT \ { B0, A3, A2, A1, B7, B5 } // cols are from right to left to match the layout - -#ifdef ENCODER_ENABLE -#define ENCODERS_PAD_A \ - { A0 } -#define ENCODERS_PAD_B \ - { B8 } -#define ENCODER_RESOLUTIONS \ - { 4 } - -#endif - #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 b2b49279c1..4e281733e1 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" }, + "encoder": { + "rotary": [ + {"pin_a": "A0", "pin_b": "B8"} + ] + }, "indicators": { "caps_lock": "C13", "num_lock": "B12", diff --git a/keyboards/mlego/m65/rev1/config.h b/keyboards/mlego/m65/rev1/config.h index ac1f935350..d58ee7627f 100644 --- a/keyboards/mlego/m65/rev1/config.h +++ b/keyboards/mlego/m65/rev1/config.h @@ -24,17 +24,10 @@ along with this program. If not, see . #define MATRIX_COL_PINS \ { A10, A15, B3, B4, B5, B9, B8, B7, B6, C15, A0, A7, B10 } -#define ENCODERS_PAD_A \ - { A8 } -#define ENCODERS_PAD_B \ - { A9 } - #define RGB_DI_PIN B15 #define RGBLIGHT_LAYERS -#define ENCODER_RESOLUTION 4 - #undef RGBLED_NUM #define RGBLED_NUM 20 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/mlego/m65/rev1/info.json b/keyboards/mlego/m65/rev1/info.json index 9635b31e59..f4d8ba7578 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" }, + "encoder": { + "rotary": [ + {"pin_a": "A8", "pin_b": "A9"} + ] + }, "indicators": { "caps_lock": "C13", "num_lock": "B12", diff --git a/keyboards/mlego/m65/rev2/config.h b/keyboards/mlego/m65/rev2/config.h index 3c2e877550..8094879b1c 100644 --- a/keyboards/mlego/m65/rev2/config.h +++ b/keyboards/mlego/m65/rev2/config.h @@ -24,17 +24,10 @@ along with this program. If not, see . #define MATRIX_COL_PINS \ { A10, A15, B3, B4, B5, B9, B8, B7, B6, C15, A0, A7, B10 } -#define ENCODERS_PAD_A \ - { A8 } -#define ENCODERS_PAD_B \ - { A9 } - #define RGB_DI_PIN B15 #define RGBLIGHT_LAYERS -#define ENCODER_RESOLUTION 4 - #undef RGBLED_NUM #define RGBLED_NUM 20 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/mlego/m65/rev2/info.json b/keyboards/mlego/m65/rev2/info.json index 2bde6bdef1..7d265197ca 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" }, + "encoder": { + "rotary": [ + {"pin_a": "A8", "pin_b": "A9"} + ] + }, "indicators": { "caps_lock": "B2", "num_lock": "B12", diff --git a/keyboards/mlego/m65/rev3/config.h b/keyboards/mlego/m65/rev3/config.h index abeaeffc88..4a71449cb0 100644 --- a/keyboards/mlego/m65/rev3/config.h +++ b/keyboards/mlego/m65/rev3/config.h @@ -24,14 +24,6 @@ along with this program. If not, see . #define MATRIX_COL_PINS \ { A10, A15, B3, B4, B5, B9, B8, B7, A1, A2, A3, A4, B1 } -#ifdef ENCODER_ENABLE -#define ENCODERS_PAD_A \ - { A0 } -#define ENCODERS_PAD_B \ - { B6 } -#define ENCODER_RESOLUTION 4 -#endif - #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 8240ae7ace..39c26191c6 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" }, + "encoder": { + "rotary": [ + {"pin_a": "A0", "pin_b": "B6"} + ] + }, "indicators": { "caps_lock": "C13", "num_lock": "B12", diff --git a/keyboards/mlego/m65/rev4/config.h b/keyboards/mlego/m65/rev4/config.h index c2bd69f363..a8b9b596d5 100644 --- a/keyboards/mlego/m65/rev4/config.h +++ b/keyboards/mlego/m65/rev4/config.h @@ -24,14 +24,6 @@ along with this program. If not, see . #define MATRIX_COL_PINS \ { B14, A8, A10, A15, B3, B4, B5, B7, A1, A2, A3, A4, B1 } -#ifdef ENCODER_ENABLE -#define ENCODERS_PAD_A \ - { A0 } -#define ENCODERS_PAD_B \ - { B6 } -#define ENCODER_RESOLUTION 4 -#endif - #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 465b61f2aa..91af43a6a1 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" }, + "encoder": { + "rotary": [ + {"pin_a": "A0", "pin_b": "B6"} + ] + }, "indicators": { "caps_lock": "C13", "num_lock": "B12", -- cgit v1.2.3