mirror/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-02-28 18:04:19 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into integration

Browse Source
This commit is contained in:
J. Nick Koston
2026-02-22 10:23:01 -06:00
parent c98b955881 e013b48675
commit 1fa340c6a4
4 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
esphome/components/bme68x_bsec2/__init__.py
View File

@@ -178,8 +178,11 @@ async def to_code_base(config):
bsec2_arr = cg.progmem_array(config[CONF_RAW_DATA_ID], rhs)
cg.add(var.set_bsec2_configuration(bsec2_arr, len(rhs)))
# Although this component does not use SPI, the BSEC2 Arduino library requires the SPI library
# The BSEC2 and BME68x Arduino libraries unconditionally include Wire.h and
# SPI.h in their source files, so these libraries must be available even though
# ESPHome uses its own I2C/SPI abstractions instead of the Arduino ones.
if core.CORE.using_arduino:
cg.add_library("Wire", None)
cg.add_library("SPI", None)
cg.add_library(
"BME68x Sensor library",

1
esphome/components/nextion/nextion_upload_arduino.cpp
View File

@@ -220,6 +220,7 @@ bool Nextion::upload_tft(uint32_t baud_rate, bool exit_reparse) {
}
if (code != 200 and code != 206) {
ESP_LOGE(TAG, "HTTP request failed with status %d", code);
return this->upload_end_(false);
}

1
esphome/components/nextion/nextion_upload_esp32.cpp
View File

@@ -238,6 +238,7 @@ bool Nextion::upload_tft(uint32_t baud_rate, bool exit_reparse) {
esp_get_free_heap_size());
int status_code = esp_http_client_get_status_code(http_client);
if (status_code != 200 && status_code != 206) {
ESP_LOGE(TAG, "HTTP request failed with status %d", status_code);
return this->upload_end_(false);
}

4
tests/components/bme68x_bsec2_i2c/test.esp32-ard.yaml Normal file
View File

@@ -0,0 +1,4 @@
packages:
i2c: !include ../../test_build_components/common/i2c/esp32-ard.yaml
<<: !include common.yaml