github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-10-07 03:16:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '20260902-serial-proxy-tap' into 20260218-zigbee-proxy

Browse Source 
# 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:
kbx81
2026-09-03 19:52:29 -05:00
parent bd94a6858f c432ab146f
commit 6a9791609f
13 changed files with 170 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/components/zigbee_proxy/.gitignore
+5
View File
@@ -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