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

Path cleanup, low impact changes (#5340)

Browse Source 
* Low impact changes from path_cleanup branch.

This is a step towards minimizing the diff with path_cleanup branch.

* Update ecl.

* Revert matrix update.

* Revert ecl and matrix.

* Update sitl gazebo.

* Revert sitl_gazebo and matrix changes.
This commit is contained in:
James Goppert
2016-08-18 15:37:23 -04:00
committed by GitHub
parent d32a7ffb8d
commit 818840b576
54 changed files with 277 additions and 523 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/firmware/nuttx/CMakeLists.txt
+9 -9
View File
@@ -10,7 +10,7 @@ add_executable(firmware_nuttx
builtin_commands.c)
set(nuttx_export_dir ${CMAKE_BINARY_DIR}/${BOARD}/NuttX/nuttx-export)
set(nuttx_export_dir ${PX4_BINARY_DIR}/${BOARD}/NuttX/nuttx-export)
set(link_libs
romfs apps nuttx m gcc
@@ -20,7 +20,7 @@ if(NOT ${BOARD} STREQUAL "sim")
list(APPEND link_libs nosys)
set(main_link_flags
"-T${nuttx_export_dir}/build/ld.script"
"-Wl,-Map=${CMAKE_BINARY_DIR}/${BOARD}/main.map"
"-Wl,-Map=${PX4_BINARY_DIR}/${BOARD}/main.map"
)
px4_join(OUT main_link_flags LIST ${main_link_flags} GLUE " ")
set_target_properties(firmware_nuttx PROPERTIES LINK_FLAGS ${main_link_flags})
@@ -43,12 +43,12 @@ add_custom_target(check_weak
if(NOT ${BOARD} STREQUAL "sim")
if (config_io_board)
set(extras "${CMAKE_BINARY_DIR}/src/modules/px4iofirmware/${config_io_board}.bin")
set(extras "${PX4_BINARY_DIR}/src/modules/px4iofirmware/${config_io_board}.bin")
endif()
set(romfs_dir "ROMFS/px4fmu_common")
if (${BOARD} STREQUAL "tap-v1")
set(romfs_dir "ROMFS/tap_common")
set(romfs_dir "ROMFS/tap_common")
endif()
if (${BOARD} STREQUAL "px4fmu-v2" AND ${LABEL} STREQUAL "test")
set(romfs_dir "ROMFS/px4fmu_test")
@@ -68,8 +68,8 @@ if(NOT ${BOARD} STREQUAL "sim")
px4_nuttx_add_firmware(OUT ${fw_file}
BOARD ${BOARD}
EXE ${CMAKE_CURRENT_BINARY_DIR}/firmware_nuttx
PARAM_XML ${CMAKE_BINARY_DIR}/parameters.xml
AIRFRAMES_XML ${CMAKE_BINARY_DIR}/airframes.xml
PARAM_XML ${PX4_BINARY_DIR}/parameters.xml
AIRFRAMES_XML ${PX4_BINARY_DIR}/airframes.xml
)
configure_file(gdbinit.in .gdbinit)
@@ -94,21 +94,21 @@ if(NOT ${BOARD} STREQUAL "sim")
add_custom_target(debug_io
COMMAND ${GDB}
${CMAKE_BINARY_DIR}/src/modules/px4iofirmware/${config_io_board}
${PX4_BINARY_DIR}/src/modules/px4iofirmware/${config_io_board}
DEPENDS firmware_nuttx
${CMAKE_CURRENT_BINARY_DIR}/.gdbinit
)
add_custom_target(debug_io_tui
COMMAND ${GDBTUI}
${CMAKE_BINARY_DIR}/src/modules/px4iofirmware/${config_io_board}
${PX4_BINARY_DIR}/src/modules/px4iofirmware/${config_io_board}
DEPENDS firmware_nuttx
${CMAKE_CURRENT_BINARY_DIR}/.gdbinit
)
add_custom_target(debug_io_ddd
COMMAND ${DDD} --debugger ${GDB}
${CMAKE_BINARY_DIR}/src/modules/px4iofirmware/${config_io_board}
${PX4_BINARY_DIR}/src/modules/px4iofirmware/${config_io_board}
DEPENDS firmware_nuttx
${CMAKE_CURRENT_BINARY_DIR}/.gdbinit
)
src/firmware/nuttx/gdbinit.in
+1 -1
View File
@@ -4,4 +4,4 @@ attach 1
monitor vector_catch disable hard
set mem inaccessible-by-default off
set print pretty
source ${CMAKE_SOURCE_DIR}/Debug/PX4
source ${PX4_SOURCE_DIR}/Debug/PX4
src/firmware/posix/CMakeLists.txt
+11 -11
View File
@@ -18,7 +18,7 @@ if ("${BOARD}" STREQUAL "eagle" OR ("${BOARD}" STREQUAL "excelsior"))
APPS_DEST "/home/linaro"
SOURCES
px4muorb_stub.c
${CMAKE_SOURCE_DIR}/src/platforms/posix/main.cpp
${PX4_SOURCE_DIR}/src/platforms/posix/main.cpp
apps.h
LINK_LIBS
-Wl,--start-group
@@ -33,14 +33,14 @@ if ("${BOARD}" STREQUAL "eagle" OR ("${BOARD}" STREQUAL "excelsior"))
OS ${OS}
BOARD ${BOARD}
FILES ${CMAKE_CURRENT_BINARY_DIR}/px4
${CMAKE_SOURCE_DIR}/posix-configs/eagle/flight/mainapp.config
${PX4_SOURCE_DIR}/posix-configs/eagle/flight/mainapp.config
DEPENDS px4
DEST /home/linaro)
elseif ("${BOARD}" STREQUAL "rpi")
add_executable(px4
${CMAKE_SOURCE_DIR}/src/platforms/posix/main.cpp
${PX4_SOURCE_DIR}/src/platforms/posix/main.cpp
apps.h
)
@@ -57,7 +57,7 @@ elseif ("${BOARD}" STREQUAL "rpi")
OS ${OS}
BOARD ${BOARD}
FILES ${CMAKE_CURRENT_BINARY_DIR}/px4
${CMAKE_SOURCE_DIR}/posix-configs/rpi/px4.config
${PX4_SOURCE_DIR}/posix-configs/rpi/px4.config
DEPENDS px4
DEST /home/pi)
@@ -67,7 +67,7 @@ elseif ("${BOARD}" STREQUAL "bebop")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static")
add_executable(px4
${CMAKE_SOURCE_DIR}/src/platforms/posix/main.cpp
${PX4_SOURCE_DIR}/src/platforms/posix/main.cpp
apps.h
)
@@ -91,14 +91,14 @@ elseif ("${BOARD}" STREQUAL "bebop")
OS ${OS}
BOARD ${BOARD}
FILES ${CMAKE_CURRENT_BINARY_DIR}/px4
${CMAKE_SOURCE_DIR}/posix-configs/bebop/px4.config
${PX4_SOURCE_DIR}/posix-configs/bebop/px4.config
DEPENDS px4
DEST /usr/bin)
else()
add_executable(px4
${CMAKE_SOURCE_DIR}/src/platforms/posix/main.cpp
${PX4_SOURCE_DIR}/src/platforms/posix/main.cpp
apps.h
)
if (NOT APPLE)
@@ -120,8 +120,8 @@ endif()
add_custom_target(run_config
COMMAND Tools/sitl_run.sh "${config_sitl_rcS}" "${config_sitl_debugger}"
"${config_sitl_viewer}" "${config_sitl_model}" "${CMAKE_BINARY_DIR}"
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
"${config_sitl_viewer}" "${config_sitl_model}" "${PX4_BINARY_DIR}"
WORKING_DIRECTORY ${PX4_SOURCE_DIR}
USES_TERMINAL
)
add_dependencies(run_config px4)
@@ -145,8 +145,8 @@ foreach(viewer none jmavsim gazebo replay)
add_custom_target(${_targ_name}
COMMAND Tools/sitl_run.sh "${config_sitl_rcS}"
"${debugger}"
"${viewer}" "${model}" "${CMAKE_BINARY_DIR}"
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
"${viewer}" "${model}" "${PX4_BINARY_DIR}"
WORKING_DIRECTORY ${PX4_SOURCE_DIR}
USES_TERMINAL
)
add_dependencies(${_targ_name} px4)
src/firmware/qurt/CMakeLists.txt
+6 -6
View File
@@ -1,4 +1,4 @@
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/cmake_hexagon")
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PX4_SOURCE_DIR}/cmake/cmake_hexagon")
include(fastrpc)
include(qurt_lib)
@@ -7,7 +7,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-missing-prototypes")
px4_qurt_generate_builtin_commands(
OUT ${CMAKE_BINARY_DIR}/apps.h
OUT ${PX4_BINARY_DIR}/apps.h
MODULE_LIST ${module_libraries})
FASTRPC_STUB_GEN(px4muorb.idl)
@@ -20,8 +20,8 @@ if ("${QURT_ENABLE_STUBS}" STREQUAL "1")
${FASTRPC_DSP_INCLUDES}
)
add_executable(px4
${CMAKE_BINARY_DIR}/src/firmware/qurt/px4muorb_skel.c
${CMAKE_BINARY_DIR}/apps.h)
${PX4_BINARY_DIR}/src/firmware/qurt/px4muorb_skel.c
${PX4_BINARY_DIR}/apps.h)
target_link_libraries(px4
-Wl,--start-group
@@ -40,7 +40,7 @@ else()
QURT_LIB(LIB_NAME px4
IDL_NAME px4muorb
SOURCES
${CMAKE_BINARY_DIR}/apps.h
${PX4_BINARY_DIR}/apps.h
LINK_LIBS
${module_libraries}
${target_libraries}
@@ -54,7 +54,7 @@ else()
BOARD ${BOARD}
FILES ${CMAKE_CURRENT_BINARY_DIR}/libpx4.so
${CMAKE_CURRENT_BINARY_DIR}/libpx4muorb_skel.so
${CMAKE_SOURCE_DIR}/posix-configs/eagle/flight/px4.config
${PX4_SOURCE_DIR}/posix-configs/eagle/flight/px4.config
DEPENDS px4 px4muorb_skel
DEST /usr/share/data/adsp)
endif()
src/lib/rc/rc_tests/CMakeLists.txt
+1
View File
@@ -40,4 +40,5 @@ px4_add_module(
DEPENDS
platforms__common
)
# vim: set noet ft=cmake fenc=utf-8 ff=unix :
src/lib/rc/rc_tests/RCTest.cpp
+1 -1
View File
@@ -16,7 +16,7 @@
#if !defined(CONFIG_ARCH_BOARD_SITL)
#define TEST_DATA_PATH "/fs/microsd"
#else
#define TEST_DATA_PATH "../../../../src/lib/rc/rc_tests/test_data/"
#define TEST_DATA_PATH "../../../../test_data/"
#endif
extern "C" __EXPORT int rc_tests_main(int argc, char *argv[]);
src/lib/rc/rc_tests/test_data/dsm_x_data.txt
-1106
View File
File diff suppressed because it is too large Load Diff
src/lib/rc/rc_tests/test_data/sbus2_r7008SB.txt
-2166
View File
File diff suppressed because it is too large Load Diff
src/lib/rc/rc_tests/test_data/st24_data.txt
-18019
View File
File diff suppressed because it is too large Load Diff
src/lib/rc/rc_tests/test_data/sumd_data.txt
-14472
View File
File diff suppressed because it is too large Load Diff
src/modules/muorb/krait/CMakeLists.txt
+2 -2
View File
@@ -30,10 +30,10 @@
# POSSIBILITY OF SUCH DAMAGE.
#
############################################################################
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/cmake_hexagon")
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PX4_SOURCE_DIR}/cmake/cmake_hexagon")
include(hexagon_sdk)
include_directories(${CMAKE_BINARY_DIR}/src/firmware/posix)
include_directories(${PX4_BINARY_DIR}/src/firmware/posix)
include_directories(${HEXAGON_SDK_INCLUDES})
px4_add_module(
src/modules/param/CMakeLists.txt
+2 -2
View File
@@ -34,8 +34,8 @@
include_directories(${CMAKE_CURRENT_BINARY_DIR})
px4_generate_parameters_source(OUT param_files
XML ${CMAKE_BINARY_DIR}/parameters.xml
SCOPE ${CMAKE_SOURCE_DIR}/cmake/configs/${OS}_${BOARD}_${LABEL}.cmake
XML ${PX4_BINARY_DIR}/parameters.xml
SCOPE ${PX4_SOURCE_DIR}/cmake/configs/${OS}_${BOARD}_${LABEL}.cmake
DEPS xml_gen
)
src/modules/px4iofirmware/CMakeLists.txt
+3 -3
View File
@@ -63,7 +63,7 @@ px4_join(OUT CMAKE_CXX_FLAGS LIST "${cxx_flags}" GLUE " ")
include_directories(
${include_dirs}
${CMAKE_BINARY_DIR}/src/modules/systemlib/mixer
${PX4_BINARY_DIR}/src/modules/systemlib/mixer
.
)
link_directories(${link_dirs})
@@ -117,10 +117,10 @@ add_dependencies(${fw_io_name}
mixer_gen
)
set(nuttx_export_dir ${CMAKE_BINARY_DIR}/${config_io_board}/NuttX/nuttx-export)
set(nuttx_export_dir ${PX4_BINARY_DIR}/${config_io_board}/NuttX/nuttx-export)
set(main_link_flags
"-T${nuttx_export_dir}/build/ld.script"
"-Wl,-Map=${CMAKE_BINARY_DIR}/${config_io_board}/main.map"
"-Wl,-Map=${PX4_BINARY_DIR}/${config_io_board}/main.map"
)
px4_join(OUT main_link_flags LIST ${main_link_flags} GLUE " ")
set_target_properties(${fw_io_name} PROPERTIES LINK_FLAGS ${main_link_flags})
src/modules/systemlib/CMakeLists.txt
+1 -1
View File
@@ -32,7 +32,7 @@
############################################################################
# for generated files
include_directories(${CMAKE_BINARY_DIR}/src/modules/param)
include_directories(${PX4_BINARY_DIR}/src/modules/param)
set(SRCS
perf_counter.c
src/modules/uavcan/uavcan_servers.hpp
+1 -1
View File
@@ -70,7 +70,7 @@
/**
* A UAVCAN Server Sub node.
*/
class UavcanServers
class __EXPORT UavcanServers
{
static constexpr unsigned NumIfaces = 1; // UAVCAN_STM32_NUM_IFACES
src/platforms/posix/main.cpp
+2
View File
@@ -419,3 +419,5 @@ int main(int argc, char **argv)
return OK;
}
/* vim: set noet fenc=utf-8 ff=unix sts=0 sw=4 ts=4 : */
src/platforms/posix/px4_layer/CMakeLists.txt
+2 -2
View File
@@ -32,10 +32,10 @@
############################################################################
if("${CONFIG_SHMEM}" STREQUAL "1")
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/cmake_hexagon")
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PX4_SOURCE_DIR}/cmake/cmake_hexagon")
include(hexagon_sdk)
include_directories(${CMAKE_BINARY_DIR}/src/firmware/posix)
include_directories(${PX4_BINARY_DIR}/src/firmware/posix)
include_directories(${HEXAGON_SDK_INCLUDES})
list(APPEND SHMEM_SRCS
shmem_posix.c
src/platforms/qurt/px4_layer/CMakeLists.txt
+1 -1
View File
@@ -30,7 +30,7 @@
# POSSIBILITY OF SUCH DAMAGE.
#
############################################################################
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/cmake_hexagon")
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PX4_SOURCE_DIR}/cmake/cmake_hexagon")
include(hexagon_sdk)
include_directories(${HEXAGON_8074_INCLUDES})
src/systemcmds/tests/test_matrix.cpp
+14 -14
View File
@@ -405,22 +405,22 @@ bool MatrixTest::matrixAssignmentTests(void)
Matrix3f m3(data_times_2);
ut_test(isEqual(m, m2));
ut_test(!(m == m3));
ut_test(!isEqual(m, m3));
m2 *= 2;
ut_test(m2 == m3);
ut_test(isEqual(m2, m3));
m2 /= 2;
m2 -= 1;
float data_minus_1[9] = {0, 1, 2, 3, 4, 5, 6, 7, 8};
ut_test(Matrix3f(data_minus_1) == m2);
ut_test(isEqual(Matrix3f(data_minus_1), m2));
m2 += 1;
ut_test(Matrix3f(data) == m2);
ut_test(isEqual(Matrix3f(data), m2));
m3 -= m2;
ut_test(m3 == m2);
ut_test(isEqual(m3, m2));
float data_row_02_swap[9] = {
7, 8, 9,
@@ -436,13 +436,13 @@ bool MatrixTest::matrixAssignmentTests(void)
Matrix3f m4(data);
ut_test(-m4 == m4 * (-1));
ut_test(isEqual(-m4, m4 * (-1)));
m4.swapCols(0, 2);
ut_test(m4 == Matrix3f(data_col_02_swap));
ut_test(isEqual(m4, Matrix3f(data_col_02_swap)));
m4.swapCols(0, 2);
m4.swapRows(0, 2);
ut_test(m4 == Matrix3f(data_row_02_swap));
ut_test(isEqual(m4, Matrix3f(data_row_02_swap)));
ut_test(fabs(m4.min() - 1) < 1e-5);
Scalar<float> s;
@@ -601,10 +601,10 @@ bool MatrixTest::vectorTests(void)
ut_test(fabs(v1.dot(v2) - 130.0f) < 1e-5);
v2.normalize();
Vector<float, 5> v3(v2);
ut_test(v2 == v3);
ut_test(isEqual(v2, v3));
float data1_sq[] = {1, 4, 9, 16, 25};
Vector<float, 5> v4(data1_sq);
ut_test(v1 == v4.pow(0.5));
ut_test(isEqual(v1, v4.pow(0.5)));
return true;
}
@@ -639,15 +639,15 @@ bool MatrixTest::vector3Tests(void)
Vector3f a(1, 0, 0);
Vector3f b(0, 1, 0);
Vector3f c = a.cross(b);
ut_test(c == Vector3f(0, 0, 1));
ut_test(isEqual(c, Vector3f(0, 0, 1)));
c = a % b;
ut_test(c == Vector3f(0, 0, 1));
ut_test(isEqual(c, Vector3f(0, 0, 1)));
Matrix<float, 3, 1> d(c);
Vector3f e(d);
ut_test(e == d);
ut_test(isEqual(e, d));
float data[] = {4, 5, 6};
Vector3f f(data);
ut_test(f == Vector3f(4, 5, 6));
ut_test(isEqual(f, Vector3f(4, 5, 6)));
return true;
}
src/systemcmds/topic_listener/CMakeLists.txt
+2 -2
View File
@@ -32,14 +32,14 @@
############################################################################
add_custom_command(OUTPUT topic_listener.cpp
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/Tools/generate_listener.py ${CMAKE_SOURCE_DIR} > topic_listener.cpp
COMMAND ${PYTHON_EXECUTABLE} ${PX4_SOURCE_DIR}/Tools/generate_listener.py ${PX4_SOURCE_DIR} > topic_listener.cpp
DEPENDS msg_gen
)
add_custom_target(generate_topic_listener
DEPENDS
topic_listener.cpp
${CMAKE_SOURCE_DIR}/Tools/generate_listener.py)
${PX4_SOURCE_DIR}/Tools/generate_listener.py)
px4_add_module(
MODULE systemcmds__topic_listener