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

1 files changed, 4 insertions, 0 deletions

diff --git a/drivers/oled/oled_driver.h b/drivers/oled/oled_driver.h
index fc68f0ec95..13b73ede9d 100644
--- a/drivers/oled/oled_driver.h
+++ b/drivers/oled/oled_driver.h
@@ -313,6 +313,10 @@ bool oled_scroll_left(void);
 // Returns true if the screen was not scrolling or stops scrolling
 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
 // Returns true if the screen was or is inverted
 bool oled_invert(bool invert);