diff --git a/data_svelte/build/bundle.css.gz b/data_svelte/build/bundle.css.gz
index a4f468ce..6b67d849 100644
Binary files a/data_svelte/build/bundle.css.gz and b/data_svelte/build/bundle.css.gz differ
diff --git a/data_svelte/build/bundle.js.gz b/data_svelte/build/bundle.js.gz
index 4fd4d387..34de4408 100644
Binary files a/data_svelte/build/bundle.js.gz and b/data_svelte/build/bundle.js.gz differ
diff --git a/data_svelte/index.html b/data_svelte/index.html
index f717663f..d23cc8a1 100644
--- a/data_svelte/index.html
+++ b/data_svelte/index.html
@@ -4,7 +4,7 @@
-
IoT Manager 4.3.0
+ IoT Manager 4.3.1
diff --git a/include/EspFileSystem.h b/include/EspFileSystem.h
index fbae8a7b..1906a6e2 100644
--- a/include/EspFileSystem.h
+++ b/include/EspFileSystem.h
@@ -45,3 +45,4 @@ extern const String getUniqueId(const char* name);
extern uint32_t ESP_getChipId(void);
extern uint32_t ESP_getFlashChipId(void);
extern const String getMacAddress();
+extern const String getWebVersion();
diff --git a/src/EspFileSystem.cpp b/src/EspFileSystem.cpp
index d7ec44ad..3065fea6 100644
--- a/src/EspFileSystem.cpp
+++ b/src/EspFileSystem.cpp
@@ -48,6 +48,14 @@ const String getUniqueId(const char* name) {
return String(name) + getMacAddress();
}
+const String getWebVersion() {
+ String text = readFile("/index.html", 2000);
+ text = selectFromMarkerToMarker(text, "title", 1);
+ text = selectFromMarkerToMarker(text, " ", 2);
+ text.replace("", "");
+ return text;
+}
+
uint32_t ESP_getChipId(void) {
#ifdef ESP32
uint32_t id = 0;
diff --git a/src/Main.cpp b/src/Main.cpp
index e34b49c2..9fd43e63 100644
--- a/src/Main.cpp
+++ b/src/Main.cpp
@@ -16,10 +16,15 @@ void setup() {
Serial.println(F("--------------started----------------"));
//создание экземпляров классов
- myNotAsyncActions = new NotAsync(do_LAST);
+ // myNotAsyncActions = new NotAsync(do_LAST);
//инициализация файловой системы
fileSystemInit();
+ Serial.println(F("------------------------"));
+ Serial.println("FIRMWARE NAME " + String(FIRMWARE_NAME));
+ Serial.println("FIRMWARE VERSION " + String(FIRMWARE_VERSION));
+ Serial.println("WEB VERSION " + getWebVersion());
+ Serial.println(F("------------------------"));
//получение chip id
setChipId();
diff --git a/src/PeriodicTasks.cpp b/src/PeriodicTasks.cpp
index 4ef4f151..9885aafc 100644
--- a/src/PeriodicTasks.cpp
+++ b/src/PeriodicTasks.cpp
@@ -3,7 +3,7 @@
void periodicTasksInit() {
//задачи редкого выполнения
ts.add(
- PTASK, 1000 * 30, [&](void*) {
+ PTASK, 1000 * 60, [&](void*) {
// fs
getFSInfo();
// heap
@@ -22,6 +22,7 @@ void periodicTasksInit() {
// build ver
jsonWriteStr_(errorsHeapJson, F("bver"), String(FIRMWARE_VERSION));
jsonWriteStr_(errorsHeapJson, F("bn"), String(FIRMWARE_NAME));
+ jsonWriteStr_(errorsHeapJson, F("wver"), getWebVersion());
// reset reason
jsonWriteStr_(errorsHeapJson, F("rst"), ESP_getResetReason());
periodicWsSend();
diff --git a/src/UpgradeFirm.cpp b/src/UpgradeFirm.cpp
index c20d4638..579255eb 100644
--- a/src/UpgradeFirm.cpp
+++ b/src/UpgradeFirm.cpp
@@ -48,7 +48,8 @@ bool upgradeFS() {
#endif
#ifdef ESP32
httpUpdate.rebootOnUpdate(false);
- HTTPUpdateResult retFS = httpUpdate.updateSpiffs(wifiClient, getBinPath("spiffs.bin"));
+ //обновляем little fs с помощью метода обновления spiffs
+ HTTPUpdateResult retFS = httpUpdate.updateSpiffs(wifiClient, getBinPath("littlefs.bin"));
#endif
//если FS обновилась успешно
diff --git a/src/modules/virtual/Logging/Loging.cpp b/src/modules/virtual/Logging/Loging.cpp
index db48b3c4..f90b6569 100644
--- a/src/modules/virtual/Logging/Loging.cpp
+++ b/src/modules/virtual/Logging/Loging.cpp
@@ -67,7 +67,7 @@ class Loging : public IoTItem {
String logData;
jsonWriteInt(logData, "x", unixTime);
- jsonWriteInt(logData, "y1", value.toFloat());
+ jsonWriteFloat(logData, "y1", value.toFloat());
//прочитаем путь к файлу последнего сохранения
String filePath = readDataDB(id);