mirror of
https://github.com/Laxilef/OTGateway.git
synced 2025-12-26 10:03:35 +05:00
Compare commits
7 Commits
1.5.1
...
5b7da4ed2a
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5b7da4ed2a | ||
|
|
8d516c7f95 | ||
|
|
d756716497 | ||
|
|
9a2f9d64ec | ||
|
|
0d0926cdac | ||
|
|
3ce3ce5016 | ||
|
|
6ca6d3cab7 |
@@ -45,7 +45,8 @@ All available information and instructions can be found in the wiki:
|
|||||||
* [Home](https://github.com/Laxilef/OTGateway/wiki)
|
* [Home](https://github.com/Laxilef/OTGateway/wiki)
|
||||||
* [Quick Start](https://github.com/Laxilef/OTGateway/wiki#quick-start)
|
* [Quick Start](https://github.com/Laxilef/OTGateway/wiki#quick-start)
|
||||||
* [Build firmware](https://github.com/Laxilef/OTGateway/wiki#build-firmware)
|
* [Build firmware](https://github.com/Laxilef/OTGateway/wiki#build-firmware)
|
||||||
* [Flash firmware via ESP Flash Download Tool](https://github.com/Laxilef/OTGateway/wiki#flash-firmware-via-esp-flash-download-tool)
|
* [Flashing via Web Flasher](https://github.com/Laxilef/OTGateway/wiki#flashing-via-web-flasher)
|
||||||
|
* [Flashing via ESP Flash Download Tool](https://github.com/Laxilef/OTGateway/wiki#flashing-via-esp-flash-download-tool)
|
||||||
* [Settings](https://github.com/Laxilef/OTGateway/wiki#settings)
|
* [Settings](https://github.com/Laxilef/OTGateway/wiki#settings)
|
||||||
* [External temperature sensors](https://github.com/Laxilef/OTGateway/wiki#external-temperature-sensors)
|
* [External temperature sensors](https://github.com/Laxilef/OTGateway/wiki#external-temperature-sensors)
|
||||||
* [Reporting indoor/outdoor temperature from any Home Assistant sensor](https://github.com/Laxilef/OTGateway/wiki#reporting-indooroutdoor-temperature-from-any-home-assistant-sensor)
|
* [Reporting indoor/outdoor temperature from any Home Assistant sensor](https://github.com/Laxilef/OTGateway/wiki#reporting-indooroutdoor-temperature-from-any-home-assistant-sensor)
|
||||||
|
|||||||
@@ -1,8 +1,5 @@
|
|||||||
#include <FS.h>
|
#include <FS.h>
|
||||||
#include <detail/mimetable.h>
|
#include <detail/mimetable.h>
|
||||||
#if defined(ARDUINO_ARCH_ESP32)
|
|
||||||
#include <detail/RequestHandlersImpl.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
using namespace mime;
|
using namespace mime;
|
||||||
|
|
||||||
@@ -54,13 +51,6 @@ public:
|
|||||||
if (this->eTag.isEmpty()) {
|
if (this->eTag.isEmpty()) {
|
||||||
if (server._eTagFunction) {
|
if (server._eTagFunction) {
|
||||||
this->eTag = (server._eTagFunction)(*this->fs, this->path);
|
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
|
bblanchon/ArduinoJson@^7.3.0
|
||||||
;ihormelnyk/OpenTherm Library@^1.1.5
|
;ihormelnyk/OpenTherm Library@^1.1.5
|
||||||
https://github.com/ihormelnyk/opentherm_library#master
|
https://github.com/ihormelnyk/opentherm_library#master
|
||||||
;arduino-libraries/ArduinoMqttClient@^0.1.8
|
arduino-libraries/ArduinoMqttClient@^0.1.8
|
||||||
https://github.com/Laxilef/ArduinoMqttClient.git#esp32_core_310
|
|
||||||
lennarthennigs/ESP Telnet@^2.2
|
lennarthennigs/ESP Telnet@^2.2
|
||||||
gyverlibs/FileData@^1.0.2
|
gyverlibs/FileData@^1.0.2
|
||||||
gyverlibs/GyverPID@^3.3.2
|
gyverlibs/GyverPID@^3.3.2
|
||||||
@@ -85,7 +84,7 @@ board_build.ldscript = eagle.flash.4m1m.ld
|
|||||||
;platform_packages =
|
;platform_packages =
|
||||||
; framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.5
|
; 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
|
; 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 =
|
platform_packages =
|
||||||
board_build.partitions = esp32_partitions.csv
|
board_build.partitions = esp32_partitions.csv
|
||||||
lib_deps =
|
lib_deps =
|
||||||
@@ -300,4 +299,28 @@ build_type = ${esp32_defaults.build_type}
|
|||||||
build_flags =
|
build_flags =
|
||||||
${esp32_defaults.build_flags}
|
${esp32_defaults.build_flags}
|
||||||
; Currently the NimBLE library is incompatible with ESP32 C6
|
; Currently the NimBLE library is incompatible with ESP32 C6
|
||||||
;-D USE_BLE=1
|
;-D USE_BLE=1
|
||||||
|
|
||||||
|
[env:otthing]
|
||||||
|
platform = ${esp32_defaults.platform}
|
||||||
|
platform_packages = ${esp32_defaults.platform_packages}
|
||||||
|
board = lolin_c3_mini
|
||||||
|
board_build.partitions = ${esp32_defaults.board_build.partitions}
|
||||||
|
lib_deps =
|
||||||
|
${esp32_defaults.lib_deps}
|
||||||
|
${esp32_defaults.nimble_lib}
|
||||||
|
lib_ignore = ${esp32_defaults.lib_ignore}
|
||||||
|
extra_scripts = ${esp32_defaults.extra_scripts}
|
||||||
|
build_unflags =
|
||||||
|
-mtext-section-literals
|
||||||
|
build_type = ${esp32_defaults.build_type}
|
||||||
|
build_flags =
|
||||||
|
${esp32_defaults.build_flags}
|
||||||
|
-D USE_BLE=1
|
||||||
|
-D DEFAULT_OT_IN_GPIO=3
|
||||||
|
-D DEFAULT_OT_OUT_GPIO=1
|
||||||
|
; -D DEFAULT_SENSOR_OUTDOOR_GPIO=0
|
||||||
|
; -D DEFAULT_SENSOR_INDOOR_GPIO=1
|
||||||
|
-D DEFAULT_STATUS_LED_GPIO=8
|
||||||
|
-D DEFAULT_OT_RX_LED_GPIO=2
|
||||||
|
-D OT_BYPASS_RELAY_GPIO=20
|
||||||
|
|||||||
@@ -69,6 +69,11 @@ protected:
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef OT_BYPASS_RELAY_GPIO
|
||||||
|
pinMode(OT_BYPASS_RELAY_GPIO, OUTPUT);
|
||||||
|
digitalWrite(OT_BYPASS_RELAY_GPIO, true);
|
||||||
|
#endif
|
||||||
|
|
||||||
// create instance
|
// create instance
|
||||||
this->instance = new CustomOpenTherm(settings.opentherm.inGpio, settings.opentherm.outGpio);
|
this->instance = new CustomOpenTherm(settings.opentherm.inGpio, settings.opentherm.outGpio);
|
||||||
|
|
||||||
|
|||||||
@@ -301,7 +301,7 @@
|
|||||||
|
|
||||||
"system": {
|
"system": {
|
||||||
"unit": "Система единиц",
|
"unit": "Система единиц",
|
||||||
"metric": "Метрическая <small>(цильсии, литры, бары)</small>",
|
"metric": "Метрическая <small>(цельсии, литры, бары)</small>",
|
||||||
"imperial": "Imperial <small>(фаренгейты, галлоны, psi)</small>",
|
"imperial": "Imperial <small>(фаренгейты, галлоны, psi)</small>",
|
||||||
"statusLedGpio": "Статус LED GPIO",
|
"statusLedGpio": "Статус LED GPIO",
|
||||||
"logLevel": "Уровень логирования",
|
"logLevel": "Уровень логирования",
|
||||||
|
|||||||
Reference in New Issue
Block a user