From 191e05b94165c7c65f76071af707e582bdc4f4af Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 29 Jun 2021 22:09:30 +0200 Subject: [PATCH] fixed config backup and restore --- esp32/include/FileUtils.h | 9 +++++ esp32/src/FileUtils.cpp | 81 ++++++++++++++++++++++++++++++++++++++ esp32/src/main.cpp | 83 ++++++++++++++------------------------- 3 files changed, 119 insertions(+), 54 deletions(-) create mode 100644 esp32/include/FileUtils.h create mode 100644 esp32/src/FileUtils.cpp diff --git a/esp32/include/FileUtils.h b/esp32/include/FileUtils.h new file mode 100644 index 0000000..0b66600 --- /dev/null +++ b/esp32/include/FileUtils.h @@ -0,0 +1,9 @@ +#ifndef FILEUTILS_H +#define FILEUTILS_H + +bool doesFileExist(const char *source); +bool copyFile(const char *source, const char *target); +bool deleteFile(const char *source); +void printFile(const char *source); + +#endif \ No newline at end of file diff --git a/esp32/src/FileUtils.cpp b/esp32/src/FileUtils.cpp new file mode 100644 index 0000000..48f69c0 --- /dev/null +++ b/esp32/src/FileUtils.cpp @@ -0,0 +1,81 @@ +#include +#include "FileUtils.h" + +bool deleteFile(const char *source) +{ + Serial << "deleting file " << source << endl; + if (!SPIFFS.begin()) + { + return false; + } + bool deleted = SPIFFS.remove(source); + if (deleted) + { + Serial << "Deleted " << source << endl; + } + else + { + Serial << "Could not delete " << source << endl; + } + return deleted; +} + +void printFile(const char *source) +{ + Serial << "printing file " << source << endl; + if (!SPIFFS.begin()) + { + Serial << "could not start spiffs " << source << endl; + return; + } + File file = SPIFFS.open(source, FILE_READ); + if (!file) + { + Serial << "could not start open " << source << endl; + return; + } + Serial << file.readString() << endl; + Serial << "Finished printing file " << source << endl; + file.close(); +} + +bool doesFileExist(const char *source) +{ + Serial << "checking if file exist " << source << endl; + if (!SPIFFS.begin()) + { + return false; + } + bool exists = SPIFFS.exists(source); + Serial << "File " << source << (exists ? "" : " not") << " found " << endl; + return exists; +} + +bool copyFile(const char *source, const char *target) +{ + Serial << "copy started " << source << " -> " << target << endl; + if (!SPIFFS.begin()) + { + return false; + } + + File file = SPIFFS.open(source, FILE_READ); + File file2 = SPIFFS.open(target, FILE_WRITE); + Serial.flush(); + if (!file) + { + Serial << "There was an error opening " << source << " for reading" << endl; + return false; + } + if (!file2) + { + Serial << "There was an error opening " << target << " for reading" << endl; + file.close(); + return false; + } + file2.println(file.readString()); + Serial << "copy finished " << source << " -> " << target << endl; + file.close(); + file2.close(); + return true; +} \ No newline at end of file diff --git a/esp32/src/main.cpp b/esp32/src/main.cpp index a83af1b..e27d85d 100644 --- a/esp32/src/main.cpp +++ b/esp32/src/main.cpp @@ -13,6 +13,7 @@ /****************************************************************************** * INCLUDES ******************************************************************************/ +#include "FileUtils.h" #include "PlantCtrl.h" #include "ControllerConfiguration.h" #include "HomieConfiguration.h" @@ -39,6 +40,8 @@ #define TEST_TOPIC "roundtrip\0" #define BACKUP_TOPIC "$implementation/config/backup/set\0" #define BACKUP_STATUS_TOPIC "$implementation/config/backup\0" +#define CONFIG_FILE "/homie/config.json" +#define CONFIG_FILE_BACKUP "/homie/config.json.bak" #define getTopic(test, topic) \ char *topic = new char[strlen(Homie.getConfiguration().mqtt.baseTopic) + strlen(Homie.getConfiguration().deviceId) + 1 + strlen(test) + 1]; \ @@ -328,55 +331,6 @@ void readPowerSwitchedSensors() digitalWrite(OUTPUT_ENABLE_SENSOR, LOW); } -bool copyFile(const char *source, const char *target) -{ - Serial << "copy started " << source << " -> " << target << endl; - byte buffer[512]; - if (!SPIFFS.begin()) - { - return false; - } - - File file = SPIFFS.open(source, FILE_READ); - File file2 = SPIFFS.open(target, FILE_WRITE); - Serial.flush(); - if (!file) - { - Serial << "There was an error opening " << source << " for reading" << endl; - SPIFFS.end(); - return false; - } - if (!file2) - { - Serial << "There was an error opening " << target << " for reading" << endl; - file.close(); - SPIFFS.end(); - return false; - } - while (file.available()) - { - int read = file.read(buffer, 512); - if (read < 0) - { - Serial << "copy file is fucked" << endl; - file.close(); - file2.close(); - SPIFFS.end(); - return false; - } - else - { - file.write(buffer, read); - } - } - file2.flush(); - Serial << "copy finished " << source << " -> " << target << endl; - file.close(); - file2.close(); - SPIFFS.end(); - return true; -} - void onMessage(char *incoming, char *payload, AsyncMqttClientMessageProperties properties, size_t len, size_t index, size_t total) { getTopic(TEST_TOPIC, testTopic); @@ -388,10 +342,14 @@ void onMessage(char *incoming, char *payload, AsyncMqttClientMessageProperties p getTopic(BACKUP_TOPIC, backupTopic); if (strcmp(incoming, backupTopic) == 0) { - bool backupSucessful = copyFile("/homie/config.json", "/homie/config.old"); - getTopic(BACKUP_STATUS_TOPIC, backupStatusTopic); - Homie.getMqttClient().publish(backupStatusTopic, 2, true, backupSucessful ? "true" : "false"); - delete backupStatusTopic; + if(strcmp(payload, "true") == 0){ + bool backupSucessful = copyFile(CONFIG_FILE, CONFIG_FILE_BACKUP); + printFile(CONFIG_FILE_BACKUP); + getTopic(BACKUP_STATUS_TOPIC, backupStatusTopic); + Homie.getMqttClient().publish(backupStatusTopic, 2, true, backupSucessful ? "true" : "false"); + delete backupStatusTopic; + Homie.getMqttClient().publish(backupTopic, 2, true, "false"); + } } delete backupTopic; } @@ -623,7 +581,8 @@ void setup() Serial.flush(); /************************* Start Homie Framework ***************/ Homie_setFirmware("PlantControl", FIRMWARE_VERSION); - + Homie.disableLedFeedback(); + Homie_setBrand("PlantControl"); // Set default values //in seconds @@ -642,6 +601,7 @@ void setup() Homie.onEvent(onHomieEvent); //Homie.disableLogging(); + Homie.setup(); mConfigured = Homie.isConfigured(); @@ -686,6 +646,21 @@ void setup() } else { + printFile("/homie/Readme.md"); + if (doesFileExist(CONFIG_FILE)){ + printFile(CONFIG_FILE); + } + if (doesFileExist(CONFIG_FILE_BACKUP)){ + printFile(CONFIG_FILE_BACKUP); + bool restoredConfig = copyFile(CONFIG_FILE_BACKUP, CONFIG_FILE); + if(restoredConfig){ + deleteFile(CONFIG_FILE_BACKUP); + espDeepSleepFor(1,false,false); + return; + } + } + + readOneWireSensors(false); //prevent BOD to be paranoid WRITE_PERI_REG(RTC_CNTL_BROWN_OUT_REG, 0);