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

worked on wifi-scanner for linux

Browse Source 
new time-grouping for vap grouper
adjusted test-cases
minor changes/fixes/improvements
This commit is contained in:
FrankE
2017-10-11 14:00:24 +02:00
parent 628be72e1f
commit da477866c1
13 changed files with 649 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
sensors/radio/WiFiMeasurement.h
View File

@@ -19,7 +19,7 @@ private:
/** the measured signal strength */
float rssi;
/** OPTIONAL. frequence the signal was received */
/** OPTIONAL. frequence the signal was received */
float freq = NAN;
/** OPTIONAL. timestamp the measurement was recorded at */
@@ -32,40 +32,56 @@ public:
;
}
/** ctor with freq*/
WiFiMeasurement(const AccessPoint& ap, const float rssi, const float freq) : ap(ap), rssi(rssi), freq(freq) {
;
}
/** ctor with freq*/
WiFiMeasurement(const AccessPoint& ap, const float rssi, const float freq) : ap(ap), rssi(rssi), freq(freq) {
;
}
/** ctor with timestamp */
WiFiMeasurement(const AccessPoint& ap, const float rssi, const Timestamp ts) : ap(ap), rssi(rssi), ts(ts) {
;
}
/** ctor with timestamp */
WiFiMeasurement(const AccessPoint& ap, const float rssi, const Timestamp ts) : ap(ap), rssi(rssi), freq(NAN), ts(ts) {
;
}
/** ctor with timestamp and freq*/
WiFiMeasurement(const AccessPoint& ap, const float rssi, const float freq, const Timestamp ts) : ap(ap), rssi(rssi), freq(freq), ts(ts) {
;
}
/** ctor with timestamp and freq*/
WiFiMeasurement(const AccessPoint& ap, const float rssi, const float freq, const Timestamp ts) : ap(ap), rssi(rssi), freq(freq), ts(ts) {
;
}
public:
/** get the AP we got the measurement for */
const AccessPoint& getAP() const {return ap;}
/** get the AP we got the measurement for */
const AccessPoint& getAP() const {return ap;}
/** get the measurement's signal strength */
float getRSSI() const {return rssi;}
/** get the measurement's signal strength */
float getRSSI() const {return rssi;}
/** OPTIONAL: get the measurement's timestamp (if known!) */
const Timestamp& getTimestamp() const {return ts;}
/** OPTIONAL: get the measurement's timestamp (if known!) */
const Timestamp& getTimestamp() const {return ts;}
/** OPTIONAL: get the measurement's frequence (if known!) */
float getFrequency() const {return freq;}
/** timestamp known? */
bool hasTimestamp() const {return ts == ts;}
/** set another signal strength */
void setRssi(float value){rssi = value;}
/** OPTIONAL: get the measurement's frequency (if known!) */
float getFrequency() const {return freq;}
/** frequency known? */
bool hasFrequency() const {return freq == freq;}
/** set another signal strength */
void setRssi(float value){rssi = value;}
/** set the timestamp */
void setTimestamp(const Timestamp& val){ts = val;}
/** as string for debug printing */
std::string asString() const {
std::string res = ap.asString();
if (hasTimestamp()) {res += " @" + std::to_string(ts.ms());}
if (hasFrequency()) {res += " " + std::to_string((int)freq) + " MHz";}
res += " - " + std::to_string(rssi) + " dBm ";
return res;
}
/** set the timestamp */
void setTimestamp(const Timestamp& val){ts = val;}
};