Implement SD Logging with config (slow!)

Author: SciLor

BoxConfig.cpp

@@ -70,6 +70,10 @@ String BoxConfig::getAsJson() {
     wifiDoc["ssid"] = wifiCfg->ssid;
     wifiDoc["password"] = wifiCfg->password;
 
+    JsonObject logDoc = doc.createNestedObject("log");
+    ConfigLog* logCfg = &_config.log;
+    logDoc["sdLog"] = logCfg->sdLog;
+
     serializeJson(doc, json);
     return json;
 }
@@ -102,6 +106,10 @@ bool BoxConfig::setFromJson(String json) {
     strncpy(&wifiCfg->ssid[0], wifiDoc["ssid"].as<char*>(), sizeof(wifiCfg->ssid));
     strncpy(&wifiCfg->password[0], wifiDoc["password"].as<char*>(), sizeof(wifiCfg->password));
 
+    JsonObject logDoc = doc["log"];
+    ConfigLog* logCfg = &_config.log;
+    logCfg->sdLog = logDoc["sdLog"].as<bool>();
+
     // Convert old config version to latest one.
     if (_config.version != CONFIG_ACTIVE_VERSION) {
         switch (_config.version) {
@@ -142,4 +150,7 @@ void BoxConfig::_initializeConfig() {
     #ifdef WIFI_PASS
         strcpy(wifi->password, WIFI_PASS); 
     #endif
+
+    ConfigLog* log = &_config.log;
+    log->sdLog = false;
 }

BoxConfig.h

@@ -5,7 +5,10 @@
 #include "ConfigStructures.h"
 #include "BoxSD.h"
 
-#define BOXCONFIG_JSON_SIZE 447 //Size from https://arduinojson.org/v6/assistant/
+
+#define BOXCONFIG_JSON_SIZE 489
+//{"version":255,"battery":{"voltageFactor":4294967295,"voltageChargerFactor":4294967295,"lowAdc":65535,"criticalAdc":65535,"sleepMinutes":255},"buttonEars":{"longPressMs":65535,"veryLongPressMs":65535},"wifi":{"ssid":"12345678901234567890123456789012","password":"1234567890123456789012345678901234567890123456789012345678901234"},"log":{"sdLog":false}}
+//Size from https://arduinojson.org/v6/assistant/
 
 class BoxConfig {
     public:

BoxSD.cpp

@@ -1,6 +1,7 @@
 #include "BoxSD.h"
 
 void BoxSD::begin() { 
+    _initialized = false;
     Log.info("Initialize SD card");
     int result = FatFs.begin();
     if (!result) {
@@ -10,12 +11,17 @@ void BoxSD::begin() {
 
     Log.info(" Capacity: %iMB", FatFs.capacity()/1024);
     Log.info(" Free: %iMB", FatFs.free()/1024);
+    _initialized = true;
 }
 
 void BoxSD::loop() { 
 
 }
 
+bool BoxSD::isInitialized() {
+    return _initialized;
+}
+
 void BoxSD::webJsonListDir(WebServer* webServer, char* directory) {
     DirFs dir; 
     if (dir.openDir(directory)) {

BoxSD.h

@@ -11,8 +11,11 @@ class BoxSD {
             begin(),
             loop();
 
+        bool isInitialized();
+
         void webJsonListDir(WebServer* webServer, char* directory);
     private:
+        bool _initialized = false;
 };
 
 #endif

ConfigStructures.h

@@ -25,25 +25,26 @@ typedef struct {
 
 typedef struct {
   char ssid[32];
-  char spacer1[32];
   char password[64];
-  char spacer2[64];
 
   bool dhcp;
   ConfigIP ip;
   ConfigIP subnet;
   ConfigIP dns;
-  char spacer3[16];
 
   char hostname[32];
-  char spacer4[128];
 } ConfigWifi;
 
+typedef struct {
+  bool sdLog;
+} ConfigLog;
+
 typedef struct {
   uint8_t version;
   ConfigBattery battery;
   ConfigButtonEars buttonEars;
   ConfigWifi wifi;
+  ConfigLog log;
 } ConfigStruct;
 
 #endif

Hackiebox.cpp

@@ -9,7 +9,7 @@ void Hackiebox::setup() {
         //reset box?!
     }
 
-    Log.init(LOG_LEVEL_VERBOSE, 115200/*, &logStream*/);
+    Log.init(LOG_LEVEL_VERBOSE, 115200, &logStreamSd);
     Log.info("Booting Hackiebox, Free MEM=%ib...", freeMemory());
 
     Wire.begin();

Hackiebox.h

@@ -23,7 +23,8 @@
 #include "WrapperWiFi.h"
 #include "WrapperWebServer.h"
 
-#include "LogStream.h"
+#include "LogStreamSd.h"
+#include "LogStreamSse.h"
 
 class Hackiebox { 
     public:
@@ -52,7 +53,8 @@ class Hackiebox {
         WrapperWiFi boxWiFi;
         WrapperWebServer webServer;
 
-        LogStream logStream;
+        LogStreamSd logStreamSd;
+        LogStreamSse logStreamSse;
 
     private:/*
         typedef void (*fAPPWDTDevCallbk)();

LogStreamSd.cpp

@@ -0,0 +1,40 @@
+#include "LogStreamSd.h"
+
+#include "WrapperWebServer.h"
+#include "Hackiebox.h"
+
+#include <Logging.h>
+
+size_t LogStreamSd::write(uint8_t character) {
+    write(&character, 1);
+}
+size_t LogStreamSd::write(const uint8_t *buffer, size_t size) {
+    if (!Config.get()->log.sdLog)
+        return 0;
+    if (!Box.boxSD.isInitialized())
+        return 0;/*
+    if (!_isOpen) {
+        Log.enableAdditionalLogger(false);
+        Log.info("LogStreamSd::!_isOpen");
+        Log.enableAdditionalLogger(true);
+        _isOpen = _file.open("/revvox/logging.log", FA_OPEN_APPEND | FA_WRITE);
+        if (!_isOpen) 
+            return 0;
+    }*/
+    _isOpen = _file.open("/revvox/logging.log", FA_OPEN_APPEND | FA_WRITE);
+    if (!_isOpen) 
+        return 0;
+    uint32_t result = _file.write((void*)buffer, (uint32_t)size);
+    _file.close();
+    return result;
+}
+
+size_t LogStreamSd::println() {
+    size_t result = print("\r\n");
+    /*
+    if (_isOpen) {
+        _file.close();
+        _isOpen = false;
+    }*/
+    return result;
+}

LogStreamSd.h

@@ -0,0 +1,23 @@
+#ifndef LogStreamSd_h
+#define LogStreamSd_h
+
+#include <Stream.h>
+#include <FatFs.h>
+
+class LogStreamSd : public Stream {
+    public:
+        size_t println();
+
+        size_t write(uint8_t character);
+        size_t write(const uint8_t *buffer, size_t size);
+        int available() {};
+        int read(){};
+        void flush(){};
+        int peek(){};
+
+    private:
+        FileFs _file;
+        bool _isOpen = false;
+};
+
+#endif