diff options
| author | Nick Brassel <nick@tzarc.org> | 2023-02-28 11:22:29 +1100 |
|---|---|---|
| committer | Nick Brassel <nick@tzarc.org> | 2023-02-28 11:22:29 +1100 |
| commit | bacec14073b2e897d5a52caf12de5a6a1f7b4078 (patch) | |
| tree | d4e3e57aac1a829a191831efd2e62c8a43217885 /keyboards/mlego/m65/rev2 | |
| parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
| parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) | |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/mlego/m65/rev2')
| -rw-r--r-- | keyboards/mlego/m65/rev2/config.h | 11 | ||||
| -rw-r--r-- | keyboards/mlego/m65/rev2/info.json | 14 | ||||
| -rw-r--r-- | keyboards/mlego/m65/rev2/rules.mk | 6 |
3 files changed, 13 insertions, 18 deletions
diff --git a/keyboards/mlego/m65/rev2/config.h b/keyboards/mlego/m65/rev2/config.h index d5575d24a9..8094879b1c 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 <http://www.gnu.org/licenses/>. #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 } @@ -28,17 +24,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 470262ed85..7d265197ca 100644 --- a/keyboards/mlego/m65/rev2/info.json +++ b/keyboards/mlego/m65/rev2/info.json @@ -2,5 +2,17 @@ "usb": { "pid": "0x6061", "device_version": "0.0.2" - } + }, + "encoder": { + "rotary": [ + {"pin_a": "A8", "pin_b": "A9"} + ] + }, + "indicators": { + "caps_lock": "B2", + "num_lock": "B12", + "scroll_lock": "B13" + }, + "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 # |