summaryrefslogtreecommitdiff
path: root/keyboards/helix
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/helix
parentf775da96b17ceec66bac279434325b4da5cb9467 (diff)
downloadqmk_firmware-9d235d4fc5c34f372b0c393f41686b5ef4f8dc13.tar.gz
qmk_firmware-9d235d4fc5c34f372b0c393f41686b5ef4f8dc13.zip
[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/helix')
-rw-r--r--keyboards/helix/rev2/keymaps/default/oled_display.c3
-rw-r--r--keyboards/helix/rev2/keymaps/edvorakjp/oled.c3
-rw-r--r--keyboards/helix/rev2/keymaps/five_rows/oled_display.c3
-rw-r--r--keyboards/helix/rev3_4rows/keymaps/default/oled_display.c3
-rw-r--r--keyboards/helix/rev3_4rows/keymaps/via/oled_display.c3
-rw-r--r--keyboards/helix/rev3_4rows/rev3_4rows.c5
-rw-r--r--keyboards/helix/rev3_5rows/keymaps/default/oled_display.c3
-rw-r--r--keyboards/helix/rev3_5rows/keymaps/five_rows/oled_display.c3
-rw-r--r--keyboards/helix/rev3_5rows/keymaps/via/oled_display.c3
-rw-r--r--keyboards/helix/rev3_5rows/rev3_5rows.c5
10 files changed, 22 insertions, 12 deletions
diff --git a/keyboards/helix/rev2/keymaps/default/oled_display.c b/keyboards/helix/rev2/keymaps/default/oled_display.c
index 36a7cf0b10..4ee3f002d6 100644
--- a/keyboards/helix/rev2/keymaps/default/oled_display.c
+++ b/keyboards/helix/rev2/keymaps/default/oled_display.c
@@ -208,7 +208,7 @@ void iota_gfx_task_user(void) {
matrix_update(&display, &matrix);
}
# else
-void oled_task_user(void) {
+bool oled_task_user(void) {
# if DEBUG_TO_SCREEN
if (debug_enable) {
@@ -223,6 +223,7 @@ void oled_task_user(void) {
render_rgbled_status(false);
render_layer_status();
}
+ return false;
}
# endif
#endif
diff --git a/keyboards/helix/rev2/keymaps/edvorakjp/oled.c b/keyboards/helix/rev2/keymaps/edvorakjp/oled.c
index 500a7bbf1a..207aebc423 100644
--- a/keyboards/helix/rev2/keymaps/edvorakjp/oled.c
+++ b/keyboards/helix/rev2/keymaps/edvorakjp/oled.c
@@ -56,7 +56,7 @@ oled_rotation_t oled_init_user(oled_rotation_t rotation) {
return is_keyboard_left() ? rotation : rotation ^ OLED_ROTATION_180;
}
-void oled_task_user(void) {
+bool oled_task_user(void) {
if (is_keyboard_left()) {
render_mode_icon(!get_enable_kc_lang());
render_layer_state();
@@ -64,5 +64,6 @@ void oled_task_user(void) {
} else {
render_logo();
}
+ return false;
}
#endif // OLED_ENABLE
diff --git a/keyboards/helix/rev2/keymaps/five_rows/oled_display.c b/keyboards/helix/rev2/keymaps/five_rows/oled_display.c
index fcbd81c9b6..dc6de02b17 100644
--- a/keyboards/helix/rev2/keymaps/five_rows/oled_display.c
+++ b/keyboards/helix/rev2/keymaps/five_rows/oled_display.c
@@ -259,7 +259,7 @@ void iota_gfx_task_user(void) {
matrix_update(&display, &matrix);
}
# else
-void oled_task_user(void) {
+bool oled_task_user(void) {
# if DEBUG_TO_SCREEN
if (debug_enable) {
@@ -272,6 +272,7 @@ void oled_task_user(void) {
}else{
render_logo();
}
+ return false;
}
# endif
diff --git a/keyboards/helix/rev3_4rows/keymaps/default/oled_display.c b/keyboards/helix/rev3_4rows/keymaps/default/oled_display.c
index fb1a6f9f87..e951f627c8 100644
--- a/keyboards/helix/rev3_4rows/keymaps/default/oled_display.c
+++ b/keyboards/helix/rev3_4rows/keymaps/default/oled_display.c
@@ -101,12 +101,13 @@ static void render_rgbled_status(bool full) {
#endif
}
-void oled_task_user(void) {
+bool oled_task_user(void) {
if(is_keyboard_master()){
render_status();
}else{
render_logo();
render_rgbled_status(true);
}
+ return false;
}
#endif
diff --git a/keyboards/helix/rev3_4rows/keymaps/via/oled_display.c b/keyboards/helix/rev3_4rows/keymaps/via/oled_display.c
index fb1a6f9f87..e951f627c8 100644
--- a/keyboards/helix/rev3_4rows/keymaps/via/oled_display.c
+++ b/keyboards/helix/rev3_4rows/keymaps/via/oled_display.c
@@ -101,12 +101,13 @@ static void render_rgbled_status(bool full) {
#endif
}
-void oled_task_user(void) {
+bool oled_task_user(void) {
if(is_keyboard_master()){
render_status();
}else{
render_logo();
render_rgbled_status(true);
}
+ return false;
}
#endif
diff --git a/keyboards/helix/rev3_4rows/rev3_4rows.c b/keyboards/helix/rev3_4rows/rev3_4rows.c
index 963cc744e7..704f915510 100644
--- a/keyboards/helix/rev3_4rows/rev3_4rows.c
+++ b/keyboards/helix/rev3_4rows/rev3_4rows.c
@@ -83,8 +83,8 @@ char *sprint2d(char *buf, char *leadstr, int data) {
return sprint_decimal(buf, data);
}
-__attribute__((weak))
-void oled_task_user(void) {
+bool oled_task_kb(void) {
+ if (!oled_task_user()) { return false; }
static const char PROGMEM helix_logo[] = {
0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94,
0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4,
@@ -109,5 +109,6 @@ void oled_task_user(void) {
} else {
oled_write_P(helix_logo, false);
}
+ return false;
}
#endif
diff --git a/keyboards/helix/rev3_5rows/keymaps/default/oled_display.c b/keyboards/helix/rev3_5rows/keymaps/default/oled_display.c
index fb1a6f9f87..e951f627c8 100644
--- a/keyboards/helix/rev3_5rows/keymaps/default/oled_display.c
+++ b/keyboards/helix/rev3_5rows/keymaps/default/oled_display.c
@@ -101,12 +101,13 @@ static void render_rgbled_status(bool full) {
#endif
}
-void oled_task_user(void) {
+bool oled_task_user(void) {
if(is_keyboard_master()){
render_status();
}else{
render_logo();
render_rgbled_status(true);
}
+ return false;
}
#endif
diff --git a/keyboards/helix/rev3_5rows/keymaps/five_rows/oled_display.c b/keyboards/helix/rev3_5rows/keymaps/five_rows/oled_display.c
index e8ba0d720f..cee415ad30 100644
--- a/keyboards/helix/rev3_5rows/keymaps/five_rows/oled_display.c
+++ b/keyboards/helix/rev3_5rows/keymaps/five_rows/oled_display.c
@@ -214,7 +214,7 @@ void iota_gfx_task_user(void) {
matrix_update(&display, &matrix);
}
# else
-void oled_task_user(void) {
+bool oled_task_user(void) {
# if DEBUG_TO_SCREEN
if (debug_enable) {
@@ -227,6 +227,7 @@ void oled_task_user(void) {
}else{
render_logo();
}
+ return false;
}
# endif
diff --git a/keyboards/helix/rev3_5rows/keymaps/via/oled_display.c b/keyboards/helix/rev3_5rows/keymaps/via/oled_display.c
index fb1a6f9f87..e951f627c8 100644
--- a/keyboards/helix/rev3_5rows/keymaps/via/oled_display.c
+++ b/keyboards/helix/rev3_5rows/keymaps/via/oled_display.c
@@ -101,12 +101,13 @@ static void render_rgbled_status(bool full) {
#endif
}
-void oled_task_user(void) {
+bool oled_task_user(void) {
if(is_keyboard_master()){
render_status();
}else{
render_logo();
render_rgbled_status(true);
}
+ return false;
}
#endif
diff --git a/keyboards/helix/rev3_5rows/rev3_5rows.c b/keyboards/helix/rev3_5rows/rev3_5rows.c
index 963cc744e7..704f915510 100644
--- a/keyboards/helix/rev3_5rows/rev3_5rows.c
+++ b/keyboards/helix/rev3_5rows/rev3_5rows.c
@@ -83,8 +83,8 @@ char *sprint2d(char *buf, char *leadstr, int data) {
return sprint_decimal(buf, data);
}
-__attribute__((weak))
-void oled_task_user(void) {
+bool oled_task_kb(void) {
+ if (!oled_task_user()) { return false; }
static const char PROGMEM helix_logo[] = {
0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94,
0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4,
@@ -109,5 +109,6 @@ void oled_task_user(void) {
} else {
oled_write_P(helix_logo, false);
}
+ return false;
}
#endif