diff options
Diffstat (limited to 'keyboards/mlego/m60_split')
-rw-r--r-- | keyboards/mlego/m60_split/config.h | 2 | ||||
-rw-r--r-- | keyboards/mlego/m60_split/info.json | 1 | ||||
-rw-r--r-- | keyboards/mlego/m60_split/rev1/config.h | 1 | ||||
-rw-r--r-- | keyboards/mlego/m60_split/rev1/info.json | 5 | ||||
-rw-r--r-- | keyboards/mlego/m60_split/rev1/rules.mk | 10 | ||||
-rw-r--r-- | keyboards/mlego/m60_split/rev2/config.h | 1 | ||||
-rw-r--r-- | keyboards/mlego/m60_split/rev2/info.json | 5 | ||||
-rw-r--r-- | keyboards/mlego/m60_split/rev2/rules.mk | 9 |
8 files changed, 9 insertions, 25 deletions
diff --git a/keyboards/mlego/m60_split/config.h b/keyboards/mlego/m60_split/config.h index 241ea77a22..93dbfb92c8 100644 --- a/keyboards/mlego/m60_split/config.h +++ b/keyboards/mlego/m60_split/config.h @@ -15,12 +15,10 @@ */ #pragma once -#include "config_common.h" #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/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/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/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 076a334510..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 # @@ -22,5 +14,3 @@ SPLIT_KEYBOARD = yes SERIAL_DRIVER = usart ENCODER_ENABLE = yes # Enable encoder -LAYOUTS = ortho_5x12 - 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/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 c10aed3e16..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 # @@ -20,5 +13,3 @@ AUDIO_ENABLE = no # Audio output SPLIT_KEYBOARD = yes SERIAL_DRIVER = usart ENCODER_ENABLE = yes # Enable encoder - -LAYOUTS = ortho_5x12 |