iotmanager/IoTManager
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-30 11:59:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

40
data_svelte/build/bundle.css
View File

File diff suppressed because one or more lines are too long

BIN
data_svelte/build/bundle.css.gz Normal file
View File

Binary file not shown.

2
data_svelte/build/bundle.js
View File

File diff suppressed because one or more lines are too long

BIN
data_svelte/build/bundle.js.gz Normal file
View File

Binary file not shown.

6
data_svelte/index.html
View File

@@ -4,12 +4,12 @@
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta name="viewport" content="width=device-width,initial-scale=1" /> <meta name="viewport" content="width=device-width,initial-scale=1" />
<title>IoT Manager 4.3.7</title> <title>IoT Manager 4.3.8</title>
<link rel="icon" type="image/png" href="/favicon.ico" /> <link rel="icon" type="image/png" href="/favicon.ico" />
<link rel="stylesheet" href="/build/bundle.css?437" /> <link rel="stylesheet" href="/build/bundle.css?438" />
<script defer src="/build/bundle.js?437"></script> <script defer src="/build/bundle.js?438"></script>
</head> </head>
<body></body> <body></body>

3
data_svelte/scenario.txt
View File

@@ -1,3 +0,0 @@
{
"scen": ""
}

2
include/Const.h
View File

@@ -1,7 +1,7 @@
#pragma once #pragma once
//Версия прошивки //Версия прошивки
#define FIRMWARE_VERSION 427 #define FIRMWARE_VERSION 428
#ifdef esp8266_4mb #ifdef esp8266_4mb
#define FIRMWARE_NAME "esp8266_4mb" #define FIRMWARE_NAME "esp8266_4mb"

1
include/UpgradeFirm.h
View File

@@ -11,6 +11,7 @@ struct updateFirm {
String settingsFlashJson; String settingsFlashJson;
String configJson; String configJson;
String layoutJson; String layoutJson;
String scenarioTxt;
}; };
extern void upgradeInit(); extern void upgradeInit();

2
src/UpgradeFirm.cpp
View File

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

12
src/classes/IoTScenario.cpp
View File

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

2
src/utils/FileUtils.cpp
View File

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