summaryrefslogtreecommitdiffstats
path: root/keyboards/splitkb/kyria
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/splitkb/kyria')
-rw-r--r--keyboards/splitkb/kyria/keymaps/asapjockey/keymap.c3
-rw-r--r--keyboards/splitkb/kyria/keymaps/benji/keymap.c3
-rw-r--r--keyboards/splitkb/kyria/keymaps/cjuniet/keymap.c3
-rw-r--r--keyboards/splitkb/kyria/keymaps/cwebster2/keymap.c3
-rw-r--r--keyboards/splitkb/kyria/keymaps/default/keymap.c3
-rw-r--r--keyboards/splitkb/kyria/keymaps/ghidalgo93/keymap.c3
-rw-r--r--keyboards/splitkb/kyria/keymaps/gotham/keymap.c5
-rw-r--r--keyboards/splitkb/kyria/keymaps/j-inc/keymap.c3
-rw-r--r--keyboards/splitkb/kyria/keymaps/jhelvy/keymap.c3
-rw-r--r--keyboards/splitkb/kyria/keymaps/john-ezra/oled.c3
-rw-r--r--keyboards/splitkb/kyria/keymaps/mattir/keymap.c3
-rw-r--r--keyboards/splitkb/kyria/keymaps/ninjonas/oled.c3
-rw-r--r--keyboards/splitkb/kyria/keymaps/plattfot/keymap.c3
-rw-r--r--keyboards/splitkb/kyria/keymaps/shinze/keymap.c3
-rw-r--r--keyboards/splitkb/kyria/keymaps/tessachka/keymap.c3
-rw-r--r--keyboards/splitkb/kyria/keymaps/thomasbaart/keymap.c3
-rw-r--r--keyboards/splitkb/kyria/keymaps/via/keymap.c3
-rwxr-xr-xkeyboards/splitkb/kyria/keymaps/winternebs/keymap.c3
-rw-r--r--keyboards/splitkb/kyria/keymaps/zigotica/oled.c4
-rw-r--r--keyboards/splitkb/kyria/rev1/rev1.c10
20 files changed, 48 insertions, 22 deletions
diff --git a/keyboards/splitkb/kyria/keymaps/asapjockey/keymap.c b/keyboards/splitkb/kyria/keymaps/asapjockey/keymap.c
index 8ba098eed2..baf46eeac6 100644
--- a/keyboards/splitkb/kyria/keymaps/asapjockey/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/asapjockey/keymap.c
@@ -246,12 +246,13 @@ static void render_status(void) {
oled_write_P(led_state.scroll_lock ? PSTR("SCRLCK ") : PSTR(" "), false);
}
-void oled_task_user(void) {
+bool oled_task_user(void) {
if (is_keyboard_master()) {
render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc)
} else {
render_kyria_logo();
}
+ return false;
}
#endif
diff --git a/keyboards/splitkb/kyria/keymaps/benji/keymap.c b/keyboards/splitkb/kyria/keymaps/benji/keymap.c
index a670b77611..1ad50e5fc4 100644
--- a/keyboards/splitkb/kyria/keymaps/benji/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/benji/keymap.c
@@ -200,12 +200,13 @@ static void render_status(void) {
oled_write_P(led_usb_state.scroll_lock ? PSTR("SCRLCK ") : PSTR(" "), false);
}
-void oled_task_user(void) {
+bool oled_task_user(void) {
if (is_keyboard_master()) {
render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc)
} else {
render_kyria_logo();
}
+ return false;
}
#endif
diff --git a/keyboards/splitkb/kyria/keymaps/cjuniet/keymap.c b/keyboards/splitkb/kyria/keymaps/cjuniet/keymap.c
index d0620309b6..7e485a7be8 100644
--- a/keyboards/splitkb/kyria/keymaps/cjuniet/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/cjuniet/keymap.c
@@ -117,11 +117,12 @@ static void render_status(void) {
oled_write_ln_P(PSTR(" Layer\n"), false);
}
-void oled_task_user(void) {
+bool oled_task_user(void) {
if (is_keyboard_master()) {
render_status();
render_status_bar();
} else {
render_kyria_logo();
}
+ return false;
}
diff --git a/keyboards/splitkb/kyria/keymaps/cwebster2/keymap.c b/keyboards/splitkb/kyria/keymaps/cwebster2/keymap.c
index 25a58038dc..1abf865010 100644
--- a/keyboards/splitkb/kyria/keymaps/cwebster2/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/cwebster2/keymap.c
@@ -391,12 +391,13 @@ static void render_status(void) {
}
-void oled_task_user(void) {
+bool oled_task_user(void) {
if (is_keyboard_master()) {
render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc)
} else {
render_logo();
}
+ return false;
}
#endif
diff --git a/keyboards/splitkb/kyria/keymaps/default/keymap.c b/keyboards/splitkb/kyria/keymaps/default/keymap.c
index 243104afc6..20cb279ff6 100644
--- a/keyboards/splitkb/kyria/keymaps/default/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/default/keymap.c
@@ -226,7 +226,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
#ifdef OLED_ENABLE
oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_180; }
-void oled_task_user(void) {
+bool oled_task_user(void) {
if (is_keyboard_master()) {
// QMK Logo and version information
// clang-format off
@@ -287,6 +287,7 @@ void oled_task_user(void) {
// clang-format on
oled_write_raw_P(kyria_logo, sizeof(kyria_logo));
}
+ return false;
}
#endif
diff --git a/keyboards/splitkb/kyria/keymaps/ghidalgo93/keymap.c b/keyboards/splitkb/kyria/keymaps/ghidalgo93/keymap.c
index 67881b03e6..df542977a1 100644
--- a/keyboards/splitkb/kyria/keymaps/ghidalgo93/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/ghidalgo93/keymap.c
@@ -214,12 +214,13 @@ static void render_status(void) {
oled_write_P(led_state.scroll_lock ? PSTR("SCRLCK ") : PSTR(" "), false);
}
-void oled_task_user(void) {
+bool oled_task_user(void) {
if (is_keyboard_master()) {
render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc)
} else {
render_kyria_logo();
}
+ return false;
}
#endif
diff --git a/keyboards/splitkb/kyria/keymaps/gotham/keymap.c b/keyboards/splitkb/kyria/keymaps/gotham/keymap.c
index 498e1c1124..5fdeb494e6 100644
--- a/keyboards/splitkb/kyria/keymaps/gotham/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/gotham/keymap.c
@@ -106,7 +106,10 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
#ifdef OLED_ENABLE
oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_180; }
-void oled_task_user(void) { render_status(); }
+bool oled_task_user(void) {
+ render_status();
+ return false;
+}
#endif
#ifdef ENCODER_ENABLE
diff --git a/keyboards/splitkb/kyria/keymaps/j-inc/keymap.c b/keyboards/splitkb/kyria/keymaps/j-inc/keymap.c
index 6121dd0f87..af583a607f 100644
--- a/keyboards/splitkb/kyria/keymaps/j-inc/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/j-inc/keymap.c
@@ -317,7 +317,7 @@ static void render_anim(void) {
// oled_write_raw_P(skull, 801);
// }
-void oled_task_user(void) {
+bool oled_task_user(void) {
if (is_keyboard_master()) {
//render_skull();
//oled_set_cursor(7,6);
@@ -335,6 +335,7 @@ void oled_task_user(void) {
oled_write(wpm_str, false);
}
+ return false;
}
#endif
diff --git a/keyboards/splitkb/kyria/keymaps/jhelvy/keymap.c b/keyboards/splitkb/kyria/keymaps/jhelvy/keymap.c
index a9c8db28d5..e78e15ea3e 100644
--- a/keyboards/splitkb/kyria/keymaps/jhelvy/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/jhelvy/keymap.c
@@ -161,12 +161,13 @@ static void render_status(void) {
}
-void oled_task_user(void) {
+bool oled_task_user(void) {
if (is_keyboard_master()) {
render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc)
} else {
render_kyria_logo();
}
+ return false;
}
#endif
diff --git a/keyboards/splitkb/kyria/keymaps/john-ezra/oled.c b/keyboards/splitkb/kyria/keymaps/john-ezra/oled.c
index fe9c96d556..732cca8f7b 100644
--- a/keyboards/splitkb/kyria/keymaps/john-ezra/oled.c
+++ b/keyboards/splitkb/kyria/keymaps/john-ezra/oled.c
@@ -478,12 +478,13 @@ void render_status_secondary(void) {
render_wpm_graph();
}
-void oled_task_user(void) {
+bool oled_task_user(void) {
if (is_keyboard_master()) {
render_status_main(); // Renders the current keyboard state (layer, lock, caps, scroll, etc)
} else {
render_status_secondary();
}
+ return false;
}
#endif
diff --git a/keyboards/splitkb/kyria/keymaps/mattir/keymap.c b/keyboards/splitkb/kyria/keymaps/mattir/keymap.c
index 89efaec559..7b567cbd60 100644
--- a/keyboards/splitkb/kyria/keymaps/mattir/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/mattir/keymap.c
@@ -193,12 +193,13 @@ static void render_status(void) {
}
}
-void oled_task_user(void) {
+bool oled_task_user(void) {
if (is_keyboard_master()) {
render_status(); // Renders the current keyboard layer
} else {
render_mattir_logo();
}
+ return false;
}
#endif
diff --git a/keyboards/splitkb/kyria/keymaps/ninjonas/oled.c b/keyboards/splitkb/kyria/keymaps/ninjonas/oled.c
index 216f475347..813328aa0c 100644
--- a/keyboards/splitkb/kyria/keymaps/ninjonas/oled.c
+++ b/keyboards/splitkb/kyria/keymaps/ninjonas/oled.c
@@ -198,12 +198,13 @@ static void render_status(void) {
render_mod_state(get_mods()|get_oneshot_mods());
}
-void oled_task_user(void) {
+bool oled_task_user(void) {
if (is_keyboard_master()) {
render_status();
} else {
render_logo();
oled_scroll_left();
}
+ return false;
}
#endif
diff --git a/keyboards/splitkb/kyria/keymaps/plattfot/keymap.c b/keyboards/splitkb/kyria/keymaps/plattfot/keymap.c
index 8b4b0c2630..222759d60d 100644
--- a/keyboards/splitkb/kyria/keymaps/plattfot/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/plattfot/keymap.c
@@ -327,12 +327,13 @@ static void render_status(void) {
oled_write_P(led_state.scroll_lock ? PSTR("SCRLCK ") : PSTR(" "), false);
}
-void oled_task_user(void) {
+bool oled_task_user(void) {
if (is_keyboard_master()) {
render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc)
} else {
render_static_info();
}
+ return false;
}
#endif
diff --git a/keyboards/splitkb/kyria/keymaps/shinze/keymap.c b/keyboards/splitkb/kyria/keymaps/shinze/keymap.c
index ad9ca4da1d..3483410525 100644
--- a/keyboards/splitkb/kyria/keymaps/shinze/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/shinze/keymap.c
@@ -216,12 +216,13 @@ static void render_status(void) {
oled_write_P(IS_LED_ON(led_usb_state, USB_LED_SCROLL_LOCK) ? PSTR("SCRLCK ") : PSTR(" "), false);
}
-void oled_task_user(void) {
+bool oled_task_user(void) {
if (is_keyboard_master()) {
render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc)
} else {
render_kyria_logo();
}
+ return false;
}
#endif
diff --git a/keyboards/splitkb/kyria/keymaps/tessachka/keymap.c b/keyboards/splitkb/kyria/keymaps/tessachka/keymap.c
index 51a91fc915..16d2bad8a4 100644
--- a/keyboards/splitkb/kyria/keymaps/tessachka/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/tessachka/keymap.c
@@ -231,11 +231,12 @@ static void render_status(void) {
oled_write_P(IS_LED_ON(led_usb_state, USB_LED_SCROLL_LOCK) ? PSTR("SCRLCK ") : PSTR(" "), false);
}
-void oled_task_user(void) {
+bool oled_task_user(void) {
if (is_keyboard_master()) {
render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc)
} else {
render_kyria_logo();
}
+ return false;
}
#endif
diff --git a/keyboards/splitkb/kyria/keymaps/thomasbaart/keymap.c b/keyboards/splitkb/kyria/keymaps/thomasbaart/keymap.c
index 24be4135ea..0a4f1887c3 100644
--- a/keyboards/splitkb/kyria/keymaps/thomasbaart/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/thomasbaart/keymap.c
@@ -298,12 +298,13 @@ static void render_status(void) {
oled_write_P(IS_LED_ON(led_usb_state, USB_LED_SCROLL_LOCK) ? PSTR("SCRLCK ") : PSTR(" "), false);
}
-void oled_task_user(void) {
+bool oled_task_user(void) {
if (is_keyboard_master()) {
render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc)
} else {
render_kyria_logo();
}
+ return false;
}
#endif
diff --git a/keyboards/splitkb/kyria/keymaps/via/keymap.c b/keyboards/splitkb/kyria/keymaps/via/keymap.c
index 730b5028cc..6835652a70 100644
--- a/keyboards/splitkb/kyria/keymaps/via/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/via/keymap.c
@@ -191,7 +191,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
#endif
#ifdef OLED_ENABLE
-void oled_task_user(void) {
+bool oled_task_user(void) {
if (is_keyboard_master()) {
// QMK Logo and version information
// clang-format off
@@ -244,5 +244,6 @@ void oled_task_user(void) {
// clang-format on
oled_write_raw_P(kyria_logo, sizeof(kyria_logo));
}
+ return false;
}
#endif
diff --git a/keyboards/splitkb/kyria/keymaps/winternebs/keymap.c b/keyboards/splitkb/kyria/keymaps/winternebs/keymap.c
index 0829030310..4f0df9354f 100755
--- a/keyboards/splitkb/kyria/keymaps/winternebs/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/winternebs/keymap.c
@@ -695,7 +695,7 @@ static void render_logo(void) {
oled_set_cursor(6,6);
oled_write_P(PSTR(" play asc "), false);
}
-void oled_task_user(void) {
+bool oled_task_user(void) {
if (is_keyboard_master()) {
render_anim();
oled_set_cursor(0,7);
@@ -728,5 +728,6 @@ void oled_task_user(void) {
oled_scroll_left();
}
+ return false;
}
#endif
diff --git a/keyboards/splitkb/kyria/keymaps/zigotica/oled.c b/keyboards/splitkb/kyria/keymaps/zigotica/oled.c
index 46bb2c3cea..ba1415deed 100644
--- a/keyboards/splitkb/kyria/keymaps/zigotica/oled.c
+++ b/keyboards/splitkb/kyria/keymaps/zigotica/oled.c
@@ -77,11 +77,11 @@ static void render_status(void) {
oled_write_P(led_state.scroll_lock ? PSTR("SCRLCK ") : PSTR(" "), false);
}
-void oled_task_user(void) {
+bool oled_task_user(void) {
if (!is_keyboard_left()) {
render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc)
} else {
render_kyria_logo();
}
+ return false;
}
-
diff --git a/keyboards/splitkb/kyria/rev1/rev1.c b/keyboards/splitkb/kyria/rev1/rev1.c
index ac82f7373d..b2641fb40e 100644
--- a/keyboards/splitkb/kyria/rev1/rev1.c
+++ b/keyboards/splitkb/kyria/rev1/rev1.c
@@ -56,9 +56,14 @@ 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;
+ }
if (is_keyboard_master()) {
// QMK Logo and version information
// clang-format off
@@ -119,6 +124,7 @@ __attribute__((weak)) void oled_task_user(void) {
// clang-format on
oled_write_raw_P(kyria_logo, sizeof(kyria_logo));
}
+ return false;
}
#endif