summaryrefslogtreecommitdiff
path: root/keyboards/hadron
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2021-11-01 15:42:50 -0700
committerGitHub <noreply@github.com>2021-11-02 09:42:50 +1100
commit9d235d4fc5c34f372b0c393f41686b5ef4f8dc13 (patch)
treec155fae4cd6043c3c32aa185eb05c5d1a4a5700e /keyboards/hadron
parentf775da96b17ceec66bac279434325b4da5cb9467 (diff)
[Core] Change OLED task function to be boolean (#14864)
* [Core] Add kb level callbacks to OLED driver * Update keyboards and keymaps * Update docs * Update userspace configs * Add fix for my keymap ... * update lefty
Diffstat (limited to 'keyboards/hadron')
-rw-r--r--keyboards/hadron/ver2/ver2.c12
-rw-r--r--keyboards/hadron/ver3/ver3.c12
2 files changed, 12 insertions, 12 deletions
diff --git a/keyboards/hadron/ver2/ver2.c b/keyboards/hadron/ver2/ver2.c
index ca13427497..abf21d4256 100644
--- a/keyboards/hadron/ver2/ver2.c
+++ b/keyboards/hadron/ver2/ver2.c
@@ -1,13 +1,12 @@
#include "ver2.h"
#ifdef OLED_ENABLE
-__attribute__ ((weak))
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
- return OLED_ROTATION_180;
-}
+oled_rotation_t oled_init_kb(oled_rotation_t rotation) { return OLED_ROTATION_180; }
-__attribute__ ((weak))
-void oled_task_user(void) {
+bool oled_task_kb(void) {
+ if (!oled_task_user()) {
+ return false;
+ }
oled_write_P(PSTR("LAYER "), false);
oled_write_char(get_highest_layer(layer_state) + 0x30, true);
@@ -61,5 +60,6 @@ void oled_task_user(void) {
for (uint8_t y = 0; y < 8; y++) {
oled_write_pixel(35, 0 + y, true);
}
+ return false;
}
#endif
diff --git a/keyboards/hadron/ver3/ver3.c b/keyboards/hadron/ver3/ver3.c
index 40bc57c20e..4c5a2e0c9a 100644
--- a/keyboards/hadron/ver3/ver3.c
+++ b/keyboards/hadron/ver3/ver3.c
@@ -34,13 +34,12 @@ led_config_t g_led_config = { {
#endif
#ifdef OLED_ENABLE
-__attribute__ ((weak))
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
- return OLED_ROTATION_180;
-}
+oled_rotation_t oled_init_kb(oled_rotation_t rotation) { return OLED_ROTATION_180; }
-__attribute__ ((weak))
-void oled_task_user(void) {
+bool oled_task_kb(void) {
+ if (!oled_task_user()) {
+ return false;
+ }
oled_write_P(PSTR("LAYER"), false);
oled_advance_char();
oled_write_char(get_highest_layer(layer_state) + 0x30, true);
@@ -94,5 +93,6 @@ void oled_task_user(void) {
for (uint8_t y = 0; y < 8; y++) {
oled_write_pixel(35, 0 + y, true);
}
+ return false;
}
#endif