summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-04-25 04:00:00 +0000
committerQMK Bot <hello@qmk.fm>2021-04-25 04:00:00 +0000
commitee26e3df60fb66462a2792881cb2da7636d3ae38 (patch)
tree2e3c81701185795e671f1cd998ce20dfae38562f
parentab6d07b585b229414de606de752ccce39f5fb8d5 (diff)
parent5b394e82c9da068dfed83ea6bdc40ba5182d7419 (diff)
downloadqmk_firmware-ee26e3df60fb66462a2792881cb2da7636d3ae38.tar.gz
qmk_firmware-ee26e3df60fb66462a2792881cb2da7636d3ae38.zip
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--users/ninjonas/oled.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/users/ninjonas/oled.c b/users/ninjonas/oled.c
index ffb9eecbcb..a3514f54f6 100644
--- a/users/ninjonas/oled.c
+++ b/users/ninjonas/oled.c
@@ -5,10 +5,10 @@
#if defined(OLED_DRIVER_ENABLE) & !defined(KEYBOARD_kyria_rev1)
static uint32_t oled_timer = 0;
-extern uint8_t is_master;
+
oled_rotation_t oled_init_user(oled_rotation_t rotation) {
- if (is_master) {
+ if (is_keyboard_master()) {
return OLED_ROTATION_0;
}
return OLED_ROTATION_180;
@@ -99,7 +99,7 @@ void oled_task_user(void) {
else { oled_on(); }
#endif
- if (is_master) {
+ if (is_keyboard_master()) {
render_status();
} else {
render_logo();
@@ -108,4 +108,4 @@ void oled_task_user(void) {
}
}
-#endif \ No newline at end of file
+#endif