mirror of
https://github.com/Laxilef/OTGateway.git
synced 2025-12-25 17:43:35 +05:00
Compare commits
3 Commits
9a2f9d64ec
...
5b7da4ed2a
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5b7da4ed2a | ||
|
|
8d516c7f95 | ||
|
|
d756716497 |
@@ -1,8 +1,5 @@
|
||||
#include <FS.h>
|
||||
#include <detail/mimetable.h>
|
||||
#if defined(ARDUINO_ARCH_ESP32)
|
||||
#include <detail/RequestHandlersImpl.h>
|
||||
#endif
|
||||
|
||||
using namespace mime;
|
||||
|
||||
@@ -54,13 +51,6 @@ public:
|
||||
if (this->eTag.isEmpty()) {
|
||||
if (server._eTagFunction) {
|
||||
this->eTag = (server._eTagFunction)(*this->fs, this->path);
|
||||
|
||||
} else {
|
||||
#if defined(ARDUINO_ARCH_ESP8266)
|
||||
this->eTag = esp8266webserver::calcETag(*this->fs, this->path);
|
||||
#elif defined(ARDUINO_ARCH_ESP32)
|
||||
this->eTag = StaticRequestHandler::calcETag(*this->fs, this->path);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -20,8 +20,7 @@ lib_deps =
|
||||
bblanchon/ArduinoJson@^7.3.0
|
||||
;ihormelnyk/OpenTherm Library@^1.1.5
|
||||
https://github.com/ihormelnyk/opentherm_library#master
|
||||
;arduino-libraries/ArduinoMqttClient@^0.1.8
|
||||
https://github.com/Laxilef/ArduinoMqttClient.git#esp32_core_310
|
||||
arduino-libraries/ArduinoMqttClient@^0.1.8
|
||||
lennarthennigs/ESP Telnet@^2.2
|
||||
gyverlibs/FileData@^1.0.2
|
||||
gyverlibs/GyverPID@^3.3.2
|
||||
@@ -85,7 +84,7 @@ board_build.ldscript = eagle.flash.4m1m.ld
|
||||
;platform_packages =
|
||||
; framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.5
|
||||
; framework-arduinoespressif32-libs @ https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.1/esp32-arduino-libs-idf-release_v5.1-33fbade6.zip
|
||||
platform = https://github.com/pioarduino/platform-espressif32/releases/download/53.03.10/platform-espressif32.zip
|
||||
platform = https://github.com/pioarduino/platform-espressif32/releases/download/53.03.11/platform-espressif32.zip
|
||||
platform_packages =
|
||||
board_build.partitions = esp32_partitions.csv
|
||||
lib_deps =
|
||||
|
||||
@@ -301,7 +301,7 @@
|
||||
|
||||
"system": {
|
||||
"unit": "Система единиц",
|
||||
"metric": "Метрическая <small>(цильсии, литры, бары)</small>",
|
||||
"metric": "Метрическая <small>(цельсии, литры, бары)</small>",
|
||||
"imperial": "Imperial <small>(фаренгейты, галлоны, psi)</small>",
|
||||
"statusLedGpio": "Статус LED GPIO",
|
||||
"logLevel": "Уровень логирования",
|
||||
|
||||
Reference in New Issue
Block a user