FHWS/Indoor
Archived
4
0
Fork 0
Code Issues 19 Pull Requests Releases 1 Wiki Activity

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

Browse Source
This commit is contained in:
toni
2016-12-01 19:51:23 +01:00
parent e10ba2cfd9 2255904385
commit 5ec0b7e9ee
4 changed files with 48 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
floorplan/v2/Floorplan.h
View File

@@ -184,6 +184,11 @@ namespace Floorplan {
std::string name;
std::string mac;
Point3 pos; // z is relative to the floor's height
struct Model {
float txp;
float exp;
float waf;
} model;
AccessPoint() : name(), mac(), pos() {;}
AccessPoint(const std::string& name, const std::string& mac, const Point3& pos) : name(name), mac(toUpperCase(mac)), pos(pos) {;}
bool operator == (const AccessPoint& o) const {return (o.name == name) && (o.mac == mac) && (o.pos == pos);}
@@ -194,7 +199,15 @@ namespace Floorplan {
struct Beacon {
std::string name;
std::string mac;
std::string major;
std::string minor;
std::string uuid;
Point3 pos; // z is relative to the floor's height
struct Model {
float txp;
float exp;
float waf;
} model;
Beacon() : name(), mac(), pos() {;}
Beacon(const std::string& name, const std::string& mac, const Point3& pos) : name(name), mac(mac), pos(pos) {;}
bool operator == (const Beacon& o) const {return (o.name == name) && (o.mac == mac) && (o.pos == pos);}