Detect empty SPIFFS /data partition

Signed-off-by: John Walicki <[email protected]>

Author: johnwalicki

WatsonIoT/src/main.cpp

@@ -380,43 +380,49 @@ bool FirmwareVersionCheck( char *firmware_latest, String firmware_ota_url ) {
     // Launch an OTA upgrade
     NeoPixelStatus( LED_FIRMWARE_OTA ); // blink magenta
 
-    if( SPIFFS.begin(true) ) {
+    if( SPIFFS.begin(false) ) {
       Serial.printf("Opening Server PEM Chain : %s\r\n", DOWNLOAD_CERT_PEM_FILE);
-      File pemfile = SPIFFS.open( DOWNLOAD_CERT_PEM_FILE );
-      if( pemfile ) {
-        char *DownloadServerPemChain = nullptr;
-        size_t pemSize = pemfile.size();
-        DownloadServerPemChain = (char *)malloc(pemSize);
-
-        if( pemSize != pemfile.readBytes(DownloadServerPemChain, pemSize) ) {
-          Serial.printf("Reading %s pem server certificate chain failed.\r\n",DOWNLOAD_CERT_PEM_FILE);
-        } else {
-          Serial.printf("Read %s pem server certificate chain from SPIFFS\r\n",DOWNLOAD_CERT_PEM_FILE);
-          //Serial.write((const unsigned char*)DownloadServerPemChain,pemSize);
-
-          // Increase the watchdog timer before starting the firmware upgrade
-          // The download and write can trip the watchdog timer and the old firmware
-          // will abort / reset before the new firmware is complete.
-          esp_task_wdt_init(15,0);
-
-          Serial.println("Starting OpenEEW OTA firmware upgrade...");
-          esp_http_client_config_t config = {0};
-          config.url = firmware_ota_url.c_str() ;
-          config.cert_pem = DownloadServerPemChain ;
-          esp_err_t ret = esp_https_ota(&config);
-          if (ret == ESP_OK) {
-              Serial.println("OTA upgrade downloaded. Restarting...");
-              esp_restart();
-          } else {
-              esp_task_wdt_init(5,0);
-              Serial.println("The OpenEEW OTA firmware upgrade failed : ESP_FAIL");
+      if( SPIFFS.exists( DOWNLOAD_CERT_PEM_FILE )) {
+        File pemfile = SPIFFS.open( DOWNLOAD_CERT_PEM_FILE );
+        if( pemfile ) {
+          char *DownloadServerPemChain = nullptr;
+          size_t pemSize = pemfile.size();
+          if( pemSize == 0 ) {
+            DownloadServerPemChain = (char *)malloc(pemSize);
+            if( pemSize != pemfile.readBytes(DownloadServerPemChain, pemSize) ) {
+              Serial.printf("Reading %s pem server certificate chain failed.\r\n",DOWNLOAD_CERT_PEM_FILE);
+            } else {
+              Serial.printf("Read %s pem server certificate chain from SPIFFS\r\n",DOWNLOAD_CERT_PEM_FILE);
+              Serial.write((const unsigned char*)DownloadServerPemChain,pemSize);
+
+              // Increase the watchdog timer before starting the firmware upgrade
+              // The download and write can trip the watchdog timer and the old firmware
+              // will abort / reset before the new firmware is complete.
+              esp_task_wdt_init(15,0);
+
+              Serial.println("Starting OpenEEW OTA firmware upgrade...");
+              esp_http_client_config_t config = {0};
+              config.url = firmware_ota_url.c_str() ;
+              config.cert_pem = DownloadServerPemChain ;
+              esp_err_t ret = esp_https_ota(&config);
+              if (ret == ESP_OK) {
+                  Serial.println("OTA upgrade downloaded. Restarting...");
+                  esp_restart();
+              } else {
+                  esp_task_wdt_init(5,0);
+                  Serial.println("The OpenEEW OTA firmware upgrade failed : ESP_FAIL");
+              }
+            }
+            free( DownloadServerPemChain );
           }
+        } else {
+          Serial.println("Failed to open server pem chain.");
         }
-        free( DownloadServerPemChain );
+        pemfile.close();
       } else {
-          Serial.println("Failed to open server pem chain.");
+        Serial.printf("The %s pem server certificate file does not exist.\r\n",DOWNLOAD_CERT_PEM_FILE);
+        Serial.println("The SPIFFS filesystem might be empty.");
       }
-      pemfile.close();
     } else {
       Serial.println("An error has occurred while mounting SPIFFS");
     }
@@ -526,6 +532,8 @@ template<typename L> void loadFromFile(const char* fname, L&& load) {
     File f = SPIFFS.open(fname);
     load(f, f.size());
     f.close();
+  } else {
+    Serial.printf("The certificate does not exist: %s\r\n",fname);
   }
 }