Fix the SD check and RTDB get File issue.

README.md

@@ -1,7 +1,7 @@
 # Firebase Arduino Client Library for ESP8266 and ESP32
 
 
-Google's Firebase Arduino Client Library for ESP8266 and ESP32 v2.2.0
+Google's Firebase Arduino Client Library for ESP8266 and ESP32 v2.2.1
 
 
 This library supports ESP8266 and ESP32 MCU from Espressif. The following are platforms in which the libraries are also available (RTDB only).
@@ -184,7 +184,7 @@ fbdo.setResponseSize(1024); //minimum size is 1024 bytes
 
 ### Important Information
 
-In ESP8266 Aruino Core SDK v3.x.x
+In ESP8266 Arduino Core SDK v3.x.x
 
 The free heap is significantly reduced as much as 5-6 kB from v2.7.4.
 

examples/RTDB/File/File.ino

@@ -93,7 +93,11 @@ void setup()
   fbdo.setResponseSize(1024);
 
   //Mount SD card
-  if (!SD.begin(15))
+#if defined(ESP32)
+  if (!Firebase.sdBegin(13, 14, 2, 15)) //SS, SCK,MISO, MOSI
+#elif defined(ESP8266)
+  if (!Firebase.sdBegin(15))  //SS
+#endif
   {
     Serial.println("SD Card mounted failed");
     return;
@@ -122,7 +126,6 @@ void setup()
   }
 
   file.close();
-
 }
 
 void loop()
@@ -163,6 +166,12 @@ void loop()
       Serial.println("PASSED");
       Serial.println("DATA");
 
+#if defined(ESP32)
+      Firebase.sdBegin(13, 14, 2, 15); //SS, SCK,MISO, MOSI
+#elif defined(ESP8266)
+      Firebase.sdBegin(15);   //SS
+#endif
+
       //Readout the downloaded file
       file = SD.open("/file2.txt", FILE_READ);
       int i = 0;
@@ -234,6 +243,12 @@ void loop()
         Serial.println("PASSED");
         Serial.println("DATA");
 
+#if defined(ESP32)
+        Firebase.sdBegin(13, 14, 2, 15); //SS, SCK,MISO, MOSI
+#elif defined(ESP8266)
+        Firebase.sdBegin(15); //SS
+#endif
+
         //Readout the downloaded file
         file = SD.open("/file3.txt", FILE_READ);
         int i = 0;

examples/Storage/Firebase_Storage/Download_File/Download_File.ino

@@ -90,10 +90,16 @@ void loop()
     {
         taskCompleted = true;
 
+#if defined(ESP32)
+        Firebase.sdBegin(13, 14, 2, 15); //SS, SCK,MISO, MOSI
+#elif defined(ESP8266)
+        Firebase.sdBegin(15); //SS
+#endif
+
         Serial.println("------------------------------------");
         Serial.println("Download file test...");
         //The file systems for flash and SD/SDMMC can be changed in FirebaseFS.h.
-        if (Firebase.Storage.download(&fbdo, STORAGE_BUCKET_ID /* Firebase Storage bucket id */, "path/to/file/filename" /* path of remote file stored in the bucket */, "/path/to/save/filename" /* path to local file */, mem_storage_type_flash /* memory storage type, mem_storage_type_flash and mem_storage_type_sd */))
+        if (Firebase.Storage.download(&fbdo, STORAGE_BUCKET_ID /* Firebase Storage bucket id */, "path/to/file/filename" /* path of remote file stored in the bucket */, "/path/to/save/filename" /* path to local file */, mem_storage_type_sd /* memory storage type, mem_storage_type_flash and mem_storage_type_sd */))
         {
             Serial.println("PASSED");
             Serial.println("------------------------------------");

library.json

@@ -1,6 +1,6 @@
 {
   "name": "Firebase Arduino Client Library for ESP8266 and ESP32",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "keywords": "communication, REST, esp32, esp8266, arduino",
   "description": "This client library provides the functions to work with Firebase Realtime database, Firestore, Storage and Cloud messaging.",
   "repository": {

library.properties

@@ -1,6 +1,6 @@
 name=Firebase Arduino Client Library for ESP8266 and ESP32
 
-version=2.2.0
+version=2.2.1
 
 author=Mobizt
 

src/Firebase_ESP_Client.cpp

@@ -1,5 +1,5 @@
 /**
- * Google's Firebase ESP Client Main class, Firebase_ESP_Client.h version 2.2.0
+ * Google's Firebase ESP Client Main class, Firebase_ESP_Client.h version 2.2.1
  *
  * This library supports Espressif ESP8266 and ESP32
  *

src/Firebase_ESP_Client.h

@@ -1,5 +1,5 @@
 /**
- * Google's Firebase ESP Client Main class, Firebase_ESP_Client.h version 2.2.0
+ * Google's Firebase ESP Client Main class, Firebase_ESP_Client.h version 2.2.1
  * 
  * This library supports Espressif ESP8266 and ESP32
  * 

src/README.md

@@ -1,7 +1,7 @@
 # Firebase Arduino Client Library for ESP8266 and ESP32
 
 
-Google's Firebase Arduino Client Library for ESP8266 and ESP32 v2.2.0
+Google's Firebase Arduino Client Library for ESP8266 and ESP32 v2.2.1
 
 
 The default filessystem used in the library is flash and SD.

src/Utils.h

@@ -1,9 +1,9 @@
 /**
- * Google's Firebase Util class, Utils.h version 1.0.11
+ * Google's Firebase Util class, Utils.h version 1.0.12
  * 
  * This library supports Espressif ESP8266 and ESP32
  * 
- * Created May 4, 2021
+ * Created May 17, 2021
  * 
  * This work is a part of Firebase ESP Client library
  * Copyright (c) 2021 K. Suwatchai (Mobizt)
@@ -1608,6 +1608,8 @@ class UtilsClass
 
         std::string().swap(filepath);
 
+        config->_int.fb_sd_rdy = true;
+
         return true;
     }
 

src/rtdb/FB_RTDB.cpp

@@ -1,9 +1,9 @@
 /**
- * Google's Firebase Realtime Database class, FB_RTDB.cpp version 1.0.15
+ * Google's Firebase Realtime Database class, FB_RTDB.cpp version 1.0.16
  * 
  * This library supports Espressif ESP8266 and ESP32
  * 
- * Created May 7, 2021
+ * Created May 17, 2021
  * 
  * This work is a part of Firebase ESP Client library
  * Copyright (c) 2021 K. Suwatchai (Mobizt)
@@ -3580,8 +3580,23 @@ bool FB_RTDB::processRequest(FirebaseData *fbdo, struct fb_esp_rtdb_request_info
             fbdo->setQuery(req->data.query);
     }
     else if (req->data.type == d_file)
+    {
         fbdo->_ss.rtdb.file_name = req->filename;
 
+        if (req->method == m_get)
+        {
+            if (req->storageType == mem_storage_type_flash && !Signer.getCfg()->_int.fb_flash_rdy)
+                ut->flashTest();
+            else if (req->storageType == mem_storage_type_sd && !Signer.getCfg()->_int.fb_sd_rdy)
+                ut->sdTest(Signer.getCfg()->_int.fb_file);
+
+            if (Signer.getCfg()->_int.fb_flash_rdy)
+                Signer.getCfg()->_int.fb_file = FLASH_FS.open(fbdo->_ss.rtdb.file_name.c_str(), "w");
+            else if (Signer.getCfg()->_int.fb_sd_rdy)
+                Signer.getCfg()->_int.fb_file = SD_FS.open(fbdo->_ss.rtdb.file_name.c_str(), FILE_WRITE);
+        }
+    }
+
     fbdo->_ss.rtdb.queue_ID = 0;
 
     uint8_t errCount = 0;
@@ -3732,7 +3747,6 @@ bool FB_RTDB::handleRequest(FirebaseData *fbdo, struct fb_esp_rtdb_request_info_
     if (!fbdo->reconnect() || !fbdo->tokenReady() || !fbdo->validRequest(req->path))
         return false;
 
-
     if ((req->method == m_put || req->method == m_post || req->method == m_patch || req->method == m_patch_nocontent || req->method == m_set_rules) && req->payload.length() == 0 && req->data.type != d_string && req->data.type != d_blob && req->data.type != d_file)
     {
         fbdo->_ss.http_code = FIREBASE_ERROR_HTTP_CODE_BAD_REQUEST;
@@ -3778,7 +3792,6 @@ bool FB_RTDB::handleRequest(FirebaseData *fbdo, struct fb_esp_rtdb_request_info_
         }
         else if (req->method == m_download || (req->data.type == d_file && req->method == m_get))
         {
-
             if (!waitResponse(fbdo))
             {
                 fbdo->closeSession();

src/rtdb/FB_RTDB.h

@@ -1,9 +1,9 @@
 /**
- * Google's Firebase Realtime Database class, FB_RTDB.h version 1.0.15
+ * Google's Firebase Realtime Database class, FB_RTDB.h version 1.0.16
  * 
  * This library supports Espressif ESP8266 and ESP32
  * 
- * Created May 7, 2021
+ * Created May 17, 2021
  * 
  * This work is a part of Firebase ESP Client library
  * Copyright (c) 2021 K. Suwatchai (Mobizt)