github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-10-14 10:12:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'beta' into dev

Browse Source
This commit is contained in:
Jesse Hills
2026-10-12 15:42:45 +13:00
parent 847be14d1e 2c4b1f3ed5
commit 95d9b68ac9
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/improv_serial/improv_serial_component.cpp
+2
View File
@@ -20,6 +20,8 @@ ESPHOME_LOG_TAG(TAG, "improv_serial");
static constexpr uint32_t WIFI_CONNECT_TIMEOUT_ID = 0;
static constexpr uint32_t WIFI_CONNECT_TIMEOUT_ID = 0;
void ImprovSerialComponent::setup() {
global_improv_serial_component = this;
#ifdef USE_IMPROV_SERIAL_UART
esphome/components/seeed_mr24hpc1/seeed_mr24hpc1.cpp
+2
View File
@@ -11,6 +11,8 @@ ESPHOME_LOG_TAG(TAG, "seeed_mr24hpc1");
static constexpr uint32_t STARTUP_DELAY_MS = 1000;
static constexpr uint32_t STARTUP_DELAY_MS = 1000;
// Prints the component's configuration data. dump_config() prints all of the component's configuration
// items in an easy-to-read format, including the configuration key-value pairs.
void MR24HPC1Component::dump_config() {