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

@ -230,7 +230,7 @@ static void render_touch(void)
oled_write_P(touch_encoder_calibrating() ? PSTR("CLBRT") : PSTR(" "), false);
}
void oled_task_user(void) {
bool oled_task_user(void) {
if (is_keyboard_left()) {
render_icon();
oled_write_P(PSTR(" "), false);
@ -245,6 +245,7 @@ void oled_task_user(void) {
oled_write_P(PSTR(" "), false);
render_rgb_menu();
}
return false;
}
oled_rotation_t oled_init_user(oled_rotation_t rotation) {

View file

@ -230,7 +230,7 @@ static void render_touch(void)
oled_write_P(touch_encoder_calibrating() ? PSTR("CLBRT") : PSTR(" "), false);
}
void oled_task_user(void) {
bool oled_task_user(void) {
if (is_keyboard_left()) {
render_icon();
oled_write_P(PSTR(" "), false);
@ -245,6 +245,7 @@ void oled_task_user(void) {
oled_write_P(PSTR(" "), false);
render_rgb_menu();
}
return false;
}
oled_rotation_t oled_init_user(oled_rotation_t rotation) {

View file

@ -119,7 +119,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, KC_LEFT, KC_DOWN, KC_RIGHT,_______, _______, _______, _______, _______, KC_KP_4, KC_KP_5, KC_KP_6, KC_PPLS, _______,
_______, _______, _______, _______, _______, EEP_RST, _______, _______, _______, KC_KP_1, KC_KP_2, KC_KP_3, KC_PENT, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_KP_0, KC_PDOT, KC_PENT, _______,
_______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
)
@ -223,7 +223,7 @@ void render_debug_scan(void) {
}
#endif
void oled_task_user(void) {
bool oled_task_user(void) {
#if !defined(MATRIX_SCAN_DEBUG)
if (is_keyboard_left()) {
render_layer();
@ -241,8 +241,9 @@ void oled_task_user(void) {
#endif
oled_set_cursor(0, 12);
render_icon();
return false;
}
oled_rotation_t oled_init_user(oled_rotation_t rotation) {
return OLED_ROTATION_270;
}
}

View file

@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
#ifdef OLED_ENABLE
void oled_task_user(void) {
bool oled_task_user(void) {
// Host Keyboard Layer Status
oled_write_P(PSTR("RGBKB Pan\n"), false);
oled_write_P(PSTR("Layer: "), false);
@ -97,6 +97,8 @@ void oled_task_user(void) {
led_t led_state = host_keyboard_led_state();
oled_write_P(led_state.num_lock ? PSTR("Numlock On\n") : PSTR(" \n"), false);
oled_write_P(led_state.caps_lock ? PSTR("Capslock On \n") : PSTR(" \n"), false);
return false;
}
#endif

View file

@ -260,11 +260,13 @@ static void render_status(void) {
oled_write_P(led_usb_state & (1<<USB_LED_SCROLL_LOCK) ? PSTR("SCLK ") : PSTR(" "), false);
}
void oled_task_user(void) {
bool oled_task_user(void) {
if (is_keyboard_master())
render_status();
else
render_logo();
return false;
}
#endif

View file

@ -324,11 +324,13 @@ static void render_status(void) {
oled_write_P(led_usb_state & (1<<USB_LED_SCROLL_LOCK) ? PSTR("SCLK ") : PSTR(" "), false);
}
void oled_task_user(void) {
bool oled_task_user(void) {
if (is_keyboard_master())
render_status();
else
render_logo();
return false;
}
#endif

View file

@ -360,13 +360,14 @@ static void render_status(void) {
#endif
}
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

@ -350,13 +350,14 @@ static void render_status(void) {
#endif
}
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

@ -47,20 +47,23 @@ void render_status(void) {
oled_write_P(led_usb_state & (1<<USB_LED_SCROLL_LOCK) ? PSTR("SCRLK") : PSTR(" "), false); // Line 16
}
oled_rotation_t oled_init_user(oled_rotation_t rotation) {
oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
if (is_keyboard_master())
return OLED_ROTATION_270; // flips the display 270 degrees if mainhand
return rotation;
}
__attribute__((weak))
void oled_task_user(void) {
bool oled_task_kb(void) {
if (!oled_task_user()) {
return false;
}
if (is_keyboard_master()) {
render_status();
} else {
render_logo();
oled_scroll_left();
}
return false;
}
#endif

View file

@ -222,13 +222,14 @@ static void render_status(void) {
oled_write_ln_P(led_usb_state & (1<<USB_LED_SCROLL_LOCK) ? PSTR("SCRLCK ") : PSTR(" "), false);
}
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