diff --git a/data_full/build/bundle.css.gz b/data_full/build/bundle.css.gz index de44f689..19d2f663 100644 Binary files a/data_full/build/bundle.css.gz and b/data_full/build/bundle.css.gz differ diff --git a/data_full/build/bundle.js.gz b/data_full/build/bundle.js.gz index 729d6ae0..d4dc70e4 100644 Binary files a/data_full/build/bundle.js.gz and b/data_full/build/bundle.js.gz differ diff --git a/data_svelte/build/bundle.css.gz b/data_svelte/build/bundle.css.gz index de44f689..19d2f663 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 729d6ae0..d4dc70e4 100644 Binary files a/data_svelte/build/bundle.js.gz and b/data_svelte/build/bundle.js.gz differ diff --git a/myProfile.json b/myProfile.json index 9a32b8bc..9df5a735 100644 --- a/myProfile.json +++ b/myProfile.json @@ -170,6 +170,14 @@ "path": "src/modules/virtual/Loging", "active": true }, + { + "path": "src/modules/virtual/Loging2", + "active": false + }, + { + "path": "src/modules/virtual/Loging3", + "active": false + }, { "path": "src/modules/virtual/LogingDaily", "active": true @@ -428,7 +436,7 @@ }, { "path": "src/modules/exec/Buzzer", - "active": true + "active": false }, { "path": "src/modules/exec/EctoControlAdapter", @@ -506,6 +514,10 @@ "path": "src/modules/exec/SysExt", "active": false }, + { + "path": "src/modules/exec/Tca9555", + "active": false + }, { "path": "src/modules/exec/Telegram", "active": false diff --git a/src/StandWebServer.cpp b/src/StandWebServer.cpp index 6ac28403..4ff4c90c 100644 --- a/src/StandWebServer.cpp +++ b/src/StandWebServer.cpp @@ -198,12 +198,19 @@ void handleCors() { { typeOTAfile = FILESYSTEM; } - int updatePartition = (typeOTAfile == FIRMWARE)? U_FLASH : U_SPIFFS; + #ifdef ESP8266 + size_t size = upload.totalSize; + int updatePartition = (typeOTAfile == FIRMWARE)? U_FLASH : U_FS; //U_FS + //#endif + #else //ESP32 + size_t size = UPDATE_SIZE_UNKNOWN; + int updatePartition = (typeOTAfile == FIRMWARE)? U_FLASH : U_SPIFFS; //U_FS + #endif if (upload.status == UPLOAD_FILE_START) { //Serial.print("Начало загрузки: "); //Serial.println(upload.filename); SerialPrint("i", F("OTA"), "Начало загрузки файла: " + upload.filename); - if (!Update.begin(UPDATE_SIZE_UNKNOWN, updatePartition)) { + if (!Update.begin(size, updatePartition)) { // UPDATE_SIZE_UNKNOWN 0xFFFFFFFF Update.end(); SerialPrint("E", F("OTA"), "Ошибка: Недостаточно памяти"); HTTP.send(500, "text/plain", "Ошибка: Недостаточно памяти"); diff --git a/src/WsServer.cpp b/src/WsServer.cpp index 2adb1f5d..9acba04f 100644 --- a/src/WsServer.cpp +++ b/src/WsServer.cpp @@ -254,10 +254,18 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t* payload, size_t length) // Устанавливаем время if (settimeofday(&tv, NULL) == 0) { //Serial.printf("Время установлено: %ld\n", unixTime); - SerialPrint("i", F("Time"), "Время установлено из браузера: " + String(unixTime)); + #ifdef LIBRETINY + SerialPrint("i", F("Time"), "Время установлено из браузера: "); + #else + SerialPrint("i", F("Time"), "Время установлено из браузера: " + String(unixTime)); + #endif } else { + #ifdef LIBRETINY //Serial.printf("Ошибка установки времени: %ld\n", unixTime); + SerialPrint("i", F("=>WS"), "Ошибка установки времени: "); + #else SerialPrint("i", F("=>WS"), "Ошибка установки времени: " + String(unixTime)); + #endif } // timeval tv2{0, 0}; // timezone tz = timezone{0, 0}; diff --git a/src/modules/virtual/LogingHourly/LogingHourly.cpp b/src/modules/virtual/LogingHourly/LogingHourly.cpp index 4d4ed935..74ff9c74 100644 --- a/src/modules/virtual/LogingHourly/LogingHourly.cpp +++ b/src/modules/virtual/LogingHourly/LogingHourly.cpp @@ -160,7 +160,11 @@ public: SerialPrint("E", F("LogingHourly"), "'" + id + "' db file writing error, return"); return; } + #ifdef LIBRETINY + SerialPrint("i", F("LogingHourly"), "'" + id + "' file created http://" + ipToString(WiFi.localIP()) + path); + #else SerialPrint("i", F("LogingHourly"), "'" + id + "' file created http://" + WiFi.localIP().toString() + path); + #endif } void addNewDataToExistingFile(String &path, String &logData) @@ -171,7 +175,11 @@ public: SerialPrint("i", F("LogingHourly"), "'" + id + "' file writing error, return"); return; }; + #ifdef LIBRETINY + SerialPrint("i", F("LogingHourly"), "'" + id + "' LogingHourly in file http://" + ipToString(WiFi.localIP()) + path); + #else SerialPrint("i", F("LogingHourly"), "'" + id + "' LogingHourly in file http://" + WiFi.localIP().toString() + path); + #endif } const String getTimeLocal_hh() {