Change endText(...) to accept scroll direction

Author: sandeepmistry

keywords.txt

@@ -64,3 +64,9 @@ ENCODING_NONE	LITERAL1
 ENCODING_RGB	LITERAL1
 ENCODING_RGB24	LITERAL1
 ENCODING_RGB16	LITERAL1
+
+NO_SCROLL	LITERAL1
+SCROLL_LEFT	LITERAL1
+SCROLL_RIGHT	LITERAL1
+SCROLL_UP	LITERAL1
+SCROLL_DOWN	LITERAL1

src/ArduinoGraphics.cpp

@@ -373,32 +373,55 @@ void ArduinoGraphics::beginText(int x, int y, uint32_t color)
   beginText(x, y, COLOR_R(color), COLOR_G(color), COLOR_B(color));
 }
 
-void ArduinoGraphics::endText(bool scroll)
+void ArduinoGraphics::endText(int scrollDirection)
 {
   // backup the stroke color and set the color to the text color
   bool strokeOn = _stroke;
   uint8_t strokeR = _strokeR;
   uint8_t strokeG = _strokeG;
   uint8_t strokeB = _strokeB;
 
-Serial.println(_textBuffer);
-Serial.println(_textX);
-Serial.println(_textY);
-Serial.println(_textR);
-Serial.println(_textG);
-Serial.println(_textB);
-
 
   stroke(_textR, _textG, _textB);
 
-  if (scroll) {
+  if (scrollDirection == SCROLL_LEFT) {
     int scrollLength = _textBuffer.length() * textFontWidth() + _textX;
 
     for (int i = 0; i < scrollLength; i++) {
       beginDraw();
       text(_textBuffer, _textX - i, _textY);
       endDraw();
 
+      delay(_textScrollSpeed);
+    }
+  } else if (scrollDirection == SCROLL_RIGHT) {
+    int scrollLength = _textBuffer.length() * textFontWidth() + _textX;
+
+    for (int i = 0; i < scrollLength; i++) {
+      beginDraw();
+      text(_textBuffer, _textX - (scrollLength - i - 1), _textY);
+      endDraw();
+
+      delay(_textScrollSpeed);
+    }
+  } else if (scrollDirection == SCROLL_UP) {
+    int scrollLength = textFontHeight() + _textY;
+
+    for (int i = 0; i < scrollLength; i++) {
+      beginDraw();
+      text(_textBuffer, _textX, _textY - i);
+      endDraw();
+
+      delay(_textScrollSpeed);
+    }
+  } else if (scrollDirection == SCROLL_DOWN) {
+    int scrollLength = textFontHeight() + _textY;
+
+    for (int i = 0; i < scrollLength; i++) {
+      beginDraw();
+      text(_textBuffer, _textX, _textY - (scrollLength - i - 1));
+      endDraw();
+
       delay(_textScrollSpeed);
     }
   } else {

src/ArduinoGraphics.h

@@ -25,6 +25,14 @@
 #include "Font.h"
 #include "Image.h"
 
+enum {
+  NO_SCROLL,
+  SCROLL_LEFT,
+  SCROLL_RIGHT,
+  SCROLL_UP,
+  SCROLL_DOWN
+};
+
 class ArduinoGraphics : public Print {
 public:
   ArduinoGraphics(int width, int height);
@@ -77,7 +85,7 @@ class ArduinoGraphics : public Print {
   virtual void beginText(int x = 0, int y = 0);
   virtual void beginText(int x, int y, uint8_t r, uint8_t g, uint8_t b);
   virtual void beginText(int x, int y, uint32_t color);
-  virtual void endText(bool scroll = false);
+  virtual void endText(int scroll = NO_SCROLL);
   virtual void textScrollSpeed(unsigned long speed = 150);
 
 protected: