diff --git a/conf/airframes/TUDELFT/tudelft_bebop_autonomous_race.xml b/conf/airframes/TUDELFT/tudelft_bebop_autonomous_race.xml index 2b4f5d82b0..5dfec296d6 100644 --- a/conf/airframes/TUDELFT/tudelft_bebop_autonomous_race.xml +++ b/conf/airframes/TUDELFT/tudelft_bebop_autonomous_race.xml @@ -55,10 +55,10 @@ - - - - + + + +
diff --git a/conf/airframes/TUDELFT/tudelft_bebop_indi.xml b/conf/airframes/TUDELFT/tudelft_bebop_indi.xml index 74bd47bd05..501bbf3bc1 100644 --- a/conf/airframes/TUDELFT/tudelft_bebop_indi.xml +++ b/conf/airframes/TUDELFT/tudelft_bebop_indi.xml @@ -46,10 +46,10 @@ - - - - + + + +
diff --git a/conf/airframes/TUDELFT/tudelft_bebop_mavlink.xml b/conf/airframes/TUDELFT/tudelft_bebop_mavlink.xml index 74a1a9cfbb..03fdde4c27 100644 --- a/conf/airframes/TUDELFT/tudelft_bebop_mavlink.xml +++ b/conf/airframes/TUDELFT/tudelft_bebop_mavlink.xml @@ -78,10 +78,10 @@ - - - - + + + +
diff --git a/conf/airframes/TUDELFT/tudelft_bebop_opticflow.xml b/conf/airframes/TUDELFT/tudelft_bebop_opticflow.xml index 687f09c1fb..6f06929736 100644 --- a/conf/airframes/TUDELFT/tudelft_bebop_opticflow.xml +++ b/conf/airframes/TUDELFT/tudelft_bebop_opticflow.xml @@ -56,10 +56,10 @@ - - - - + + + +
diff --git a/conf/airframes/examples/bebop.xml b/conf/airframes/examples/bebop.xml index 7d16740fe8..56b69e8413 100644 --- a/conf/airframes/examples/bebop.xml +++ b/conf/airframes/examples/bebop.xml @@ -49,10 +49,10 @@ - - - - + + + +
diff --git a/sw/tools/parrot/bebop.py b/sw/tools/parrot/bebop.py index d28fc0a9a5..922739cca0 100755 --- a/sw/tools/parrot/bebop.py +++ b/sw/tools/parrot/bebop.py @@ -122,16 +122,22 @@ elif args.command == 'upload_file_and_run': # Split filename and path f = parrot_utils.split_into_path_and_file(args.file) - print("Kill running " + f[1] + " and make folder " + args.folder) - parrot_utils.execute_command(tn,"killall -9 " + f[1]) - sleep(1) - parrot_utils.execute_command(tn, "mkdir -p /data/ftp/" + args.folder) - print('Uploading \'' + f[1] + "\' from " + f[0] + " to " + args.folder) - parrot_utils.uploadfile(ftp, args.folder + "/" + f[1], file(args.file, "rb")) - sleep(0.5) - parrot_utils.execute_command(tn, "chmod 777 /data/ftp/" + args.folder + "/" + f[1]) - parrot_utils.execute_command(tn, "/data/ftp/" + args.folder + "/" + f[1] + " > /dev/null 2>&1 &") - print("#pragma message: Upload and Start of ap.elf to Bebop succesful !") + #check firmware version + v = parrot_utils.check_version(tn, '').strip() + print("Checking Bebop firmware version... " + v ) + if v != '3.2.0': + print("Error: please upgrade your Bebop firmware to version 3.2.0!") + else: + print("Kill running " + f[1] + " and make folder " + args.folder) + parrot_utils.execute_command(tn,"killall -9 " + f[1]) + sleep(1) + parrot_utils.execute_command(tn, "mkdir -p /data/ftp/" + args.folder) + print('Uploading \'' + f[1] + "\' from " + f[0] + " to " + args.folder) + parrot_utils.uploadfile(ftp, args.folder + "/" + f[1], file(args.file, "rb")) + sleep(0.5) + parrot_utils.execute_command(tn, "chmod 777 /data/ftp/" + args.folder + "/" + f[1]) + parrot_utils.execute_command(tn, "/data/ftp/" + args.folder + "/" + f[1] + " > /dev/null 2>&1 &") + print("#pragma message: Upload and Start of ap.elf to Bebop succesful !") elif args.command == 'upload_file': # Split filename and path diff --git a/sw/tools/parrot/parrot_utils.py b/sw/tools/parrot/parrot_utils.py index 4f4ff5a068..0b893e8b9a 100644 --- a/sw/tools/parrot/parrot_utils.py +++ b/sw/tools/parrot/parrot_utils.py @@ -96,6 +96,8 @@ def connect(host): return tn, ftp except: print('Could not connect to Parrot UAV (host: ' + host + ')') + if host == '192.168.42.1': + print("Check whether your WiFi is connected and don't forget pressing the power button 4 times after the Bebop has booted!") exit(2) # Close the telnet and ftp