Minor fixes to improve SSL connections

Author: Manuel-Sensate

.gitignore

@@ -2,3 +2,5 @@
 /.vscode
 /.DS_Store
 /archive
+/src/input/.DS_Store
+/src/input/i2c/.DS_Store

firmware-esp8266.ino

@@ -30,24 +30,24 @@
 
 Display* display = NULL;
 
-int currentVersion = 36; 
+int currentVersion = 37; 
 boolean printMemory = false;
 
-String board = "Generic";
-char firmwareType[] = "ESP8266";
+// String board = "Generic";
+// char firmwareType[] = "ESP8266";
 // char firmwareType[] = "ESP8266-1M";
 
 // String board = "NodeMCU";
-// char firmwareType[] = "ESP8266-NodeMCU";
+// char firmwareType[] = "ESP8266-NodeMCU-pp";
 
 // String board = "ESP12s";
 // char firmwareType[] = "ESP8266-ESP12s";
 
 // String board = "ESP07";
 // char firmwareType[] = "ESP8266-ESP07";
 
-// String board = "D1Mini";
-// char firmwareType[] = "ESP8266-D1Mini";
+String board = "D1Mini";
+char firmwareType[] = "ESP8266-D1Mini";
 
 extern String name = "Bridge";
 extern String ucType = "ESP8266";
@@ -232,11 +232,13 @@ void initSensate() {
     if(resetInfo.reason != REASON_DEEP_SLEEP_AWAKE)
     {
       Serial.println("STATE: Register_Bridge");
+      initSSL();
       registerBridge();
     }
     else 
     {
       Serial.println("Skip Register_Bridge (Wake from Sleep)");
+      initSSL();
       state=Init_Configuration;
     }
   }

src/controller/Bridge.cpp

@@ -78,6 +78,16 @@ int sensorCycle = 1;
 
 std::unique_ptr<BearSSL::WiFiClientSecure>sslClient(new BearSSL::WiFiClientSecure);
 
+bool initSSL()
+{
+  sslClient->setBufferSizes(512, 512);
+
+  if(bridgeURL.startsWith("https://hub"))
+    sslClient->setFingerprint(ssl_fingerprint_prod);
+  else if(bridgeURL.startsWith("https://test"))
+    sslClient->setFingerprint(ssl_fingerprint_test);
+}
+
 bool registerBridge()
 {
   if(display!=NULL)
@@ -99,14 +109,7 @@ bool registerBridge()
 
       String urlString = bridgeURL + "/" + apiVersion + "/bridge/";
 
-      sslClient->setBufferSizes(1024, 1024);
-      if(urlString.startsWith("https://hub"))
-        sslClient->setFingerprint(ssl_fingerprint_prod);
-      else if(urlString.startsWith("https://test"))
-        sslClient->setFingerprint(ssl_fingerprint_test);
-
       httpClient.begin(*sslClient, urlString);
-
       httpClient.addHeader("Content-Type", "application/json");
       httpClient.setTimeout(5000);
 
@@ -416,6 +419,7 @@ bool getBridgeConfig() {
 
   Serial.print("e");
   configRetry++;
+  Serial.println("Fetch config failed..? - HTTP:" + String(httpCode));
   Serial.println("Retry #"+String(configRetry)+", restart at 25");
 
   if(configRetry>=10 && powerMode==2)
@@ -1098,6 +1102,7 @@ boolean postSensorData(Data* data[], int dataCount)
 
     if(serverError || wasDisconnected)
     {
+      postSensorDataRetry=0;
       serverError = false;
       wasDisconnected = false;
       if(display!=NULL)

src/controller/Bridge.h

@@ -44,6 +44,7 @@
 #include "../input/onewire/SensorDallas.h"
 #include "../output/display/DisplayOLED128.h"
 
+bool initSSL();
 bool registerBridge();
 void restoreBridgeConfig();
 void restart();