Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-04 05:42:49 +08:00
Code Issues Actions 29 Packages Projects Releases Wiki Activity

[ardrone] harder kill and no led prints

Browse Source
This commit is contained in:
Christophe De Wagter
2013-11-27 17:01:48 +01:00
parent f46df1cd67
commit 11976e9b73
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/airborne/boards/ardrone/actuators_ardrone2_raw.c
+1 -1
View File
@@ -270,7 +270,7 @@ void actuators_ardrone_set_leds(uint8_t led0, uint8_t led1, uint8_t led2, uint8_
led2 &= 0x03; led2 &= 0x03;
led3 &= 0x03; led3 &= 0x03;
printf("LEDS: %d %d %d %d \n", led0, led1, led2, led3); //printf("LEDS: %d %d %d %d \n", led0, led1, led2, led3);
cmd[0]=0x60 | ((led0&1)<<4) | ((led1&1)<<3) | ((led2&1)<<2) | ((led3&1) <<1); cmd[0]=0x60 | ((led0&1)<<4) | ((led1&1)<<3) | ((led2&1)<<2) | ((led3&1) <<1);
cmd[1]=((led0&2)<<3) | ((led1&2)<<2) | ((led2&2)<<1) | ((led3&2)<<0); cmd[1]=((led0&2)<<3) | ((led1&2)<<2) | ((led2&2)<<1) | ((led3&2)<<0);
sw/ext/ardrone2_drivers/ardrone2.py
+2 -2
View File
@@ -270,7 +270,7 @@ elif args.command == 'upload_gst_module':
print('Uploading ...' + args.file) print('Uploading ...' + args.file)
ftp.storbinary("STOR " + args.file, file(args.file, "rb")) ftp.storbinary("STOR " + args.file, file(args.file, "rb"))
execute_command("chmod 777 /data/video/" + args.file) execute_command("chmod 777 /data/video/" + args.file)
print(execute_command("mv /data/video/" + args.file + " /data/video/opt/arm/gst/lib/gstreamer-0.10")) execute_command("mv /data/video/" + args.file + " /data/video/opt/arm/gst/lib/gstreamer-0.10")
if check_vision_running(): if check_vision_running():
print('Info: Vision framework already started') print('Info: Vision framework already started')
else: else:
@@ -296,7 +296,7 @@ elif args.command == 'upload_paparazzi':
f = args.file.rsplit('/', 1) f = args.file.rsplit('/', 1)
print("Kill running ap.elf and make folder " + args.folder) print("Kill running ap.elf and make folder " + args.folder)
execute_command("killall " + f[1]) execute_command("killall -9 " + f[1])
sleep(1) sleep(1)
execute_command("mkdir -p " + args.folder) execute_command("mkdir -p " + args.folder)
print('Uploading \'' + f[1] + "\' from " + f[0] + " to " + args.folder) print('Uploading \'' + f[1] + "\' from " + f[0] + " to " + args.folder)