1
0
mirror of https://github.com/esphome/esphome.git synced 2025-10-16 15:37:51 +02:00

Merge branch 'pin_conflits_fix' into integration

This commit is contained in:
J. Nick Koston 2025-10-14 12:30:00 -10:00
commit cd836e7594
No known key found for this signature in database
4 changed files with 5 additions and 2 deletions

View File

@ -16,9 +16,9 @@ aioesphomeapi==41.17.0
zeroconf==0.148.0
puremagic==1.30
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
pillow==10.4.0
pillow==11.3.0
cairosvg==2.8.2
freetype-py==2.5.1
jinja2==3.1.6

View File

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

View File

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

View File

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