From c72de874d6ee25220663611e91f6fde757604653 Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Wed, 4 Jan 2017 09:29:19 +0100 Subject: [PATCH] Chance airframe and parameter meta generation to FMUv4 --- .travis.yml | 2 +- Tools/qgc_meta_sync.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3d8074a11a..07119ae51c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -82,7 +82,7 @@ after_success: make package_firmware && mkdir s3deploy-archive && cp Firmware.zip s3deploy-archive/ && cp Binaries/* . && find . -maxdepth 1 -mindepth 1 -type f -name 'nuttx-*-default.px4' | sed 's/.\/nuttx-//' | sed 's/-default.px4//' | xargs -I{} mv nuttx-{}-default.px4 {}_default.px4 - && mkdir s3deploy-branch && mv *_default.px4 Meta/px4fmu-v2_default/parameters.xml Meta/px4fmu-v2_default/airframes.xml s3deploy-branch/; + && mkdir s3deploy-branch && mv *_default.px4 Meta/px4fmu-v4_default/parameters.xml Meta/px4fmu-v4_default/airframes.xml s3deploy-branch/; fi - if [[ "${TRAVIS_OS_NAME}" = "linux" && "$GCC_VER" == "5.4" && "${TRAVIS_BRANCH}" != "coverity" ]]; then export PX4_S3_DEPLOY=1; diff --git a/Tools/qgc_meta_sync.sh b/Tools/qgc_meta_sync.sh index 69f6d8c42c..8ebcbdb3e5 100755 --- a/Tools/qgc_meta_sync.sh +++ b/Tools/qgc_meta_sync.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -make px4fmu-v2_default -cp build_px4fmu-v2_default/parameters.xml ../qgroundcontrol/src/FirmwarePlugin/PX4/PX4ParameterFactMetaData.xml -cp build_px4fmu-v2_default/airframes.xml ../qgroundcontrol/src/AutoPilotPlugins/PX4/AirframeFactMetaData.xml +make px4fmu-v4_default +cp build_px4fmu-v4_default/parameters.xml ../qgroundcontrol/src/FirmwarePlugin/PX4/PX4ParameterFactMetaData.xml +cp build_px4fmu-v4_default/airframes.xml ../qgroundcontrol/src/AutoPilotPlugins/PX4/AirframeFactMetaData.xml