summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-09-05 16:09:51 +0000
committerQMK Bot <hello@qmk.fm>2021-09-05 16:09:51 +0000
commite1ad9432b6f196c73a67e8ec7d1199b84ba11598 (patch)
tree5522d921c55f75018b1db87347851f0878083e86 /drivers
parenta66e8c884f0b84cc4e4a6dc84daef83c13df80cd (diff)
parent767f2c02844acd77c86ea84fb86a1a7f49f379b0 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'drivers')
-rw-r--r--drivers/oled/oled_driver.h4
-rw-r--r--drivers/oled/ssd1306_sh1106.c2
2 files changed, 6 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);
diff --git a/drivers/oled/ssd1306_sh1106.c b/drivers/oled/ssd1306_sh1106.c
index 7d41978905..e9049438f5 100644
--- a/drivers/oled/ssd1306_sh1106.c
+++ b/drivers/oled/ssd1306_sh1106.c
@@ -692,6 +692,8 @@ bool oled_scroll_off(void) {
return !oled_scrolling;
}
+bool is_oled_scrolling(void) { return oled_scrolling; }
+
bool oled_invert(bool invert) {
if (!oled_initialized) {
return oled_inverted;