From 51cfb1b45780c8ee42d993814aeef1f45477d58d Mon Sep 17 00:00:00 2001 From: Alin Marin Elena Date: Sat, 11 Jun 2022 19:18:45 +0100 Subject: [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 * Update keyboards/mlego/m65/m65.c Co-authored-by: Drashna Jaelre * 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 * 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 Co-authored-by: Ryan --- keyboards/mlego/m65/rev3/config.h | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'keyboards/mlego/m65/rev3/config.h') diff --git a/keyboards/mlego/m65/rev3/config.h b/keyboards/mlego/m65/rev3/config.h index 97992ee844..a4b1ba3343 100644 --- a/keyboards/mlego/m65/rev3/config.h +++ b/keyboards/mlego/m65/rev3/config.h @@ -17,8 +17,8 @@ along with this program. If not, see . #pragma once -#define DEVICE_VER 0x0003 -#define PRODUCT_ID 0x6060 +#define DEVICE_VER 0x0001 +#define PRODUCT_ID 0x6062 #define LED_NUM_LOCK_PIN B12 #define LED_SCROLL_LOCK_PIN B13 @@ -31,18 +31,18 @@ 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 -#define RGB_DI_PIN B15 +#ifdef RGBLIGHT_ENABLE -#define UNUSED_PINS +#define RGB_DI_PIN B15 #define RGBLIGHT_LAYERS - -#define ENCODER_RESOLUTION 4 - #undef RGBLED_NUM #define RGBLED_NUM 20 #define RGBLIGHT_EFFECT_BREATHING @@ -57,3 +57,8 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_TWINKLE #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 +#endif + +#define UNUSED_PINS +// you want to comment this if using stm32-dfu as bootloader +#define FEE_PAGE_BASE_ADDRESS 0x08008000 -- cgit v1.2.3