fix stupid merge

This commit is contained in:
John
2021-01-10 14:13:07 +01:00
parent 248e8d65a7
commit cff4e4a8cb
18 changed files with 100 additions and 78 deletions
+1 -1
View File
@@ -14,7 +14,7 @@ Features
The main features of the daemon are:
* use USB serial, TCP connected, or UDP device
* use USB serial, TCP connected or UDP device, or enhanced ebusd protocol for recent [ebus adapter 3](https://adapter.ebusd.eu/) or [ebusd-esp firmware](https://github.com/john30/ebusd-esp/) (allows arbitration to be done directly by the hardware)
* actively send messages to and receive answers from the eBUS
* passively listen to messages sent on the eBUS
* regularly poll for messages