sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-04-06 19:00:29 +01:00
Code Issues Releases Wiki Activity

Merge branch 'dev' into separate-ota-backend

Browse Source
This commit is contained in:
Keith Burzinski 2024-05-06 19:05:17 -05:00 committed by GitHub
commit 3a3e1c90b1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
esphome/components/template/datetime/template_datetime.h
View File

@ -2,7 +2,7 @@
#include "esphome/core/defines.h" #include "esphome/core/defines.h"
#ifdef USE_DATETIME_TIME #ifdef USE_DATETIME_DATETIME
#include "esphome/components/datetime/datetime_entity.h" #include "esphome/components/datetime/datetime_entity.h"
#include "esphome/core/automation.h" #include "esphome/core/automation.h"
@ -43,4 +43,4 @@ class TemplateDateTime : public datetime::DateTimeEntity, public PollingComponen
} // namespace template_ } // namespace template_
} // namespace esphome } // namespace esphome
#endif // USE_DATETIME_TIME #endif // USE_DATETIME_DATETIME

2
esphome/components/web_server_base/__init__.py
View File

@ -37,4 +37,4 @@ async def to_code(config):
cg.add_library("FS", None) cg.add_library("FS", None)
cg.add_library("Update", None) cg.add_library("Update", None)
# https://github.com/esphome/ESPAsyncWebServer/blob/master/library.json # https://github.com/esphome/ESPAsyncWebServer/blob/master/library.json
cg.add_library("esphome/ESPAsyncWebServer-esphome", "3.1.0") cg.add_library("esphome/ESPAsyncWebServer-esphome", "3.2.0")

2
platformio.ini
View File

@ -58,7 +58,7 @@ lib_deps =
SPI ; spi (Arduino built-in) SPI ; spi (Arduino built-in)
Wire ; i2c (Arduino built-int) Wire ; i2c (Arduino built-int)
heman/AsyncMqttClient-esphome@1.0.0 ; mqtt heman/AsyncMqttClient-esphome@1.0.0 ; mqtt
esphome/ESPAsyncWebServer-esphome@2.1.0 ; web_server_base esphome/ESPAsyncWebServer-esphome@3.2.0 ; web_server_base
fastled/FastLED@3.3.2 ; fastled_base fastled/FastLED@3.3.2 ; fastled_base
mikalhart/TinyGPSPlus@1.0.2 ; gps mikalhart/TinyGPSPlus@1.0.2 ; gps
freekode/TM1651@1.0.1 ; tm1651 freekode/TM1651@1.0.1 ; tm1651