diff --git a/Tools/px4_snapflight_sanitytest.sh b/Tools/px4_snapflight_sanitytest.sh index 5559f343fe..b91532f06e 100644 --- a/Tools/px4_snapflight_sanitytest.sh +++ b/Tools/px4_snapflight_sanitytest.sh @@ -27,7 +27,8 @@ set -e # Mode of operation readonly MODE_DEFAULT=0 readonly MODE_LEGACY=1 -readonly MODE_MAX=$MODE_LEGACY +readonly MODE_8x96=2 +readonly MODE_MAX=$MODE_8x96 readonly RESULT_PASS=0 readonly RESULT_FAIL=3 @@ -71,6 +72,12 @@ workspace=`pwd`/.. verifypx4test() { + #TODO: This needs to be fixed. For now, skip string checks for 8x96 platform. + if [ $mode == 2 ]; then + echo -e "[WARNING] Skipping string checks for 8x96 platform" + return + fi + echo -e "Verifying test results..." # verify the presence of expected stings in the apps proc console log @@ -135,7 +142,7 @@ installpx4() { # Reboot the target before beginning the installation echo -e "Rebooting the target..." - adb shell reboot + adb reboot sleep 45 echo -e "Now installing PX4 binaries..." @@ -147,13 +154,19 @@ installpx4() { adb push $workspace/build_posix_eagle_default/src/firmware/posix/px4 /home/linaro adb push $workspace/posix-configs/eagle/flight/px4.config /usr/share/data/adsp adb push $workspace/posix-configs/eagle/flight/mainapp.config /home/linaro - else + elif [ $mode == 1 ]; then # copy legacy binaries adb push $workspace/build_qurt_eagle_legacy/src/firmware/qurt/libpx4.so /usr/share/data/adsp adb push $workspace/build_qurt_eagle_legacy/src/firmware/qurt/libpx4muorb_skel.so /usr/share/data/adsp adb push $workspace/build_posix_eagle_legacy/src/firmware/posix/px4 /home/linaro adb push $workspace/posix-configs/eagle/200qx/px4.config /usr/share/data/adsp adb push $workspace/posix-configs/eagle/200qx/mainapp.config /home/linaro + else + adb push $workspace/build_qurt_excelsior_legacy/src/firmware/qurt/libpx4.so /usr/lib/rfsa/adsp + adb push $workspace/build_qurt_excelsior_legacy/src/firmware/qurt/libpx4muorb_skel.so /usr/lib/rfsa/adsp + adb push $workspace/build_posix_excelsior_legacy/src/firmware/posix/px4 /home/root + adb push $workspace/posix-configs/excelsior/px4.config /usr/lib/rfsa/adsp + adb push $workspace/posix-configs/excelsior/mainapp.config /home/root fi echo -e "Installation complete." @@ -186,7 +199,13 @@ testpx4() { # Start PX4 - adb shell "/home/linaro/px4 /home/linaro/mainapp.config" > px4.log 2>&1 & + if [ $mode == 2 ]; then + # 8x96 platform + adb shell "/home/root/px4 /home/root/mainapp.config" > px4.log 2>&1 & + else + # 8x74 platform + adb shell "/home/linaro/px4 /home/linaro/mainapp.config" > px4.log 2>&1 & + fi sleep 20 # Verify that PX4 is still running checkProc=$(adb shell "ps -aef | grep px4 | grep -v grep")