sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-11-16 06:45:48 +00:00
Code Issues Releases Wiki Activity

Merge branch 'pin_conflits_fix' into integration

Browse Source
This commit is contained in:
J. Nick Koston
2025-10-14 12:30:00 -10:00
parent 07fd35a7a0 837a0bf6df
commit cd836e7594
4 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
requirements.txt
View File

@@ -16,9 +16,9 @@ aioesphomeapi==41.17.0
zeroconf==0.148.0 zeroconf==0.148.0
puremagic==1.30 puremagic==1.30
ruamel.yaml==0.18.15 # dashboard_import ruamel.yaml==0.18.15 # dashboard_import
ruamel.yaml.clib==0.2.12 # dashboard_import ruamel.yaml.clib==0.2.14 # dashboard_import
esphome-glyphsets==0.2.0 esphome-glyphsets==0.2.0
pillow==10.4.0 pillow==11.3.0
cairosvg==2.8.2 cairosvg==2.8.2
freetype-py==2.5.1 freetype-py==2.5.1
jinja2==3.1.6 jinja2==3.1.6

1
tests/components/pzemac/test.esp32-idf.yaml
View File

@@ -1,6 +1,7 @@
substitutions: substitutions:
tx_pin: GPIO4 tx_pin: GPIO4
rx_pin: GPIO5 rx_pin: GPIO5
flow_control_pin: GPIO13
packages: packages:
modbus: !include ../../test_build_components/common/modbus/esp32-idf.yaml modbus: !include ../../test_build_components/common/modbus/esp32-idf.yaml

1
tests/components/pzemdc/test.esp32-idf.yaml
View File

@@ -1,6 +1,7 @@
substitutions: substitutions:
tx_pin: GPIO4 tx_pin: GPIO4
rx_pin: GPIO5 rx_pin: GPIO5
flow_control_pin: GPIO13
packages: packages:
modbus: !include ../../test_build_components/common/modbus/esp32-idf.yaml modbus: !include ../../test_build_components/common/modbus/esp32-idf.yaml

1
tests/components/sdm_meter/test.esp32-idf.yaml
View File

@@ -1,6 +1,7 @@
substitutions: substitutions:
tx_pin: GPIO4 tx_pin: GPIO4
rx_pin: GPIO5 rx_pin: GPIO5
flow_control_pin: GPIO13
packages: packages:
modbus: !include ../../test_build_components/common/modbus/esp32-idf.yaml modbus: !include ../../test_build_components/common/modbus/esp32-idf.yaml