andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-08 08:49:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

LITTLEFS->LittleFS

Browse Source
This commit is contained in:
MichaelDvP
2022-05-10 13:26:50 +02:00
parent 9202d799c6
commit 3168438d6f
4 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/framework/UploadFileService.cpp
View File

@@ -52,7 +52,7 @@ void UploadFileService::handleUpload(AsyncWebServerRequest * request, const Stri
} }
} else { } else {
// its a normal file, open a new temp file to write the contents too // its a normal file, open a new temp file to write the contents too
request->_tempFile = LITTLEFS.open(TEMP_FILENAME_PATH, "w"); request->_tempFile = LittleFS.open(TEMP_FILENAME_PATH, "w");
} }
} }

2
lib/framework/UploadFileService.h
View File

@@ -6,7 +6,7 @@
#include <Update.h> #include <Update.h>
#include <WiFi.h> #include <WiFi.h>
#include <LITTLEFS.h> #include <LittleFS.h>
#include <ESPAsyncWebServer.h> #include <ESPAsyncWebServer.h>
#include <SecurityManager.h> #include <SecurityManager.h>

16
src/emsesp.cpp
View File

@@ -742,7 +742,6 @@ std::string EMSESP::pretty_telegram(std::shared_ptr<const Telegram> telegram) {
std::string src_name(""); std::string src_name("");
std::string dest_name(""); std::string dest_name("");
std::string type_name(""); std::string type_name("");
std::string direction("");
for (const auto & emsdevice : emsdevices) { for (const auto & emsdevice : emsdevices) {
if (emsdevice) { if (emsdevice) {
// get src & dest // get src & dest
@@ -779,16 +778,15 @@ std::string EMSESP::pretty_telegram(std::shared_ptr<const Telegram> telegram) {
type_name = read_flash_string(F("?")); type_name = read_flash_string(F("?"));
} }
if (telegram->operation == Telegram::Operation::RX_READ) {
direction = read_flash_string(F("<-"));
} else {
direction = read_flash_string(F("->"));
}
std::string str; std::string str;
str.reserve(200); str.reserve(200);
str = src_name + "(" + Helpers::hextoa(src) + ") " + direction + " " + dest_name + "(" + Helpers::hextoa(dest) + "), " + type_name + "(" if (telegram->operation == Telegram::Operation::RX_READ) {
+ Helpers::hextoa(telegram->type_id) + "), data: " + telegram->to_string_message(); str = src_name + "(" + Helpers::hextoa(src) + ") <- " + dest_name + "(" + Helpers::hextoa(dest) + "), " + type_name + "("
+ Helpers::hextoa(telegram->type_id) + "), length: " + Helpers::hextoa(telegram->message_data[0]);
} else {
str = src_name + "(" + Helpers::hextoa(src) + ") -> " + dest_name + "(" + Helpers::hextoa(dest) + "), " + type_name + "("
+ Helpers::hextoa(telegram->type_id) + "), data: " + telegram->to_string_message();
}
if (offset) { if (offset) {
str += " (offset " + Helpers::itoa(offset) + ")"; str += " (offset " + Helpers::itoa(offset) + ")";

14
src/system.cpp
View File

@@ -897,7 +897,7 @@ bool System::check_upgrade() {
#ifndef EMSESP_STANDALONE #ifndef EMSESP_STANDALONE
// see if we have a temp file, if so try and read it // see if we have a temp file, if so try and read it
File new_file = LITTLEFS.open(TEMP_FILENAME_PATH); File new_file = LittleFS.open(TEMP_FILENAME_PATH);
if (new_file) { if (new_file) {
DynamicJsonDocument jsonDocument = DynamicJsonDocument(FS_BUFFER_SIZE); DynamicJsonDocument jsonDocument = DynamicJsonDocument(FS_BUFFER_SIZE);
DeserializationError error = deserializeJson(jsonDocument, new_file); DeserializationError error = deserializeJson(jsonDocument, new_file);
@@ -915,11 +915,7 @@ bool System::check_upgrade() {
reboot_required |= saveSettings(EMSESP_SETTINGS_FILE, "Settings", input); reboot_required |= saveSettings(EMSESP_SETTINGS_FILE, "Settings", input);
} else if (settings_type == "customizations") { } else if (settings_type == "customizations") {
// it's a customization file, just replace it and there's no need to reboot // it's a customization file, just replace it and there's no need to reboot
LOG_INFO(F("Applying new customizations")); saveSettings(EMSESP_CUSTOMIZATION_FILE, "Customization", input);
new_file.close();
LITTLEFS.remove(EMSESP_CUSTOMIZATION_FILE);
LITTLEFS.rename(TEMP_FILENAME_PATH, EMSESP_CUSTOMIZATION_FILE);
return false; // no reboot required
} else { } else {
LOG_ERROR(F("Unrecognized file uploaded")); LOG_ERROR(F("Unrecognized file uploaded"));
} }
@@ -929,7 +925,7 @@ bool System::check_upgrade() {
// close (just in case) and remove the file // close (just in case) and remove the file
new_file.close(); new_file.close();
LITTLEFS.remove(TEMP_FILENAME_PATH); LittleFS.remove(TEMP_FILENAME_PATH);
} }
#endif #endif
@@ -944,7 +940,7 @@ bool System::command_commands(const char * value, const int8_t id, JsonObject &
// convert settings file into json object // convert settings file into json object
void System::extractSettings(const char * filename, const char * section, JsonObject & output) { void System::extractSettings(const char * filename, const char * section, JsonObject & output) {
#ifndef EMSESP_STANDALONE #ifndef EMSESP_STANDALONE
File settingsFile = LITTLEFS.open(filename); File settingsFile = LittleFS.open(filename);
if (settingsFile) { if (settingsFile) {
DynamicJsonDocument jsonDocument = DynamicJsonDocument(EMSESP_JSON_SIZE_XLARGE_DYN); DynamicJsonDocument jsonDocument = DynamicJsonDocument(EMSESP_JSON_SIZE_XLARGE_DYN);
DeserializationError error = deserializeJson(jsonDocument, settingsFile); DeserializationError error = deserializeJson(jsonDocument, settingsFile);
@@ -965,7 +961,7 @@ bool System::saveSettings(const char * filename, const char * section, JsonObjec
#ifndef EMSESP_STANDALONE #ifndef EMSESP_STANDALONE
JsonObject section_json = input[section]; JsonObject section_json = input[section];
if (section_json) { if (section_json) {
File section_file = LITTLEFS.open(filename, "w"); File section_file = LittleFS.open(filename, "w");
if (section_file) { if (section_file) {
LOG_INFO(F("Applying new %s settings"), section); LOG_INFO(F("Applying new %s settings"), section);
serializeJson(section_json, section_file); serializeJson(section_json, section_file);