fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-16 05:03:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Critical: Fixes Snapdragon Flight parameter synchronization problem (#6910)

Browse Source 
* cmake: Fixes problem caused when the generated parameters.xml differs for the ARM and DSP builds.

* fix px4_getopt.h: add accidentally removed file
This commit is contained in:
Beat Küng
2017-03-28 16:10:17 +02:00
committed by ChristophTobler
parent 7ef3b92109
commit d7703173b2
15 changed files with 58 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/platforms/qurt/fc_addon/uart_esc/uart_esc_params.c
-8
View File
@@ -137,11 +137,3 @@ PARAM_DEFINE_INT32(UART_ESC_MOTOR3, 1);
* @group Snapdragon UART ESC
*/
PARAM_DEFINE_INT32(UART_ESC_MOTOR4, 3);
/**
* TODO-JYW: Temporary change until the reason can be determined why this
* same parameters is not read from src/platforms/px4_layer/params.c
*
* @group Snapdragon UART ESC
*/
PARAM_DEFINE_INT32(MAV_TYPE, 2);
src/platforms/qurt/px4_layer/CMakeLists.txt
-1
View File
@@ -42,7 +42,6 @@ set(QURT_LAYER_SRCS
../../posix/px4_layer/drv_hrt.c
qurt_stubs.c
main.cpp
params.c
shmem_qurt.c
)
if ("${QURT_ENABLE_STUBS}" STREQUAL "1")
src/platforms/qurt/px4_layer/params.c
-44
View File
@@ -1,44 +0,0 @@
/****************************************************************************
* Copyright (C) 2015 Mark Charlebois. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* 3. Neither the name PX4 nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
****************************************************************************/
#include <systemlib/param/param.h>
// This is added because it is a parameter used by commander, yet created by mavlink. Since mavlink is not
// running on QURT, we need to manually define it so it is available to commander. "2" is for quadrotor.
// Following is hack to prevent duplicate parameter definition error in param parser
/**
* @board QuRT_App
*/
// TODO-JYW: Temporarily removed to remove duplicate definition.
// PARAM_DEFINE_INT32(MAV_TYPE, 2);