WantClue/NerdNos-Firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
elmo128 2023-09-15 01:01:32 +02:00
parent 83938f7210
commit 309f20940e
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
platformio.ini
View File

@ -140,6 +140,7 @@ build_flags =
-D ESP32_CAM -D ESP32_CAM
-D MONITOR_SPEED=${this.monitor_speed} -D MONITOR_SPEED=${this.monitor_speed}
lib_deps = lib_deps =
;https://github.com/takkaO/OpenFontRender
bblanchon/ArduinoJson@^6.21.2 bblanchon/ArduinoJson@^6.21.2
https://github.com/tzapu/WiFiManager.git https://github.com/tzapu/WiFiManager.git
mathertel/OneButton @ ^2.0.3 mathertel/OneButton @ ^2.0.3

3
src/drivers/storage/SDCard.h
View File

@ -5,6 +5,7 @@
#include "storage.h" #include "storage.h"
#include "nvMemory.h" #include "nvMemory.h"
// Handles the transfer of settings from sd card to nv memory (wifi credentials are handled by wifimanager)
class SDCard class SDCard
{ {
public: public:
@ -143,7 +144,7 @@ bool SDCard::initSDcard()
SDCard::SDCard() {} SDCard::SDCard() {}
SDCard::~SDCard() {} SDCard::~SDCard() {}
void SDCard::SD2NVMemory(NVMemory* nvMem) {}; void SDCard::SD2nvMemory(nvMemory* nvMem) {};
bool SDCard::loadConfigFile(TSettings* Settings) { return false; } bool SDCard::loadConfigFile(TSettings* Settings) { return false; }
bool SDCard::initSDcard() { return false; } bool SDCard::initSDcard() { return false; }

16
src/drivers/storage/nvMemory.h
View File

@ -1,11 +1,13 @@
#ifndef _NVMEMORY_H_ #ifndef _NVMEMORY_H_
#define _NVMEMORY_H_ #define _NVMEMORY_H_
#define BUILD_SPIFFS // we only have one implementation right now and nothing to choose from.
#define NVMEM_SPIFFS
#include "..\drivers.h" #include "..\drivers.h"
#include "storage.h" #include "storage.h"
// Handles load and store of user settings, except wifi credentials. Those are managed by the wifimanager.
class nvMemory class nvMemory
{ {
public: public:
@ -19,14 +21,13 @@ private:
bool Initialized_; bool Initialized_;
}; };
#ifdef BUILD_SPIFFS #ifdef NVMEM_SPIFFS
#define ESP_DRD_USE_SPIFFS true #define ESP_DRD_USE_SPIFFS true
#include <SPIFFS.h> #include <SPIFFS.h>
#include <FS.h> #include <FS.h>
#include <ArduinoJson.h> #include <ArduinoJson.h>
#include <WiFiManager.h>
nvMemory::nvMemory() nvMemory::nvMemory()
{ {
@ -147,21 +148,16 @@ bool nvMemory::init()
#else #else
#error We need some kind of permanent storage here! #error We need some kind of permanent storage implemented here!
nvMemory::nvMemory() {} nvMemory::nvMemory() {}
nvMemory::~nvMemory() {} nvMemory::~nvMemory() {}
bool nvMemory::saveConfig(TSettings* Settings) { return false; } bool nvMemory::saveConfig(TSettings* Settings) { return false; }
bool nvMemory::loadConfig(TSettings* Settings) { return false; } bool nvMemory::loadConfig(TSettings* Settings) { return false; }
bool nvMemory::deleteConfig() { return false; } bool nvMemory::deleteConfig() { return false; }
bool nvMemory::init() { return false; } bool nvMemory::init() { return false; }
#endif //BUILD_SPIFFS #endif //NVMEM_TYPE
#endif // _NVMEMORY_H_ #endif // _NVMEMORY_H_