5
0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-03-09 08:04:14 -03:00

Tools: Python3 and kill_tasks fixes for sim_vehicle under Cygwin

This commit is contained in:
Stephen Dade 2020-04-15 11:51:31 +10:00 committed by Peter Barker
parent 41ada7f8f4
commit 49d19e1aac

View File

@ -145,7 +145,7 @@ def cygwin_pidof(proc_name):
pipe = subprocess.Popen("ps -ea | grep " + proc_name,
shell=True,
stdout=subprocess.PIPE)
output_lines = pipe.stdout.read().replace("\r", "").split("\n")
output_lines = pipe.stdout.read().decode('utf-8').replace("\r", "").split("\n")
ret = pipe.wait()
pids = []
if ret != 0:
@ -234,6 +234,9 @@ def kill_tasks():
'runsim.py',
'AntennaTracker.elf',
'scrimmage'
'ardurover',
'arduplane',
'arducopter'
}
for vehicle in vinfo.options:
for frame in vinfo.options[vehicle]["frames"]: