Skip to content

CORE-1738: wireless_watcher dies #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mikepurvis merged 2 commits into from
Aug 6, 2015
Merged

CORE-1738: wireless_watcher dies #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
139c3a4
Added checks for missing fields
Aug 5, 2015
cf38872
Replaced try blocks and added wifi connection check
Aug 5, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions wireless_watcher/nodes/watcher_node
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,23 +26,19 @@ class Connection(wireless_msgs.msg.Connection):
def __init__(self, fields):
args = {}

args['bitrate'] = trim(fields['Bit Rate'], float)

try: args['txpower'] = trim(fields['Tx-Power'])
except: pass

args['link_quality_raw'] = fields['Link Quality']
num, den = re.split('/', args['link_quality_raw'])
args['link_quality'] = float(num) / float(den)

args['signal_level'] = trim(fields['Signal level'])

try: args['noise_level'] = trim(fields['Noise level'])
args['bitrate'] = trim(fields.get('Bit Rate', "0.0"), float)
args['txpower'] = trim(fields.get('Tx-Power', "0"))
args['signal_level'] = trim(fields.get('Signal level', "0"))
args['noise_level'] = trim(fields.get('Noise level', "0"))
args['essid'] = fields.get('ESSID', "").strip('"')
args['bssid'] = fields.get('Access Point', "").strip()

try:
args['link_quality_raw'] = fields['Link Quality']
num, den = re.split('/', args['link_quality_raw'])
args['link_quality'] = float(num) / float(den)
except: pass

args['essid'] = fields['ESSID'].strip('"')
args['bssid'] = fields['Access Point'].strip()

super(Connection, self).__init__(**args)

class Network(wireless_msgs.msg.Network):
Expand Down Expand Up @@ -72,8 +68,12 @@ while not rospy.is_shutdown():
fields_list = [re.split('[:=]', field_str, maxsplit=1) for field_str in fields_str]
fields_dict = { 'dev': fields_str[0], 'type': fields_str[1] }
fields_dict.update(dict([field for field in fields_list if len(field) == 2 ]))
#print fields_dict
connection_msg = Connection(fields_dict)

# Check if WiFi is connected to a network
connection_msg = {}
if "Not-Associated" not in fields_dict['Access Point']:
connection_msg = Connection(fields_dict)

connection_pub.publish(connection_msg)

if not previous_success:
Expand Down