v1.3.1 to fix String-related bug

khoih-prog · web-flow · commit cf3a8b7064c8 · 2021-12-25T16:20:18.000-05:00
### Releases v1.3.1

1. Fix bug related to String in examples
diff --git a/examples/AdvancedWebServer/AdvancedWebServer.ino b/examples/AdvancedWebServer/AdvancedWebServer.ino
@@ -58,7 +58,7 @@ void handleRoot()
 {
   digitalWrite(led, 1);
 
-#define BUFFER_SIZE     400
+#define BUFFER_SIZE     512
 
   char temp[BUFFER_SIZE];
   int sec = millis() / 1000;
@@ -111,21 +111,25 @@ void handleNotFound()
   digitalWrite(led, 0);
 }
 
-#if (defined(ETHERNET_WEBSERVER_STM32_VERSION_INT) && (ETHERNET_WEBSERVER_STM32_VERSION_INT >= 1003000))
-
-EWString initHeader = "<svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" width=\"310\" height=\"150\">\n" \
-                      "<rect width=\"310\" height=\"150\" fill=\"rgb(250, 230, 210)\" stroke-width=\"3\" stroke=\"rgb(0, 0, 0)\" />\n" \
-                      "<g stroke=\"blue\">\n";
+#define ORIGINAL_STR_LEN        2048
 
 void drawGraph()
 {
-  EWString out;
-  
-  out.reserve(3000);
+  static String out;
+  static uint16_t previousStrLen = ORIGINAL_STR_LEN;
+
+  if (out.length() == 0)
+  {
+    ET_LOGWARN1(F("String Len = 0, extend to"), ORIGINAL_STR_LEN);
+    out.reserve(ORIGINAL_STR_LEN);
+  }
+
+  out = F( "<svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" width=\"310\" height=\"150\">\n" \
+           "<rect width=\"310\" height=\"150\" fill=\"rgb(250, 230, 210)\" stroke-width=\"3\" stroke=\"rgb(0, 0, 0)\" />\n" \
+           "<g stroke=\"blue\">\n");
+
   char temp[70];
   
-  out += initHeader;
-  
   int y = rand() % 130;
 
   for (int x = 10; x < 300; x += 10)
@@ -135,37 +139,25 @@ void drawGraph()
     out += temp;
     y = y2;
   }
-  out += "</g>\n</svg>\n";
-
-  server.send(200, "image/svg+xml", fromEWString(out));
-}
+  
+  out += F("</g>\n</svg>\n");
 
-#else
+  ET_LOGDEBUG1(F("String Len = "), out.length());
 
-void drawGraph()
-{
-  String out;
-  out.reserve(3000);
-  char temp[70];
-  out += "<svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" width=\"310\" height=\"150\">\n";
-  out += "<rect width=\"310\" height=\"150\" fill=\"rgb(250, 230, 210)\" stroke-width=\"1\" stroke=\"rgb(0, 0, 0)\" />\n";
-  out += "<g stroke=\"black\">\n";
-  int y = rand() % 130;
+  if (out.length() > previousStrLen)
+  {
+    ET_LOGERROR3(F("String Len > "), previousStrLen, F(", extend to"), out.length() + 48);
 
-  for (int x = 10; x < 300; x += 10)
+    previousStrLen = out.length() + 48;
+    
+    out.reserve(previousStrLen);
+  }
+  else
   {
-    int y2 = rand() % 130;
-    sprintf(temp, "<line x1=\"%d\" y1=\"%d\" x2=\"%d\" y2=\"%d\" stroke-width=\"1\" />\n", x, 140 - y, x + 10, 140 - y2);
-    out += temp;
-    y = y2;
+    server.send(200, "image/svg+xml", out);
   }
-  out += "</g>\n</svg>\n";
-
-  server.send(200, "image/svg+xml", out);
 }
 
-#endif
-
 void setup()
 {
   pinMode(led, OUTPUT);
diff --git a/examples/WebServer/WebServer.ino b/examples/WebServer/WebServer.ino
@@ -106,7 +106,9 @@ void loop()
             "\r\n");
           client.print("<!DOCTYPE HTML>\r\n");
           client.print("<html>\r\n");
-          client.print(String("<h1>Hello World from ") + BOARD_NAME + "!</h1>\r\n");
+          client.print("<h1>Hello World from ");
+          client.print(BOARD_NAME);
+          client.print("!</h1>\r\n");
           client.print("Requests received: ");
           client.print(++reqCount);
           client.print("<br>\r\n");
