mirror of
https://github.com/esphome/esphome.git
synced 2026-10-07 03:16:37 +00:00
Merge remote-tracking branch 'upstream/dev' into integration
# Conflicts: # esphome/components/api/api_connection.cpp # esphome/components/api/api_server.cpp # esphome/components/api/api_server.h # esphome/components/wifi_signal/wifi_signal_sensor.h # esphome/core/string_ref.h
This commit is contained in:
@@ -176,10 +176,7 @@ def test_single_package(
|
||||
|
||||
assert actual == expected
|
||||
|
||||
assert (
|
||||
"Including a single package under `packages:` is deprecated. Use a list instead."
|
||||
in caplog.text
|
||||
)
|
||||
assert "This method for including packages will go away in 2026.7.0" in caplog.text
|
||||
|
||||
|
||||
def test_package_append(basic_wifi, basic_esphome):
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
sensor:
|
||||
- platform: hlw8032
|
||||
voltage:
|
||||
name: HLW8032 Voltage
|
||||
id: hlw8032_voltage
|
||||
current:
|
||||
name: HLW8032 Current
|
||||
id: hlw8032_current
|
||||
power:
|
||||
name: HLW8032 Power
|
||||
id: hlw8032_power
|
||||
apparent_power:
|
||||
name: HLW8032 Apparent Power
|
||||
id: hlw8032_apparent_power
|
||||
power_factor:
|
||||
name: HLW8032 Power Factor
|
||||
id: hlw8032_power_factor
|
||||
@@ -0,0 +1,4 @@
|
||||
packages:
|
||||
uart_4800_even: !include ../../test_build_components/common/uart_4800_even/esp32-idf.yaml
|
||||
|
||||
<<: !include common.yaml
|
||||
@@ -0,0 +1,4 @@
|
||||
packages:
|
||||
uart_4800_even: !include ../../test_build_components/common/uart_4800_even/esp8266-ard.yaml
|
||||
|
||||
<<: !include common.yaml
|
||||
@@ -0,0 +1,4 @@
|
||||
packages:
|
||||
uart_4800_even: !include ../../test_build_components/common/uart_4800_even/rp2040-ard.yaml
|
||||
|
||||
<<: !include common.yaml
|
||||
@@ -25,15 +25,15 @@ display:
|
||||
oe_pin: GPIO15
|
||||
clk_pin: GPIO16
|
||||
pages:
|
||||
- id: page1
|
||||
- id: page1_hub75
|
||||
lambda: |-
|
||||
it.rectangle(0, 0, it.get_width(), it.get_height());
|
||||
- id: page2
|
||||
- id: page2_hub75
|
||||
lambda: |-
|
||||
it.rectangle(0, 0, it.get_width(), it.get_height());
|
||||
on_page_change:
|
||||
from: page1
|
||||
to: page2
|
||||
from: page1_hub75
|
||||
to: page2_hub75
|
||||
then:
|
||||
lambda: |-
|
||||
ESP_LOGD("display", "1 -> 2");
|
||||
|
||||
@@ -5,7 +5,7 @@ button:
|
||||
- platform: micronova
|
||||
custom_button:
|
||||
name: Custom Micronova Button
|
||||
memory_location: 0xA0
|
||||
memory_location: 0x20
|
||||
memory_address: 0x7D
|
||||
memory_data: 0x0F
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@ pca9685:
|
||||
i2c_id: i2c_bus
|
||||
frequency: 500
|
||||
address: 0x0
|
||||
phase_balancer: linear
|
||||
|
||||
output:
|
||||
- platform: pca9685
|
||||
|
||||
@@ -16,4 +16,4 @@ display:
|
||||
|
||||
qr_code:
|
||||
- id: qr_code_homepage_qr
|
||||
value: https://esphome.io/index.html
|
||||
value: https://esphome.io/
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
<<: !include tinyusb_common.yaml
|
||||
|
||||
usb_cdc_acm:
|
||||
interfaces:
|
||||
id: usb_cdc_acm1
|
||||
@@ -0,0 +1,5 @@
|
||||
<<: !include tinyusb_common.yaml
|
||||
|
||||
usb_cdc_acm:
|
||||
interfaces:
|
||||
- id: usb_cdc_acm1
|
||||
@@ -0,0 +1,6 @@
|
||||
<<: !include tinyusb_common.yaml
|
||||
|
||||
usb_cdc_acm:
|
||||
interfaces:
|
||||
- id: usb_cdc_acm1
|
||||
- id: usb_cdc_acm2
|
||||
@@ -0,0 +1,8 @@
|
||||
tinyusb:
|
||||
id: tinyusb_test
|
||||
usb_lang_id: 0x0123
|
||||
usb_manufacturer_str: ESPHomeTestManufacturer
|
||||
usb_product_id: 0x1234
|
||||
usb_product_str: ESPHomeTestProduct
|
||||
usb_serial_str: ESPHomeTestSerialNumber
|
||||
usb_vendor_id: 0x2345
|
||||
Reference in New Issue
Block a user