Improved Data Handling for Configurations with many Sensors

Author: Manuel-Sensate

Sensatio_FW_ESP8266.cpp

@@ -11,6 +11,7 @@
     SOURCE: https://github.com/sensate-io/firmware-esp8266.git
 
     @section  HISTORY
+    v43 - Fixed data transmit issues in configurations with many sensors
     v42 - Fixed low memory issues in configurations with many sensors and a ST7735 Bug
     v41 - Changed IDE, Sensatio, Renamed Display Class to support more types
     v40 - New Display Structure to enable Display Rotation, different Styles etc.
@@ -32,7 +33,7 @@
 VisualisationHelper* vHelper;
 Display* display = NULL;
 
-int currentVersion = 42;
+int currentVersion = 43;
 boolean printMemory = false;
 
 //String board = "Generic";
@@ -54,7 +55,7 @@ boolean printMemory = false;
 extern String name = "Bridge";
 extern String ucType = "ESP8266";
 
-String variant = "SensateV"+String(currentVersion)+board;
+String variant = "SensatioV"+String(currentVersion)+board;
 
 String apiVersion = "v1";
 

src/controller/Bridge.cpp

@@ -11,6 +11,7 @@
     SOURCE: https://github.com/sensate-io/firmware-esp8266.git
 
     @section  HISTORY
+    v43 - Fixed data transmit issues in configurations with many sensors
     v42 - Fixed low memory issues in configurations with many sensors and a ST7735 Bug
     v41 - Renamed Display Class to support more types
     v40 - New Display Structure to enable Display Rotation, different Styles etc.
@@ -1203,14 +1204,76 @@ uint8_t translateGPIOPort(String gpioPort)
 }
 
 boolean postSensorData(Data* data[], int dataCount)
+{
+	if(printMemory)
+	{
+		Serial.print("HEAP: ");
+		Serial.println(ESP.getFreeHeap());
+	}
+
+	boolean success = true;
+
+	if(dataCount<=5)
+	{
+		success = postSensorDataPart(data, 0, dataCount-1);
+	}
+	else
+	{
+		Serial.print("s");
+		Serial.print(dataCount);
+
+		int start = 0;
+		int end = 4;
+
+		while(end<=dataCount)
+		{
+			if(!postSensorDataPart(data, start, end))
+				success = false;
+
+			yield();
+
+			if(printMemory)
+			{
+				Serial.print("HEAP: ");
+				Serial.println(ESP.getFreeHeap());
+			}
+
+			start+=5;
+			end+=5;
+
+			if(start>dataCount-1)
+				break;
+			if(end>dataCount-1)
+				end = dataCount-1;
+		}
+	}
+
+	if(!success)
+	{
+		postSensorDataRetry++;
+
+		if(postSensorDataRetry>=25)
+		{
+		  postSensorDataRetry=0;
+		  restart();
+		}
+
+		Serial.println("Retry #"+String(postSensorDataRetry)+", restart at 25");
+	}
+
+	return success;
+}
+
+
+boolean postSensorDataPart(Data* data[], int startIndex, int endIndex)
 {
   HTTPClient httpClient;
 
   String requestDataString = "";
 
-  for (int i = 0; i < dataCount; i++)
+  for (int i = startIndex; i <= endIndex; i++)
   {
-    if (i == 0)
+    if (i == startIndex)
       requestDataString = data[i]->getRequestString();
     else
       requestDataString = requestDataString + "," + data[i]->getRequestString();
@@ -1245,6 +1308,7 @@ boolean postSensorData(Data* data[], int dataCount)
     }
 
     String payload = httpClient.getString();
+    httpClient.end();
 
     if(payload!=NULL && displayType!=0)
     {
@@ -1278,7 +1342,6 @@ boolean postSensorData(Data* data[], int dataCount)
       }
     }
 
-    httpClient.end();
     return true;
   }
   else
@@ -1292,22 +1355,11 @@ boolean postSensorData(Data* data[], int dataCount)
     }
 
     serverError = true;
-    Serial.println("Server Error: "+String(httpCode));
-
-    Serial.println("Server Error: "+httpClient.errorToString(httpCode));
+    Serial.println("\nServer Error: "+String(httpCode)+" - "+httpClient.errorToString(httpCode));
     Serial.println(WiFi.status());
 
     httpClient.end();
 
-    postSensorDataRetry++;
-
-    if(postSensorDataRetry>=25)
-    {
-      postSensorDataRetry=0;
-      restart();
-    }
-
-    Serial.println("Retry #"+String(postSensorDataRetry)+", restart at 25");
   }
   return false;
 }

src/controller/Bridge.h

@@ -11,6 +11,7 @@
     SOURCE: https://github.com/sensate-io/firmware-esp8266.git
 
     @section  HISTORY
+    v43 - Fixed data transmit issues in configurations with many sensors
     v42 - Fixed low memory issues in configurations with many sensors and a ST7735 Bug
     v40 - New Display Structure to enable Display Rotation, different Styles etc.
     v36 - Greatly improved reliability of connectivity
@@ -65,6 +66,7 @@ void addSensor(Sensor *);
 void loopSensor(int);
 void loopDisplay(unsigned long);
 boolean postSensorData(Data* data[], int);
+boolean postSensorDataPart(Data* data[], int, int);
 void checkStatus();
 void trySleep(long);
 void storeDisplayAndPowerConfig(boolean);

src/output/display/DisplayST7735.cpp

@@ -203,10 +203,27 @@ void DisplayST7735::drawString(int16_t x, int16_t y, String text) {
 
 void DisplayST7735::drawDisconnected(bool update) {
 
+  if(!isResetting && displayEnabled)
+  {
+	display->fillRect(144, 112, 16, 16, ST7735_BLACK); // @suppress("Method cannot be resolved")
+
+    display->drawLine(144, 117, 150, 117, ST7735_CYAN);
+    display->drawLine(144, 123, 148, 123, ST7735_CYAN);
+    display->drawLine(148, 127, 151, 113, ST7735_CYAN);
+    display->drawLine(152, 127, 155, 113, ST7735_CYAN);
+
+    display->drawLine(154, 117, 195, 117, ST7735_CYAN);
+    display->drawLine(153, 123, 195, 123, ST7735_CYAN);
+
+    }
 }
 
 void DisplayST7735::drawConnected(bool update) {
 
+  if(!isResetting && displayEnabled)
+  {
+	  display->fillRect(112, 48, 16, 16, ST7735_BLACK);
+  }
 }
 
 int DisplayST7735::getSimultanValueCount() {