1
0
Fork 0

[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
This commit is contained in:
Drashna Jael're 2021-11-01 15:42:50 -07:00 committed by GitHub
parent f775da96b1
commit 9d235d4fc5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
272 changed files with 967 additions and 599 deletions

View file

@ -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

View file

@ -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

View file

@ -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;
}

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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;
}