версия 428 исправлены все баги

This commit is contained in:
Dmitry Borisenko
2022-09-29 22:48:33 +02:00
parent 27e30ab0ff
commit 8f708b9c13
11 changed files with 15 additions and 55 deletions

View File

@@ -118,12 +118,14 @@ void putUserDataToRam() {
update.configJson = readFile("config.json", 4096);
update.settingsFlashJson = readFile("settings.json", 4096);
update.layoutJson = readFile("layout.json", 4096);
update.scenarioTxt = readFile("scenario.txt", 4096);
}
void saveUserDataToFlash() {
writeFile("/config.json", update.configJson);
writeFile("/settings.json", update.settingsFlashJson);
writeFile("/layout.json", update.layoutJson);
writeFile("/scenario.txt", update.scenarioTxt);
}
void handleUpdateStatus(bool send, int state) {

View File

@@ -980,12 +980,12 @@ void IoTScenario::loadScenario(String fileName) { // подготавливае
return;
}
strFromFile = file.readString();
strFromFile.replace("{\"scen\":\"", "");
strFromFile.replace("\\n", "\n");
strFromFile.replace("\\\"", "\"");
strFromFile.replace(";", " ");
strFromFile.replace("\\t", " ");
strFromFile.remove(strFromFile.length() - 2, 2);
// strFromFile.replace("{\"scen\":\"", "");
// strFromFile.replace("\\n", "\n");
// strFromFile.replace("\\\"", "\"");
// strFromFile.replace(";", " ");
// strFromFile.replace("\\t", " ");
// strFromFile.remove(strFromFile.length() - 2, 2);
Serial.printf("strFromFile: %s, %s\n", strFromFile.c_str(), fileName.c_str());
file.close();
}

View File

@@ -9,6 +9,8 @@ void writeFileUint8tByFrames(const String& filename, uint8_t*& big_buf, size_t l
return;
}
size_t written{headerLenth};
// SerialPrint("i", "test", filename + ": length=" + String(length) + ", written=" + String(written));
if (length == written) file.print(" ");
while (length > written) {
size_t size = length - written;
if (size > frameSize) size = frameSize;