mirror of
https://github.com/esphome/esphome.git
synced 2026-10-07 11:26:39 +00:00
Merge branch '20260902-serial-proxy-tap' into 20260218-zigbee-proxy
# Conflicts: # esphome/components/api/api.proto # esphome/components/api/api_connection.cpp # esphome/components/api/api_pb2.h # esphome/components/api/api_pb2_dump.cpp # esphome/components/api/api_pb2_service.cpp # esphome/components/serial_proxy/serial_proxy.cpp # esphome/components/serial_proxy/serial_proxy.h
This commit is contained in:
@@ -0,0 +1,5 @@
|
||||
# Gitignore settings for ESPHome
|
||||
# This is an example and may include too much for your use-case.
|
||||
# You can modify this file to suit your needs.
|
||||
/.esphome/
|
||||
/secrets.yaml
|
||||
@@ -20,4 +20,3 @@ serial_proxy:
|
||||
uart_id: zigbee_uart
|
||||
name: Zigbee
|
||||
port_type: TTL
|
||||
mode: protocol
|
||||
|
||||
@@ -22,7 +22,6 @@ serial_proxy:
|
||||
uart_id: zigbee_usb_channel
|
||||
name: Zigbee
|
||||
port_type: TTL
|
||||
mode: protocol
|
||||
|
||||
zigbee_proxy:
|
||||
serial_proxy_id: zigbee_usb_serial
|
||||
|
||||
Reference in New Issue
Block a user