added missing code changes
started working on refactoring of sensors new test-cases
This commit is contained in:
35
sensors/radio/AccessPoint.h
Normal file
35
sensors/radio/AccessPoint.h
Normal file
@@ -0,0 +1,35 @@
|
||||
#ifndef ACCESSPOINT_H
|
||||
#define ACCESSPOINT_H
|
||||
|
||||
#include "../MACAddress.h"
|
||||
|
||||
/**
|
||||
* represents a Wi-Fi-AccessPoint
|
||||
* an AP is represented by its MAC-Address and
|
||||
* may provide a readably SSID
|
||||
*/
|
||||
class AccessPoint {
|
||||
|
||||
public:
|
||||
|
||||
/** the AP's MAC-Address */
|
||||
const MACAddress mac;
|
||||
|
||||
/** the AP's readable SSID */
|
||||
const std::string ssid;
|
||||
|
||||
public:
|
||||
|
||||
/** ctor */
|
||||
AccessPoint(const MACAddress& mac, const std::string& ssid) : mac(mac), ssid(ssid) {
|
||||
;
|
||||
}
|
||||
|
||||
/** ctor */
|
||||
AccessPoint(const std::string& mac, const std::string& ssid) : mac(mac), ssid(ssid) {
|
||||
;
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
#endif // ACCESSPOINT_H
|
||||
47
sensors/radio/LogDistanceModel.h
Normal file
47
sensors/radio/LogDistanceModel.h
Normal file
@@ -0,0 +1,47 @@
|
||||
#ifndef LOGDISTANCEMODEL_H
|
||||
#define LOGDISTANCEMODEL_H
|
||||
|
||||
#include <cmath>
|
||||
|
||||
class LogDistanceModel {
|
||||
|
||||
public:
|
||||
|
||||
/** convert from RSSI to a distance (in meter) */
|
||||
static float rssiToDistance(const float txPower, const float pathLoss, const float rssi) {
|
||||
return pow(10, (txPower - rssi) / (10 * pathLoss));
|
||||
}
|
||||
|
||||
/** convert from a distance (in meter) to the expected RSSI */
|
||||
static float distanceToRssi(const float txPower, const float pathLoss, const float distance) {
|
||||
if (distance <= 1) {return txPower;}
|
||||
return (txPower - (10 * pathLoss * std::log10(distance)));
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
#include <vector>
|
||||
|
||||
class LogDistFastModel {
|
||||
|
||||
private:
|
||||
|
||||
std::vector<float> lut;
|
||||
|
||||
public:
|
||||
|
||||
LogDistFastModel() {
|
||||
lut.resize(2000);
|
||||
for (int i = 0; i < 2000; ++i) {
|
||||
lut[i] = std::log10(i/10.0f);
|
||||
}
|
||||
}
|
||||
|
||||
float distanceToRssi(const float txPower, const float pathLoss, const float distance) const {
|
||||
if (distance <= 1) {return txPower;}
|
||||
return (txPower - (10 * pathLoss * lut[ (int) (distance*10) ]));
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
#endif // LOGDISTANCEMODEL_H
|
||||
Reference in New Issue
Block a user