Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2023-12-12 03:02:58 +00:00
commit 8352f589c7

View file

@ -56,7 +56,7 @@ const uint8_t RGBLED_RAINBOW_SWIRL_INTERVALS[] PROGMEM = {20, 10, 4};
* Alt + left arrow - Jump 10 seconds back
* Control + left arrow - Jump 1 minute back
*
* - Layer for VLC DVD hotkeys:
* - Layer for VLC DVD hotkeys:
* Shift + M - Disc menu
* Arrow up - Navigate menu (up)
* Enter - Select menu entry
@ -93,7 +93,7 @@ oled_rotation_t oled_init_user(oled_rotation_t rotation) {
return OLED_ROTATION_180; // flips the display 180 degrees if offhand
}
void oled_task_user(void) {
bool oled_task_user(void) {
// Host Keyboard Layer Status
oled_write_ln_P(PSTR("ANAVI Macro Pad 8"), false);
oled_write_P(PSTR("Layer: "), false);
@ -134,5 +134,6 @@ void oled_task_user(void) {
snprintf(rgbStatusLine2, sizeof(rgbStatusLine2), "h:%d s:%d v:%d", rgblight_get_hue(), rgblight_get_sat(), rgblight_get_val());
oled_write_ln(rgbStatusLine2, false);
#endif
return false;
}
#endif