SD card enable flag

src/drivers/devices/esp32CAM.h

@@ -6,6 +6,8 @@
 
 #define NO_DISPLAY
 
+#define BUILD_SDMMC
+
 #define SDMMC_CLK 14
 #define SDMMC_CMD 15
 #define SDMMC_D0 2

src/drivers/storage/SDCard.h

@@ -1,135 +1,153 @@
 #ifndef _SDCARD_H_
 #define _SDCARD_H_
 
-#include <FS.h>
-#include <SD_MMC.h>
-#include <SD.h>
-
-#include <ArduinoJson.h>
-
 #include "..\drivers.h"
 #include "storage.h"
 #include "SPIStorage.h"
 
 class SDCard
 {
-private:
-    bool cardInitialized_;
 public:
-    SDCard()
+    SDCard();
-    {
+    ~SDCard();
-        cardInitialized_ = false;
+    void SD2SPIStorage(SPIStorage* spifs);
-    }
+    bool loadConfigFile(TSettings* Settings);
+private:
+    bool initSDcard();
 
-    ~SDCard()
+    bool cardInitialized_;
-    {
+};
-        if (cardInitialized_)
-            SD_MMC.end();
-    }
 
-    void SD2SPIStorage(SPIStorage* spifs)
+
+#ifdef BUILD_SDMMC
+
+#include <FS.h>
+#include <SD_MMC.h>
+
+#include <ArduinoJson.h>
+
+SDCard::SDCard()
+{
+    cardInitialized_ = false;
+}
+
+SDCard::~SDCard()
+{
+    if (cardInitialized_)
+        SD_MMC.end();
+}
+
+void SDCard::SD2SPIStorage(SPIStorage* spifs)
+{
+    TSettings Settings;
+    if (loadConfigFile(&Settings))
     {
-        TSettings Settings;
+        spifs->saveConfigFile(&Settings);
-        if (loadConfigFile(&Settings))
+        WiFi.begin(Settings.WifiSSID, Settings.WifiPW);
+        Serial.println("SDCard: Settings transfered to internal memory. Restarting now.");
+        ESP.restart();
+    }
+}
+
+bool SDCard::loadConfigFile(TSettings* Settings)
+{
+    // Load existing configuration file
+    // Read configuration from FS json
+    Serial.println("SDCard: Mounting File System...");
+
+    if (initSDcard())
+    {
+        if (SD_MMC.exists(JSON_CONFIG_FILE))
         {
-            spifs->saveConfigFile(&Settings);
+            // The file exists, reading and loading
-            WiFi.begin(Settings.WifiSSID, Settings.WifiPW);
+            Serial.println("SDCard: Reading config file");
-            Serial.println("SDCard: Settings transfered to internal memory. Restarting now.");
+            File configFile = SD_MMC.open(JSON_CONFIG_FILE, "r");
-            ESP.restart();
+            if (configFile)
-        }
-    }
-
-    bool loadConfigFile(TSettings* Settings)
-    {
-        // Load existing configuration file
-        // Read configuration from FS json
-        Serial.println("SDCard: Mounting File System...");
-
-        if (initSDcard())
-        {
-            if (SD_MMC.exists(JSON_CONFIG_FILE))
             {
-                // The file exists, reading and loading
+                Serial.println("SDCard: Opened configuration file");
-                Serial.println("SDCard: Reading config file");
+                StaticJsonDocument<512> json;
-                File configFile = SD_MMC.open(JSON_CONFIG_FILE, "r");
+                DeserializationError error = deserializeJson(json, configFile);
-                if (configFile)
+                configFile.close();
+                serializeJsonPretty(json, Serial);
+                Serial.print('\n');
+                if (!error)
                 {
-                    Serial.println("SDCard: Opened configuration file");
+                    Serial.println("SDCard: Parsing JSON");
-                    StaticJsonDocument<512> json;
+                    strcpy(Settings->WifiSSID, json[JSON_KEY_SSID] | Settings->WifiSSID);
-                    DeserializationError error = deserializeJson(json, configFile);
+                    strcpy(Settings->WifiPW, json[JSON_KEY_PASW] | Settings->WifiPW);
-                    configFile.close();
+                    strcpy(Settings->PoolAddress, json[JSON_KEY_POOLURL] | Settings->PoolAddress);
-                    serializeJsonPretty(json, Serial);
+                    strcpy(Settings->BtcWallet, json[JSON_KEY_WALLETID] | Settings->BtcWallet);
-                    Serial.print('\n');
+                    if (json.containsKey(JSON_KEY_POOLPORT))
-                    if (!error)
+                        Settings->PoolPort = json[JSON_KEY_POOLPORT].as<int>();
-                    {
+                    if (json.containsKey(JSON_KEY_TIMEZONE))
-                        Serial.println("SDCard: Parsing JSON");
+                        Settings->Timezone = json[JSON_KEY_TIMEZONE].as<int>();
-                        strcpy(Settings->WifiSSID, json[JSON_KEY_SSID] | Settings->WifiSSID);
+                    SD_MMC.end();
-                        strcpy(Settings->WifiPW, json[JSON_KEY_PASW] | Settings->WifiPW);
+                    return true;
-                        strcpy(Settings->PoolAddress, json[JSON_KEY_POOLURL] | Settings->PoolAddress);
+                }
-                        strcpy(Settings->BtcWallet, json[JSON_KEY_WALLETID] | Settings->BtcWallet);
+                else
-                        if (json.containsKey(JSON_KEY_POOLPORT))
+                {
-                            Settings->PoolPort = json[JSON_KEY_POOLPORT].as<int>();
+                    // Error loading JSON data
-                        if (json.containsKey(JSON_KEY_TIMEZONE))
+                    Serial.println("SDCard: Failed to load json config");
-                            Settings->Timezone = json[JSON_KEY_TIMEZONE].as<int>();
-                        SD_MMC.end();
-                        return true;
-                    }
-                    else
-                    {
-                        // Error loading JSON data
-                        Serial.println("SDCard: Failed to load json config");
-                    }
                 }
             }
-            else
-            {
-                Serial.println("SDCard: No config file available!");        
-            }
-            SD_MMC.end();
-        }
-        return false;
-    }
-
-private:
-
-    bool initSDcard()
-    {
-        if((cardInitialized_)&&(SD_MMC.cardType() != CARD_NONE))
-        {
-            Serial.println("SDCard: Already mounted.");
-            return cardInitialized_;
-        }
-
-        bool oneBitMode = true;
-#if defined (SDMMC_D0) && defined (SDMMC_D1) && defined (SDMMC_D2) && defined (SDMMC_D3)
-        if (SD_MMC.cardType() == CARD_NONE)
-        {
-            SD_MMC.setPins(SDMMC_CLK, SDMMC_CMD, SDMMC_D0, SDMMC_D1, SDMMC_D2, SDMMC_D3);
-            oneBitMode = false;
-            Serial.println("SDCard: 4-Bit Mode.");
-        }
-#elif defined (SDMMC_D0) && !(defined (SDMMC_D1) && defined (SDMMC_D2) && defined (SDMMC_D3))
-        if (SD_MMC.cardType() == CARD_NONE)
-        {
-            SD_MMC.setPins(SDMMC_CLK, SDMMC_CMD, SDMMC_D0);
-            Serial.println("SDCard: 1-Bit Mode.");
-        }
-#else
-        Serial.println("SDCard: interface not available.");
-        return false;
-#endif // dataPinsDefined
-        cardInitialized_ = SD_MMC.begin("/sdcard", oneBitMode);
-        if ((cardInitialized_) && (SD_MMC.cardType() != CARD_NONE))
-        {
-            Serial.println("SDCard: Card mounted."); 
-            return true;
         }
         else
         {
-            Serial.println("SDCard: No card found.");
+            Serial.println("SDCard: No config file available!");        
-            return false;
         }
+        SD_MMC.end();
     }
-};
+    return false;
+}
+
+bool SDCard::initSDcard()
+{
+    if((cardInitialized_)&&(SD_MMC.cardType() != CARD_NONE))
+    {
+        Serial.println("SDCard: Already mounted.");
+        return cardInitialized_;
+    }
+
+    bool oneBitMode = true;
+#if defined (SDMMC_D0) && defined (SDMMC_D1) && defined (SDMMC_D2) && defined (SDMMC_D3)
+    if (SD_MMC.cardType() == CARD_NONE)
+    {
+        SD_MMC.setPins(SDMMC_CLK, SDMMC_CMD, SDMMC_D0, SDMMC_D1, SDMMC_D2, SDMMC_D3);
+        oneBitMode = false;
+        Serial.println("SDCard: 4-Bit Mode.");
+    }
+#elif defined (SDMMC_D0) && !(defined (SDMMC_D1) && defined (SDMMC_D2) && defined (SDMMC_D3))
+    if (SD_MMC.cardType() == CARD_NONE)
+    {
+        SD_MMC.setPins(SDMMC_CLK, SDMMC_CMD, SDMMC_D0);
+        Serial.println("SDCard: 1-Bit Mode.");
+    }
+#else
+    Serial.println("SDCard: interface not available.");
+    return false;
+#endif // dataPinsDefined
+    cardInitialized_ = SD_MMC.begin("/sdcard", oneBitMode);
+    if ((cardInitialized_) && (SD_MMC.cardType() != CARD_NONE))
+    {
+        Serial.println("SDCard: Card mounted."); 
+        return true;
+    }
+    else
+    {
+        Serial.println("SDCard: No card found.");
+        return false;
+    }
+}
+
+#else
+
+SDCard::SDCard() {}
+SDCard::~SDCard() {}
+void SDCard::SD2SPIStorage(SPIStorage* spifs) {};
+bool SDCard::loadConfigFile(TSettings* Settings) { return false; }
+bool SDCard::initSDcard() { return false; }
+
+#endif //BUILD_SDMMC
+
 
 #endif // _SDCARD_H_