Merge remote-tracking branch 'origin/master' into enhanced_device

# Conflicts: # docs/enhanced_proto.md # src/ebusd/bushandler.cpp # src/lib/ebus/device.cpp # src/lib/ebus/device.h
2021-01-10 13:51:53 +01:00
parent f9943e2fe0 ab75329141
commit c129222ffc
18 changed files with 96 additions and 100 deletions
@@ -30,6 +30,7 @@ app.info
 /src/lib/utils/libutils.a
 /src/lib/ebus/libebus.a
 /src/lib/ebus/contrib/test/test_tem
+/src/lib/ebus/test/test_device
 /src/lib/ebus/test/test_symbol
 /src/lib/ebus/test/test_data
 /src/lib/ebus/test/test_message