Added the missing scroll functions. Added scrollInterval as a parameter.

Author: PaulZC

keywords.txt

@@ -73,3 +73,12 @@ NORM	LITERAL1
 XOR	LITERAL1
 PAGE	LITERAL1
 ALL	LITERAL1
+
+SCROLL_INTERVAL_5_FRAMES	LITERAL1
+SCROLL_INTERVAL_64_FRAMES	LITERAL1
+SCROLL_INTERVAL_128_FRAMES	LITERAL1
+SCROLL_INTERVAL_256_FRAMES	LITERAL1
+SCROLL_INTERVAL_3_FRAMES	LITERAL1
+SCROLL_INTERVAL_4_FRAMES	LITERAL1
+SCROLL_INTERVAL_25_FRAMES	LITERAL1
+SCROLL_INTERVAL_2_FRAMES	LITERAL1

src/SFE_MicroOLED.cpp

@@ -1008,15 +1008,15 @@ void MicroOLED::scrollStop(void)
 
 Set row start to row stop on the OLED to scroll right. Refer to http://learn.microview.io/intro/general-overview-of-microview.html for explanation of the rows.
 */
-void MicroOLED::scrollRight(uint8_t start, uint8_t stop)
+void MicroOLED::scrollRight(uint8_t start, uint8_t stop, uint8_t scrollInterval)
 {
 	if (stop < start) // stop must be larger or equal to start
 		return;
 	scrollStop(); // need to disable scrolling before starting to avoid memory corrupt
 	command(RIGHTHORIZONTALSCROLL);
 	command(0x00);
 	command(start);
-	command(0x7); // scroll speed frames , TODO
+	command(scrollInterval);
 	command(stop);
 	command(0x00);
 	command(0xFF);
@@ -1027,34 +1027,33 @@ void MicroOLED::scrollRight(uint8_t start, uint8_t stop)
 
 Set row start to row stop on the OLED to scroll vert right.
 */
-void MicroOLED::scrollVertRight(uint8_t start, uint8_t stop)
+void MicroOLED::scrollVertRight(uint8_t start, uint8_t stop, uint8_t scrollInterval)
 {
 	if (stop < start) // stop must be larger or equal to start
 		return;
 	scrollStop(); // need to disable scrolling before starting to avoid memory corrupt
 	command(VERTICALRIGHTHORIZONTALSCROLL);
 	command(0x00);
 	command(start);
-	command(0x7); // scroll speed frames , TODO
+	command(scrollInterval);
 	command(stop);
-	command(0x00);
-	command(0xFF);
+	command(0x01); // Vertical scrolling offset
 	command(ACTIVATESCROLL);
 }
 
 /** \brief Left scrolling.
 
 Set row start to row stop on the OLED to scroll left.
 */
-void MicroOLED::scrollLeft(uint8_t start, uint8_t stop)
+void MicroOLED::scrollLeft(uint8_t start, uint8_t stop, uint8_t scrollInterval)
 {
 	if (stop < start) // stop must be larger or equal to start
 		return;
 	scrollStop(); // need to disable scrolling before starting to avoid memory corrupt
 	command(LEFT_HORIZONTALSCROLL);
 	command(0x00);
 	command(start);
-	command(0x7); // scroll speed frames , TODO
+	command(scrollInterval);
 	command(stop);
 	command(0x00);
 	command(0xFF);
@@ -1065,18 +1064,17 @@ void MicroOLED::scrollLeft(uint8_t start, uint8_t stop)
 
 Set row start to row stop on the OLED to scroll vert left.
 */
-void MicroOLED::scrollVertLeft(uint8_t start, uint8_t stop)
+void MicroOLED::scrollVertLeft(uint8_t start, uint8_t stop, uint8_t scrollInterval)
 {
 	if (stop < start) // stop must be larger or equal to start
 		return;
 	scrollStop(); // need to disable scrolling before starting to avoid memory corrupt
 	command(VERTICALLEFTHORIZONTALSCROLL);
 	command(0x00);
 	command(start);
-	command(0x7); // scroll speed frames , TODO
+	command(scrollInterval);
 	command(stop);
-	command(0x00);
-	command(0xFF);
+	command(0x01); // Vertical scrolling offset
 	command(ACTIVATESCROLL);
 }
 

src/SFE_MicroOLED.h

@@ -102,6 +102,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define VERTICALRIGHTHORIZONTALSCROLL 0x29
 #define VERTICALLEFTHORIZONTALSCROLL 0x2A
 
+#define SCROLL_INTERVAL_5_FRAMES 0b000
+#define SCROLL_INTERVAL_64_FRAMES 0b001
+#define SCROLL_INTERVAL_128_FRAMES 0b010
+#define SCROLL_INTERVAL_256_FRAMES 0b011
+#define SCROLL_INTERVAL_3_FRAMES 0b100
+#define SCROLL_INTERVAL_4_FRAMES 0b101
+#define SCROLL_INTERVAL_25_FRAMES 0b110
+#define SCROLL_INTERVAL_2_FRAMES 0b111
+
 typedef enum CMD
 {
 	CMD_CLEAR,		  //0
@@ -194,10 +203,11 @@ class MicroOLED : public Print
 	uint8_t getFontTotalChar(void);
 
 	// LCD Rotate Scroll functions
-	void scrollRight(uint8_t start, uint8_t stop);
-	void scrollLeft(uint8_t start, uint8_t stop);
-	void scrollVertRight(uint8_t start, uint8_t stop);
-	void scrollVertLeft(uint8_t start, uint8_t stop);
+	// start and stop are PAGE addresses: 0-7
+	void scrollRight(uint8_t start, uint8_t stop, uint8_t scrollInterval = SCROLL_INTERVAL_2_FRAMES);
+	void scrollLeft(uint8_t start, uint8_t stop, uint8_t scrollInterval = SCROLL_INTERVAL_2_FRAMES);
+	void scrollVertRight(uint8_t start, uint8_t stop, uint8_t scrollInterval = SCROLL_INTERVAL_2_FRAMES);
+	void scrollVertLeft(uint8_t start, uint8_t stop, uint8_t scrollInterval = SCROLL_INTERVAL_2_FRAMES);
 	void scrollStop(void);
 	void flipVertical(boolean flip);
 	void flipHorizontal(boolean flip);