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

1 files changed, 4 insertions, 0 deletions

diff --git a/docs/feature_oled_driver.md b/docs/feature_oled_driver.md
index c97843cfb..49a3f0b3e 100644
--- a/docs/feature_oled_driver.md
+++ b/docs/feature_oled_driver.md
@@ -356,6 +356,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);