diff options
| author | Alin Marin Elena <alin@elena.space> | 2022-06-11 19:18:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-11 11:18:45 -0700 |
| commit | 51cfb1b45780c8ee42d993814aeef1f45477d58d (patch) | |
| tree | 9f94cb8ebfc0b7f9f6bf9f4758cfa1903ff708c5 /keyboards/mlego/m60_split/rev2 | |
| parent | dbd4ac5a3fb02f274024f5d7f9c2ec62626e94ad (diff) | |
[Keyboard] mlego fix product id and sync oled code (#16237)
* sync oled code over the keymaps
* put different product ids
* put different product ids for the rest
* put different product ids for the rest
* try to reduce code duplication
* make ifdefs nice and correct
* move the leds code out of keymap
* try to reduce code duplication
* move the rgb code outside the keymaps for reuse
* Update keyboards/mlego/m65/m65.c
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/mlego/m65/m65.c
Co-authored-by: Drashna Jaelre <drashna@live.com>
* move more code outside keymaps for reuse
* add few more xps
* add mic mute
* update to new name of macros for reset
* style for matrix
* clean split
* use tinyuf2 as bootloader
* Update keyboards/mlego/m65/rev4/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
* radionalise product id and device version
* add tinyuf2 as default bootloader for stm32f4
* update tinyuf2
* update tinyuf2 and via. f411 remove tinyuf2 since is not really working. make the config more conditional
* sync the keymap with default
* revert via non building with gcc 11
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Diffstat (limited to 'keyboards/mlego/m60_split/rev2')
| -rw-r--r-- | keyboards/mlego/m60_split/rev2/config.h | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/keyboards/mlego/m60_split/rev2/config.h b/keyboards/mlego/m60_split/rev2/config.h index 1e45e86d06..c5b011c437 100644 --- a/keyboards/mlego/m60_split/rev2/config.h +++ b/keyboards/mlego/m60_split/rev2/config.h @@ -18,7 +18,7 @@ #include "config_common.h" /* USB Device descriptor parameter */ -#define PRODUCT_ID 0x0001 +#define PRODUCT_ID 0x6362 #define DEVICE_VER 0x0001 #define MATRIX_ROW_PINS \ @@ -32,6 +32,8 @@ #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 \ @@ -39,28 +41,25 @@ #define ENCODER_RESOLUTIONS \ { 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 -#define RGB_DI_PIN B15 #define SPLIT_HAND_PIN B9 #define SERIAL_USART_TX_PIN B6 -#define RGBLIGHT_SPLIT -#define UNUSED_PINS #define SERIAL_USART_SPEED 921600 -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - -#define MATRIX_IO_DELAY 5 +#ifdef RGBLIGHT_ENABLE +#define RGB_DI_PIN B15 +#define RGBLIGHT_SPLIT #define RGBLIGHT_LAYERS - #define RGBLED_NUM 16 #define RGBLED_SPLIT \ { 8, 8 } @@ -74,9 +73,12 @@ #define RGBLIGHT_EFFECT_RGB_TEST #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 + +#define UNUSED_PINS |