Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-29 02:38:07 +08:00
Code Issues Actions 26 Packages Projects Releases Wiki Activity

[bebop] telnet timeout and some pep8 cleanup

Browse Source
This commit is contained in:
Felix Ruess
2015-03-06 21:39:22 +01:00
parent 0f23e39f80
commit 8cb19eba41
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/tools/parrot/bebop.py
+11 -10
View File
@@ -98,6 +98,7 @@ tn, ftp = parrot_utils.connect(args.host)
# Check the Bebop status # Check the Bebop status
if args.command == 'status': if args.command == 'status':
print("Connected to Bebop at " + args.host)
bebop_status() bebop_status()
# Reboot the drone # Reboot the drone
@@ -107,12 +108,12 @@ elif args.command == 'reboot':
# Kill a program # Kill a program
elif args.command == 'kill': elif args.command == 'kill':
parrot_utils.execute_command(tn,'killall -9 ' + args.program) parrot_utils.execute_command(tn, 'killall -9 ' + args.program)
print('Program "' + args.program + '" is now killed') print('Program "' + args.program + '" is now killed')
# Start a program # Start a program
elif args.command == 'start': elif args.command == 'start':
parrot_utils.execute_command(tn,args.start + ' &') parrot_utils.execute_command(tn, args.start + ' &')
print('Program "' + args.start + '" is now started') print('Program "' + args.start + '" is now started')
@@ -120,7 +121,7 @@ elif args.command == 'insmod':
modfile = parrot_utils.split_into_path_and_file(args.file) modfile = parrot_utils.split_into_path_and_file(args.file)
print('Uploading \'' + modfile[1]) print('Uploading \'' + modfile[1])
parrot_utils.uploadfile(ftp, modfile[1], file(args.file, "rb")) parrot_utils.uploadfile(ftp, modfile[1], file(args.file, "rb"))
print(parrot_utils.execute_command(tn,"insmod /data/ftp/" + modfile[1])) print(parrot_utils.execute_command(tn, "insmod /data/ftp/" + modfile[1]))
elif args.command == 'upload_file_and_run': elif args.command == 'upload_file_and_run':
# Split filename and path # Split filename and path
@@ -141,7 +142,7 @@ elif args.command == 'upload_file':
# Split filename and path # Split filename and path
f = parrot_utils.split_into_path_and_file(args.file) f = parrot_utils.split_into_path_and_file(args.file)
parrot_utils.execute_command(tn,"mkdir -p /data/ftp/" + args.folder) parrot_utils.execute_command(tn, "mkdir -p /data/ftp/" + args.folder)
print('Uploading \'' + f[1] + "\' from " + f[0] + " to /data/video/" + args.folder) print('Uploading \'' + f[1] + "\' from " + f[0] + " to /data/video/" + args.folder)
parrot_utils.uploadfile(ftp, args.folder + "/" + f[1], file(args.file, "rb")) parrot_utils.uploadfile(ftp, args.folder + "/" + f[1], file(args.file, "rb"))
print("#pragma message: Upload of " + f[1] + " to Bebop Succes!") print("#pragma message: Upload of " + f[1] + " to Bebop Succes!")
@@ -151,9 +152,9 @@ elif args.command == 'download_file':
f = parrot_utils.split_into_path_and_file(args.file) f = parrot_utils.split_into_path_and_file(args.file)
# Open file and download # Open file and download
try: try:
file = open(args.file, 'wb') fd = open(args.file, 'wb')
print('Downloading \'' + f[1] + "\' from " + args.folder + " to " + f[0]) print('Downloading \'' + f[1] + "\' from " + args.folder + " to " + f[0])
ftp.retrbinary("RETR " + args.folder + "/" + f[1], file.write) ftp.retrbinary("RETR " + args.folder + "/" + f[1], fd.write)
print("#pragma message: Download of " + f[1] + " from Bebop Succes!") print("#pragma message: Download of " + f[1] + " from Bebop Succes!")
except IOError: except IOError:
print("#pragma message: Fail to open file " + args.file) print("#pragma message: Fail to open file " + args.file)
@@ -161,7 +162,7 @@ elif args.command == 'download_file':
os.remove(args.file) os.remove(args.file)
print("#pragma message: Download of " + f[1] + " from Bebop Failed!") print("#pragma message: Download of " + f[1] + " from Bebop Failed!")
else: else:
file.close() fd.close()
elif args.command == 'download_dir': elif args.command == 'download_dir':
# Split filename and path # Split filename and path
@@ -175,16 +176,16 @@ elif args.command == 'download_dir':
file_source = args.folder + '/' + file_name[1] file_source = args.folder + '/' + file_name[1]
file_dest = args.dest + '/' + file_name[1] file_dest = args.dest + '/' + file_name[1]
try: try:
file = open(file_dest, 'wb') fd = open(file_dest, 'wb')
print('Downloading \'' + f + "\' to " + file_dest) print('Downloading \'' + f + "\' to " + file_dest)
ftp.retrbinary("RETR " + file_source, file.write) ftp.retrbinary("RETR " + file_source, fd.write)
except IOError: except IOError:
print("#pragma message: Fail to open file " + file_dest) print("#pragma message: Fail to open file " + file_dest)
except: except:
os.remove(file_dest) os.remove(file_dest)
print("#pragma message: Download of " + f + " from Bebop Failed!") print("#pragma message: Download of " + f + " from Bebop Failed!")
else: else:
file.close() fd.close()
print("#pragma message: End download of folder " + args.folder + " from Bebop") print("#pragma message: End download of folder " + args.folder + " from Bebop")
elif args.command == 'rm_dir': elif args.command == 'rm_dir':
sw/tools/parrot/parrot_utils.py
+2 -2
View File
@@ -90,11 +90,11 @@ def uploadfile(ftp, filename, content):
# Connect with telnet and ftp, wait until login # Connect with telnet and ftp, wait until login
def connect(host): def connect(host):
try: try:
tn = telnetlib.Telnet(host) tn = telnetlib.Telnet(host, timeout=3)
ftp = FTP(host) ftp = FTP(host)
ftp.login() ftp.login()
tn.read_until('# ') tn.read_until('# ')
return (tn, ftp) return tn, ftp
except: except:
print('Could not connect to Parrot UAV (host: ' + host + ')') print('Could not connect to Parrot UAV (host: ' + host + ')')
exit(2) exit(2)