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/m65.h | 43 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 39 insertions(+), 4 deletions(-) (limited to 'keyboards/mlego/m65/m65.h') diff --git a/keyboards/mlego/m65/m65.h b/keyboards/mlego/m65/m65.h index f5ffd519fa..9564b3d529 100644 --- a/keyboards/mlego/m65/m65.h +++ b/keyboards/mlego/m65/m65.h @@ -108,8 +108,44 @@ enum unicode_names { rS, rt, rT, + ro, + rO, + ra2, + rA2, + ra3, + rA3 }; + +enum layer_names { + _QW = 0, + _LWR, + _RSE, + _ADJ +}; + +#ifdef OLED_ENABLE +void user_oled_magic(void); +void render_logo(void); +void clear_screen(void); +void init_timer(void); +#endif + +#ifdef ENCODER_ENABLE +void my_encoders(const uint8_t, const bool); +bool encoder_update_user(uint8_t, bool); +#endif + +#ifdef RGBLIGHT_ENABLE +void set_rgb_layers(layer_state_t); +const rgblight_segment_t * const* my_rgb(void); +void set_default_rgb_layers(layer_state_t); +#endif + + +void toggle_leds(void); +void set_led_toggle(const uint8_t, const bool); + static inline void led_lwr(const bool on) { #ifdef LED_NUM_LOCK_PIN writePin(LED_NUM_LOCK_PIN, on); @@ -123,11 +159,10 @@ static inline void led_rse(const bool on) { } static inline void led_caps(const bool on) { #ifdef LED_CAPS_LOCK_PIN - if ((DEVICE_VER == 0x0001) || (DEVICE_VER == 0x0003) || (DEVICE_VER == 0x0004)) { - writePin(LED_CAPS_LOCK_PIN, !on); - } - if (DEVICE_VER == 0x0002) { + if ((PRODUCT_ID == 0x6061) && (DEVICE_VER == 0x0002)) { writePin(LED_CAPS_LOCK_PIN, on); + } else { + writePin(LED_CAPS_LOCK_PIN, !on); } #endif } -- cgit v1.2.1