fzirker/wlan_pioneer
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

added cell count

Browse source
This commit is contained in:
Florian Zirker 2018-12-15 16:44:19 +01:00
parent e2dd7f2daf
commit 692d1e83f9
2 changed files with 23 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
msg/WlanSignalMsg.msg
View file

@ -2,3 +2,5 @@ time timestamp
string ssid string ssid
int8 level_2G4 int8 level_2G4
int8 level_5G int8 level_5G
int8 cellCount_2G4
int8 cellCount_5G

35
src/wlanSignal.cpp
View file

@ -11,22 +11,25 @@ using namespace std;
using namespace ros; using namespace ros;
using namespace wlan_pioneer; using namespace wlan_pioneer;
// Global variables for wifi scanning
const int MAX_APS = 64; // the maximum amounts of APs (Access Points) we want to store const int MAX_APS = 64; // the maximum amounts of APs (Access Points) we want to store
struct wifi_scan* wifi = nullptr; // this stores all the library information struct wifi_scan* wifi = nullptr; // this stores all the library information
struct bss_info bss[MAX_APS]; // this is where we are going to keep informatoin about APs (Access Points) struct bss_info bss[MAX_APS]; // this is where we are going to keep informatoin about APs (Access Points)
int status;
int8_t signalLevel2G4 = numeric_limits<int8_t>::min(); WlanSignalMsg msg;
int8_t signalLevel5G = numeric_limits<int8_t>::min();
void scanInterface( const string& interface, const string& monitoringSsid ) { void scanInterface( const string& interface, const string& monitoringSsid ) {
signalLevel2G4 = numeric_limits<int8_t>::min();
signalLevel5G = numeric_limits<int8_t>::min(); msg.level_2G4 = numeric_limits<int8_t>::min();
msg.level_5G = numeric_limits<int8_t>::min();
msg.cellCount_2G4 = 0;
msg.cellCount_5G = 0;
if ( wifi == nullptr ) { if ( wifi == nullptr ) {
wifi = wifi_scan_init( interface.c_str() ); wifi = wifi_scan_init( interface.c_str() );
} }
status = wifi_scan_all( wifi, bss, MAX_APS ); int status = wifi_scan_all( wifi, bss, MAX_APS );
if ( status < 0 ) { if ( status < 0 ) {
ROS_ERROR( "Unable to get WLAN scan data: %s", std::strerror( errno ) ); ROS_ERROR( "Unable to get WLAN scan data: %s", std::strerror( errno ) );
@ -47,11 +50,13 @@ void scanInterface( const string& interface, const string& monitoringSsid ) {
int8_t level = bss[i].signal_mbm / 100; int8_t level = bss[i].signal_mbm / 100;
if ( bss[i].frequency >= 2400 && bss[i].frequency <= 2499 ) { if ( bss[i].frequency >= 2400 && bss[i].frequency <= 2499 ) {
// this AP is sending on 2.4 GHz band // this AP is sending on 2.4 GHz band
signalLevel2G4 = std::max( signalLevel2G4, level ); msg.level_2G4 = std::max( msg.level_2G4, level );
msg.cellCount_2G4++;
} }
else if ( bss[i].frequency >= 5000 && bss[i].frequency <= 5999 ) { else if ( bss[i].frequency >= 5000 && bss[i].frequency <= 5999 ) {
// this AP is sending on 5 GHz band // this AP is sending on 5 GHz band
signalLevel5G = std::max( signalLevel5G, level ); msg.level_5G = std::max( msg.level_5G, level );
msg.cellCount_5G++;
} }
} }
} }
@ -82,16 +87,18 @@ int main( int argc, char** argv ) {
Publisher publisher = node.advertise<WlanSignalMsg>( "wlan_signal", 1000 ); Publisher publisher = node.advertise<WlanSignalMsg>( "wlan_signal", 1000 );
Rate loopRate( 1 ); // every second Rate loopRate( 1 ); // every second
msg.ssid = monitoringSsid;
while ( ok() ) { while ( ok() ) {
scanInterface( wlanInterface, monitoringSsid ); scanInterface( wlanInterface, monitoringSsid );
WlanSignalMsg msg;
msg.timestamp = Time::now(); msg.timestamp = Time::now();
msg.level_2G4 = signalLevel2G4;
msg.level_5G = signalLevel5G;
msg.ssid = monitoringSsid;
ROS_INFO( "Signal strength 2.4G: %i Signal strength 5G: %i", msg.level_2G4, msg.level_5G ); ROS_INFO( "Signal strength 2.4G: %i (%d Cells) Signal strength 5G: %i (%d Cells)",
msg.level_2G4,
msg.cellCount_2G4,
msg.level_5G,
msg.cellCount_5G);
publisher.publish( msg ); publisher.publish( msg );
spinOnce(); spinOnce();