merge

2017-06-06 15:03:49 +02:00
parent ba9559e5df 9ea7da557b
commit 8ed4305d2a
122 changed files with 7794 additions and 1045 deletions
--- a/sensors/radio/model/WiFiModelLogDist.h
+++ b/sensors/radio/model/WiFiModelLogDist.h
@@ -4,6 +4,8 @@
 #include "WiFiModel.h"
 #include "LogDistanceModel.h"

+#include <unordered_map>
+
 /**
 * signal-strength estimation using log-distance model
 */
@@ -86,6 +88,14 @@ public:

 	}

+	void readFromXML(XMLDoc* doc, XMLElem* src) override {
+		throw Exception("not yet implemented");
+	}
+
+	void writeToXML(XMLDoc* doc, XMLElem* dst) override {
+		throw Exception("not yet implemented");
+	}
+
 };

 #endif // WIFIMODELLOGDIST_H