drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

[Keyboard] mlego fix product id and sync oled code (#16237)

Browse source 
* 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>
This commit is contained in:
Alin Marin Elena 2022-06-11 19:18:45 +01:00 • committed by GitHub
parent dbd4ac5a3f
commit 51cfb1b457
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
33 changed files with 913 additions and 528 deletions
Download patch file Download diff file Expand all files Collapse all files

43
keyboards/mlego/m65/m65.h
View file

@ -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
}