Merge pull request #1015 from justcallmekoko/develop

Faster display buffer

esp32_marauder/Display.cpp

@@ -475,33 +475,37 @@ void Display::processAndPrintString(TFT_eSPI& tft, const String& originalString)
   String new_string = originalString;
 
   // Check for color macros at the start of the string
-  if (new_string.startsWith(RED_KEY)) {
+  if (new_string.startsWith(";")) {
-    text_color = TFT_RED;
+    if (new_string.startsWith(RED_KEY)) {
-    new_string.remove(0, strlen(RED_KEY)); // Remove the macro
+      text_color = TFT_RED;
-  } else if (new_string.startsWith(GREEN_KEY)) {
+      new_string.remove(0, strlen(RED_KEY)); // Remove the macro
-    text_color = TFT_GREEN;
+    } else if (new_string.startsWith(GREEN_KEY)) {
-    new_string.remove(0, strlen(GREEN_KEY)); // Remove the macro
+      text_color = TFT_GREEN;
-  } else if (new_string.startsWith(CYAN_KEY)) {
+      new_string.remove(0, strlen(GREEN_KEY)); // Remove the macro
-    text_color = TFT_CYAN;
+    } else if (new_string.startsWith(CYAN_KEY)) {
-    new_string.remove(0, strlen(CYAN_KEY)); // Remove the macro
+      text_color = TFT_CYAN;
-  } else if (new_string.startsWith(WHITE_KEY)) {
+      new_string.remove(0, strlen(CYAN_KEY)); // Remove the macro
-    text_color = TFT_WHITE;
+    } else if (new_string.startsWith(WHITE_KEY)) {
-    new_string.remove(0, strlen(WHITE_KEY)); // Remove the macro
+      text_color = TFT_WHITE;
-  } else if (new_string.startsWith(MAGENTA_KEY)) {
+      new_string.remove(0, strlen(WHITE_KEY)); // Remove the macro
-    text_color = TFT_MAGENTA;
+    } else if (new_string.startsWith(MAGENTA_KEY)) {
-    new_string.remove(0, strlen(MAGENTA_KEY)); // Remove the macro
+      text_color = TFT_MAGENTA;
+      new_string.remove(0, strlen(MAGENTA_KEY)); // Remove the macro
+    }
   }
 
+  String spaces = String(' ', TFT_WIDTH / CHAR_WIDTH);
+
   // Set text color and print the string
   tft.setTextColor(text_color, background_color);
-  tft.print(new_string);
+  tft.print(new_string + spaces);
 }
 
 void Display::displayBuffer(bool do_clear)
 {
   if (this->display_buffer->size() > 0)
   {
-    int print_count = 1;
+    int print_count = 10;
     while ((display_buffer->size() > 0) && (print_count > 0))
     {
 
@@ -530,9 +534,9 @@ void Display::displayBuffer(bool do_clear)
         screen_buffer->add(display_buffer->shift());
 
         for (int i = 0; i < this->screen_buffer->size(); i++) {
-          tft.setCursor(xPos, (i * 12) + (SCREEN_HEIGHT / 6));
+          //tft.setCursor(xPos, (i * 12) + (SCREEN_HEIGHT / 6));
-          String spaces = String(' ', TFT_WIDTH / CHAR_WIDTH);
+          //String spaces = String(' ', TFT_WIDTH / CHAR_WIDTH);
-          tft.print(spaces);
+          //tft.print(spaces);
           tft.setCursor(xPos, (i * 12) + (SCREEN_HEIGHT / 6));
 
           this->processAndPrintString(tft, this->screen_buffer->get(i));