From cfe44021e7447adb15b8621b8fa5f59cde86b277 Mon Sep 17 00:00:00 2001 From: Drashna Jael're Date: Sat, 27 Feb 2021 12:16:06 -0800 Subject: [PATCH 1/2] [Keyboard] Allow custom OLED on Helix Rev3 --- keyboards/helix/rev3_4rows/oled_display.c | 2 +- keyboards/helix/rev3_5rows/oled_display.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/helix/rev3_4rows/oled_display.c b/keyboards/helix/rev3_4rows/oled_display.c index 7716a172c93a..1b4988a16820 100644 --- a/keyboards/helix/rev3_4rows/oled_display.c +++ b/keyboards/helix/rev3_4rows/oled_display.c @@ -112,7 +112,7 @@ static void render_rgbled_status(bool full) { #endif } -void oled_task_user(void) { +__attribute__((weak)) void oled_task_user(void) { if(is_keyboard_master()){ render_status(); }else{ diff --git a/keyboards/helix/rev3_5rows/oled_display.c b/keyboards/helix/rev3_5rows/oled_display.c index ffe8b594b3b2..b4251bbe9c3f 100644 --- a/keyboards/helix/rev3_5rows/oled_display.c +++ b/keyboards/helix/rev3_5rows/oled_display.c @@ -112,7 +112,7 @@ static void render_rgbled_status(bool full) { #endif } -void oled_task_user(void) { +__attribute__((weak)) void oled_task_user(void) { if(is_keyboard_master()){ render_status(); }else{ From b51e06716eabdb85cfdf3b022e7c3a47b78fdb42 Mon Sep 17 00:00:00 2001 From: Drashna Jael're Date: Tue, 2 Mar 2021 08:22:52 -0800 Subject: [PATCH 2/2] Move oled_display.c to LIB_SRC to be optimized out if needed --- keyboards/helix/rev3_4rows/rules.mk | 2 +- keyboards/helix/rev3_5rows/rules.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/helix/rev3_4rows/rules.mk b/keyboards/helix/rev3_4rows/rules.mk index a5916c114d85..bf38e26ddc84 100644 --- a/keyboards/helix/rev3_4rows/rules.mk +++ b/keyboards/helix/rev3_4rows/rules.mk @@ -8,4 +8,4 @@ ENCODER_ENABLE = yes DIP_SWITCH_ENABLE = yes LTO_ENABLE = yes -SRC += oled_display.c +LIB_SRC += oled_display.c diff --git a/keyboards/helix/rev3_5rows/rules.mk b/keyboards/helix/rev3_5rows/rules.mk index a5916c114d85..bf38e26ddc84 100644 --- a/keyboards/helix/rev3_5rows/rules.mk +++ b/keyboards/helix/rev3_5rows/rules.mk @@ -8,4 +8,4 @@ ENCODER_ENABLE = yes DIP_SWITCH_ENABLE = yes LTO_ENABLE = yes -SRC += oled_display.c +LIB_SRC += oled_display.c