Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'origin/master' into develop

Browse source
This commit is contained in:
QMK Bot 2021-04-25 04:00:00 +00:00
commit ee26e3df60
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
users/ninjonas/oled.c
View file

@ -5,10 +5,10 @@
#if defined(OLED_DRIVER_ENABLE) & !defined(KEYBOARD_kyria_rev1) #if defined(OLED_DRIVER_ENABLE) & !defined(KEYBOARD_kyria_rev1)
static uint32_t oled_timer = 0; static uint32_t oled_timer = 0;
extern uint8_t is_master;
oled_rotation_t oled_init_user(oled_rotation_t rotation) { oled_rotation_t oled_init_user(oled_rotation_t rotation) {
if (is_master) { if (is_keyboard_master()) {
return OLED_ROTATION_0; return OLED_ROTATION_0;
} }
return OLED_ROTATION_180; return OLED_ROTATION_180;
@ -99,7 +99,7 @@ void oled_task_user(void) {
else { oled_on(); } else { oled_on(); }
#endif #endif
if (is_master) { if (is_keyboard_master()) {
render_status(); render_status();
} else { } else {
render_logo(); render_logo();
@ -108,4 +108,4 @@ void oled_task_user(void) {
} }
} }
#endif #endif