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

update debug messages, comments

Browse Source
This commit is contained in:
elmo128 2023-09-15 12:43:13 +02:00
parent 59fbade347
commit a694427b7c
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/drivers/devices/esp32CAM.h
View File

@ -6,11 +6,11 @@
#define NO_DISPLAY #define NO_DISPLAY
#define BUILD_SDMMC // SDMMC interface: 1-bit mode (might cause issues):
#define SDMMC_CLK 14 #define SDMMC_CLK 14
#define SDMMC_CMD 15 #define SDMMC_CMD 15
#define SDMMC_D0 2 #define SDMMC_D0 2
// additional defines to enable 4-bit mode
#define SDMMC_D1 4 #define SDMMC_D1 4
#define SDMMC_D2 12 #define SDMMC_D2 12
#define SDMMC_D3 13 #define SDMMC_D3 13

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

@ -45,7 +45,7 @@ bool nvMemory::saveConfig(TSettings* Settings)
if (init()) if (init())
{ {
// Save Config in JSON format // Save Config in JSON format
Serial.println(F("SPIFS: Saving configuration...")); Serial.println(F("SPIFS: Saving configuration."));
// Create a JSON document // Create a JSON document
StaticJsonDocument<512> json; StaticJsonDocument<512> json;
@ -59,7 +59,7 @@ bool nvMemory::saveConfig(TSettings* Settings)
if (!configFile) if (!configFile)
{ {
// Error, file did not open // Error, file did not open
Serial.println("SPIFS: failed to open config file for writing"); Serial.println("SPIFS: Failed to open config file for writing");
return false; return false;
} }
@ -92,11 +92,10 @@ bool nvMemory::loadConfig(TSettings* Settings)
if (SPIFFS.exists(JSON_CONFIG_FILE)) if (SPIFFS.exists(JSON_CONFIG_FILE))
{ {
// The file exists, reading and loading // The file exists, reading and loading
Serial.println("SPIFS: Reading config file");
File configFile = SPIFFS.open(JSON_CONFIG_FILE, "r"); File configFile = SPIFFS.open(JSON_CONFIG_FILE, "r");
if (configFile) if (configFile)
{ {
Serial.println("SPIFS: Opened configuration file"); Serial.println("SPIFS: Loading config file");
StaticJsonDocument<512> json; StaticJsonDocument<512> json;
DeserializationError error = deserializeJson(json, configFile); DeserializationError error = deserializeJson(json, configFile);
configFile.close(); configFile.close();
@ -104,7 +103,6 @@ bool nvMemory::loadConfig(TSettings* Settings)
Serial.print('\n'); Serial.print('\n');
if (!error) if (!error)
{ {
Serial.println("SPIFS: Parsing JSON");
strcpy(Settings->PoolAddress, json[JSON_KEY_POOLURL] | Settings->PoolAddress); strcpy(Settings->PoolAddress, json[JSON_KEY_POOLURL] | Settings->PoolAddress);
strcpy(Settings->BtcWallet, json[JSON_KEY_WALLETID] | Settings->BtcWallet); strcpy(Settings->BtcWallet, json[JSON_KEY_WALLETID] | Settings->BtcWallet);
if (json.containsKey(JSON_KEY_POOLPORT)) if (json.containsKey(JSON_KEY_POOLPORT))
@ -116,9 +114,17 @@ bool nvMemory::loadConfig(TSettings* Settings)
else else
{ {
// Error loading JSON data // Error loading JSON data
Serial.println("SPIFS: Failed to load json config"); Serial.println("SPIFS: Error parsing config file!");
} }
} }
else
{
Serial.println("SPIFS: Error opening config file!");
}
}
else
{
Serial.println("SPIFS: No config file available!");
} }
} }
return false; return false;