mirror of
				https://github.com/esphome/esphome.git
				synced 2025-10-29 22:24:26 +00:00 
			
		
		
		
	Merge branch 'pin_conflits_fix' into integration
This commit is contained in:
		| @@ -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 | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
		Reference in New Issue
	
	Block a user