dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

fix bebop upload script

This commit is contained in:
Bart Slinger 2019-05-11 14:34:51 +02:00 committed by Lorenz Meier
parent e80d3940a6
commit ebf8bc898a
5 changed files with 43 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boards/parrot/bebop/CMakeLists.txt
View File

@ -39,7 +39,7 @@ add_subdirectory(flow)
############################################################################ ############################################################################
add_custom_target(upload add_custom_target(upload
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/scripts/adb_upload_to_bebop.sh ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/. /data/ftp/internal_000 COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/scripts/adb_upload_to_bebop.sh ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/bin/. /data/ftp/internal_000/px4
DEPENDS px4 DEPENDS px4
COMMENT "uploading px4" COMMENT "uploading px4"
USES_TERMINAL USES_TERMINAL

32
boards/parrot/bebop/scripts/adb_upload.sh Executable file
View File

@ -0,0 +1,32 @@
#!/bin/bash
if [[ "$#" < 2 ]]; then
echo "usage: adb_upload.sh SRC1 [SRC2 ...] DEST"
exit
fi
# Get last argument
for last; do true; done
echo "Wait for device..."
adb wait-for-device
echo "Creating folder structure..."
adb shell mkdir -p $last
echo "Uploading..."
# Go through source files and push them one by one.
i=0
for arg
do
if [[ $((i+1)) == "$#" ]]; then
break
fi
echo "Pushing $arg to $last"
adb push $arg $last
((i+=1))
done
# Make sure they are synced to the file system
echo "Syncing FS..."
adb shell sync

6
boards/parrot/bebop/scripts/adb_upload_to_bebop.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
BASEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" BASEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
SRC_DIR="$BASEDIR/../" SRC_DIR="$BASEDIR/../../../../"
if [ -z ${BEBOP_IP+x} ]; then if [ -z ${BEBOP_IP+x} ]; then
ip=192.168.42.1 ip=192.168.42.1
@ -65,3 +65,7 @@ adb shell sync
echo "Disconnecting from Bebop" echo "Disconnecting from Bebop"
adb disconnect adb disconnect
echo ""
echo "To start PX4, run the following command on the Bebop:"
echo "/data/ftp/internal_000/px4/px4 -s /home/root/px4.config /data/ftp/internal_000/px4/"

8
posix-configs/bebop/px4.config
View File

@ -17,7 +17,7 @@ param set MPC_XY_VEL_P 0.12
param set MPC_XY_P 1.3 param set MPC_XY_P 1.3
param set MPC_XY_VEL_D 0.006 param set MPC_XY_VEL_D 0.006
param set MPC_XY_VEL_I 0.05 param set MPC_XY_VEL_I 0.05
param set MPC_XY_VEL_MAX 8 param set MPC_XY_VEL_MAX 12
param set MPC_Z_VEL_P 0.3 param set MPC_Z_VEL_P 0.3
param set MPC_Z_VEL_I 0.1 param set MPC_Z_VEL_I 0.1
@ -26,15 +26,15 @@ param set MC_YAW_P 3.0
param set MC_YAWRATE_P 0.05 param set MC_YAWRATE_P 0.05
param set MC_YAWRATE_I 3.0 param set MC_YAWRATE_I 3.0
param set MC_ROLLRATE_P 0.07 param set MC_ROLLRATE_P 0.05
param set MC_ROLLRATE_I 0.5 param set MC_ROLLRATE_I 0.5
param set MC_ROLLRATE_D 0.0 param set MC_ROLLRATE_D 0.0
param set MC_RR_INT_LIM 0.5 param set MC_RR_INT_LIM 0.3
param set MC_PITCHRATE_P 0.1 param set MC_PITCHRATE_P 0.1
param set MC_PITCHRATE_I 0.8 param set MC_PITCHRATE_I 0.8
param set MC_PITCHRATE_D 0.0 param set MC_PITCHRATE_D 0.0
param set MC_PR_INT_LIM 0.5 param set MC_PR_INT_LIM 0.3
df_ms5607_wrapper start df_ms5607_wrapper start
df_mpu6050_wrapper start -R 8 df_mpu6050_wrapper start -R 8

2
src/platforms/px4_defines.h
View File

@ -159,7 +159,7 @@ __END_DECLS
# if defined(__PX4_POSIX_EAGLE) || defined(__PX4_POSIX_EXCELSIOR) # if defined(__PX4_POSIX_EAGLE) || defined(__PX4_POSIX_EXCELSIOR)
# define PX4_ROOTFSDIR "/home/linaro" # define PX4_ROOTFSDIR "/home/linaro"
# elif defined(__PX4_POSIX_BEBOP) # elif defined(__PX4_POSIX_BEBOP)
# define PX4_ROOTFSDIR "/data/ftp/internal_000" # define PX4_ROOTFSDIR "/data/ftp/internal_000/px4"
# else # else
# define PX4_ROOTFSDIR "." # define PX4_ROOTFSDIR "."
# endif # endif