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

# Conflicts: # src/lib/ebus/device.cpp
2019-10-06 14:26:49 +02:00
parent a1254fc2a3 d9d1b9a9fe
commit 0ee454838d
46 changed files with 887 additions and 359 deletions
@@ -22,6 +22,7 @@
 #include <unistd.h>
 #include <termios.h>
 #include <arpa/inet.h>
+#include <netinet/in.h>
 #include <netdb.h>
 #include <iostream>
 #include <fstream>