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

master
QMK Bot 2021-09-05 16:09:51 +00:00
commit e1ad9432b6
3 changed files with 10 additions and 0 deletions

View File

@ -356,6 +356,10 @@ bool oled_scroll_left(void);
// Returns true if the screen was not scrolling or stops scrolling // Returns true if the screen was not scrolling or stops scrolling
bool oled_scroll_off(void); bool oled_scroll_off(void);
// Returns true if the oled is currently scrolling, false if it is
// not
bool is_oled_scrolling(void);
// Inverts the display // Inverts the display
// Returns true if the screen was or is inverted // Returns true if the screen was or is inverted
bool oled_invert(bool invert); bool oled_invert(bool invert);

View File

@ -313,6 +313,10 @@ bool oled_scroll_left(void);
// Returns true if the screen was not scrolling or stops scrolling // Returns true if the screen was not scrolling or stops scrolling
bool oled_scroll_off(void); bool oled_scroll_off(void);
// Returns true if the oled is currently scrolling, false if it is
// not
bool is_oled_scrolling(void);
// Inverts the display // Inverts the display
// Returns true if the screen was or is inverted // Returns true if the screen was or is inverted
bool oled_invert(bool invert); bool oled_invert(bool invert);

View File

@ -692,6 +692,8 @@ bool oled_scroll_off(void) {
return !oled_scrolling; return !oled_scrolling;
} }
bool is_oled_scrolling(void) { return oled_scrolling; }
bool oled_invert(bool invert) { bool oled_invert(bool invert) {
if (!oled_initialized) { if (!oled_initialized) {
return oled_inverted; return oled_inverted;