Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-06-02 11:59:17 +08:00
Code Issues Actions 21 Packages Projects Releases Wiki Activity

Compile fixes for old/unused targets.

Browse Source 
These are some changes that I needed to compile
most of the unsupported targets.

After this all (make list_config_targets) compile
for me except: posix_eagle_muorb, posix_sdflight_default
and qurt_eagle_legacy_driver_default.
This commit is contained in:
Carlo Wood
2016-10-19 16:53:11 +02:00
committed by Lorenz Meier
parent 1999ed2601
commit 5b52cd0fe6
10 changed files with 88 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/configs/posix_eagle_hil.cmake
+10 -1
View File
@@ -7,10 +7,17 @@ if("${DSPAL_STUBS_ENABLE}" STREQUAL "")
set(DSPAL_STUBS_ENABLE "1") set(DSPAL_STUBS_ENABLE "1")
endif() endif()
set(CMAKE_TOOLCHAIN_FILE ${PX4_SOURCE_DIR}/cmake/toolchains/Toolchain-arm-linux-gnueabihf.cmake) set(CMAKE_TOOLCHAIN_FILE ${PX4_SOURCE_DIR}/cmake/cmake_hexagon/toolchain/Toolchain-arm-linux-gnueabihf.cmake)
set(config_generate_parameters_scope ALL) set(config_generate_parameters_scope ALL)
# Get $QC_SOC_TARGET from environment if existing.
if (DEFINED ENV{QC_SOC_TARGET})
set(QC_SOC_TARGET $ENV{QC_SOC_TARGET})
else()
set(QC_SOC_TARGET "APQ8074")
endif()
set(config_module_list set(config_module_list
drivers/device drivers/device
drivers/boards/sitl drivers/boards/sitl
@@ -31,8 +38,10 @@ set(config_module_list
modules/simulator modules/simulator
modules/commander modules/commander
lib/controllib
lib/mathlib lib/mathlib
lib/mathlib/math/filter lib/mathlib/math/filter
lib/ecl
lib/geo lib/geo
lib/geo_lookup lib/geo_lookup
lib/conversion lib/conversion
cmake/configs/posix_eagle_muorb.cmake
+8 -1
View File
@@ -1,11 +1,18 @@
include(posix/px4_impl_posix) include(posix/px4_impl_posix)
set(CMAKE_TOOLCHAIN_FILE ${PX4_SOURCE_DIR}/cmake/toolchains/Toolchain-arm-linux-gnueabihf.cmake) set(CMAKE_TOOLCHAIN_FILE ${PX4_SOURCE_DIR}/cmake/cmake_hexagon/toolchain/Toolchain-arm-linux-gnueabihf.cmake)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PX4_SOURCE_DIR}/cmake/cmake_hexagon") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PX4_SOURCE_DIR}/cmake/cmake_hexagon")
set(config_generate_parameters_scope ALL) set(config_generate_parameters_scope ALL)
# Get $QC_SOC_TARGET from environment if existing.
if (DEFINED ENV{QC_SOC_TARGET})
set(QC_SOC_TARGET $ENV{QC_SOC_TARGET})
else()
set(QC_SOC_TARGET "APQ8074")
endif()
set(config_module_list set(config_module_list
drivers/device drivers/device
cmake/configs/posix_sdflight_default.cmake
+8 -1
View File
@@ -7,12 +7,19 @@ else()
set(QC_SOC_TARGET "APQ8074") set(QC_SOC_TARGET "APQ8074")
endif() endif()
set(CMAKE_TOOLCHAIN_FILE ${PX4_SOURCE_DIR}/cmake/toolchains/Toolchain-arm-linux-gnueabihf.cmake) set(CMAKE_TOOLCHAIN_FILE ${PX4_SOURCE_DIR}/cmake/cmake_hexagon/toolchain/Toolchain-arm-linux-gnueabihf.cmake)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PX4_SOURCE_DIR}/cmake/cmake_hexagon") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PX4_SOURCE_DIR}/cmake/cmake_hexagon")
set(config_generate_parameters_scope ALL) set(config_generate_parameters_scope ALL)
# Get $QC_SOC_TARGET from environment if existing.
if (DEFINED ENV{QC_SOC_TARGET})
set(QC_SOC_TARGET $ENV{QC_SOC_TARGET})
else()
set(QC_SOC_TARGET "APQ8074")
endif()
set(CONFIG_SHMEM "1") set(CONFIG_SHMEM "1")
set(config_module_list set(config_module_list
cmake/configs/qurt_eagle_hello.cmake
+11 -3
View File
@@ -6,11 +6,19 @@ else()
set(HEXAGON_SDK_ROOT $ENV{HEXAGON_SDK_ROOT}) set(HEXAGON_SDK_ROOT $ENV{HEXAGON_SDK_ROOT})
endif() endif()
set(CMAKE_TOOLCHAIN_FILE ${PX4_SOURCE_DIR}/cmake/cmake_hexagon/toolchain/Toolchain-qurt.cmake) set(config_generate_parameters_scope ALL)
# Get $QC_SOC_TARGET from environment if existing.
if (DEFINED ENV{QC_SOC_TARGET})
set(QC_SOC_TARGET $ENV{QC_SOC_TARGET})
else()
set(QC_SOC_TARGET "APQ8074")
endif()
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PX4_SOURCE_DIR}/cmake/cmake_hexagon") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PX4_SOURCE_DIR}/cmake/cmake_hexagon")
include(toolchain/Toolchain-qurt)
set(config_generate_parameters_scope ALL) include(qurt_flags)
include_directories(${HEXAGON_SDK_INCLUDES})
set(config_module_list set(config_module_list
drivers/device drivers/device
cmake/configs/qurt_eagle_hil.cmake
+11 -3
View File
@@ -6,11 +6,19 @@ else()
set(HEXAGON_SDK_ROOT $ENV{HEXAGON_SDK_ROOT}) set(HEXAGON_SDK_ROOT $ENV{HEXAGON_SDK_ROOT})
endif() endif()
set(CMAKE_TOOLCHAIN_FILE ${PX4_SOURCE_DIR}/cmake/cmake_hexagon/toolchain/Toolchain-qurt.cmake) set(config_generate_parameters_scope ALL)
# Get $QC_SOC_TARGET from environment if existing.
if (DEFINED ENV{QC_SOC_TARGET})
set(QC_SOC_TARGET $ENV{QC_SOC_TARGET})
else()
set(QC_SOC_TARGET "APQ8074")
endif()
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PX4_SOURCE_DIR}/cmake/cmake_hexagon") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PX4_SOURCE_DIR}/cmake/cmake_hexagon")
include(toolchain/Toolchain-qurt)
set(config_generate_parameters_scope ALL) include(qurt_flags)
include_directories(${HEXAGON_SDK_INCLUDES})
set(config_module_list set(config_module_list
drivers/device drivers/device
cmake/configs/qurt_eagle_muorb.cmake
+11 -3
View File
@@ -6,11 +6,19 @@ else()
set(HEXAGON_SDK_ROOT $ENV{HEXAGON_SDK_ROOT}) set(HEXAGON_SDK_ROOT $ENV{HEXAGON_SDK_ROOT})
endif() endif()
set(CMAKE_TOOLCHAIN_FILE ${PX4_SOURCE_DIR}/cmake/cmake_hexagon/toolchain/Toolchain-qurt.cmake) set(config_generate_parameters_scope ALL)
# Get $QC_SOC_TARGET from environment if existing.
if (DEFINED ENV{QC_SOC_TARGET})
set(QC_SOC_TARGET $ENV{QC_SOC_TARGET})
else()
set(QC_SOC_TARGET "APQ8074")
endif()
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PX4_SOURCE_DIR}/cmake/cmake_hexagon") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PX4_SOURCE_DIR}/cmake/cmake_hexagon")
include(toolchain/Toolchain-qurt)
set(config_generate_parameters_scope ALL) include(qurt_flags)
include_directories(${HEXAGON_SDK_INCLUDES})
set(config_module_list set(config_module_list
drivers/device drivers/device
cmake/configs/qurt_eagle_test.cmake
+12 -3
View File
@@ -6,11 +6,20 @@ else()
set(HEXAGON_SDK_ROOT $ENV{HEXAGON_SDK_ROOT}) set(HEXAGON_SDK_ROOT $ENV{HEXAGON_SDK_ROOT})
endif() endif()
set(CMAKE_TOOLCHAIN_FILE ${PX4_SOURCE_DIR}/cmake/cmake_hexagon/toolchain/Toolchain-qurt.cmake)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PX4_SOURCE_DIR}/cmake/cmake_hexagon")
set(config_generate_parameters_scope ALL) set(config_generate_parameters_scope ALL)
# Get $QC_SOC_TARGET from environment if existing.
if (DEFINED ENV{QC_SOC_TARGET})
set(QC_SOC_TARGET $ENV{QC_SOC_TARGET})
else()
set(QC_SOC_TARGET "APQ8074")
endif()
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PX4_SOURCE_DIR}/cmake/cmake_hexagon")
include(toolchain/Toolchain-qurt)
include(qurt_flags)
include_directories(${HEXAGON_SDK_INCLUDES})
set(config_module_list set(config_module_list
drivers/device drivers/device
cmake/configs/qurt_eagle_travis.cmake
+12 -7
View File
@@ -5,21 +5,26 @@ set(CONFIG_SHMEM "1")
# Run a full link with build stubs to make sure qurt target isn't broken # Run a full link with build stubs to make sure qurt target isn't broken
set(QURT_ENABLE_STUBS "1") set(QURT_ENABLE_STUBS "1")
set(CMAKE_TOOLCHAIN_FILE ${PX4_SOURCE_DIR}/cmake/cmake_hexagon/toolchain/Toolchain-qurt.cmake)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PX4_SOURCE_DIR}/cmake/cmake_hexagon")
include(hexagon_sdk)
if ("$ENV{HEXAGON_SDK_ROOT}" STREQUAL "") if ("$ENV{HEXAGON_SDK_ROOT}" STREQUAL "")
message(FATAL_ERROR "Enviroment variable HEXAGON_SDK_ROOT must be set") message(FATAL_ERROR "Enviroment variable HEXAGON_SDK_ROOT must be set")
else() else()
set(HEXAGON_SDK_ROOT $ENV{HEXAGON_SDK_ROOT}) set(HEXAGON_SDK_ROOT $ENV{HEXAGON_SDK_ROOT})
endif() endif()
include_directories(${HEXAGON_8074_INCLUDES})
set(config_generate_parameters_scope ALL) set(config_generate_parameters_scope ALL)
# Get $QC_SOC_TARGET from environment if existing.
if (DEFINED ENV{QC_SOC_TARGET})
set(QC_SOC_TARGET $ENV{QC_SOC_TARGET})
else()
set(QC_SOC_TARGET "APQ8074")
endif()
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PX4_SOURCE_DIR}/cmake/cmake_hexagon")
include(toolchain/Toolchain-qurt)
include(qurt_flags)
include_directories(${HEXAGON_SDK_INCLUDES})
set(config_module_list set(config_module_list
drivers/device drivers/device
drivers/boards/sitl drivers/boards/sitl
src/platforms/posix/tests/hrt_test/hrt_test.cpp
+2
View File
@@ -39,11 +39,13 @@
* @author Mark Charlebois <charlebm@gmail.com> * @author Mark Charlebois <charlebm@gmail.com>
*/ */
#include "px4_log.h"
#include <px4_time.h> #include <px4_time.h>
#include <drivers/drv_hrt.h> #include <drivers/drv_hrt.h>
#include "hrt_test.h" #include "hrt_test.h"
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
#include <cstring>
px4::AppState HRTTest::appState; px4::AppState HRTTest::appState;
src/platforms/qurt/tests/muorb/muorb_test_example.cpp
+3 -3
View File
@@ -88,7 +88,7 @@ int MuorbTestExample::DefaultTest()
int i = 0; int i = 0;
pwm.error_count++; pwm.error_count++;
sc.gyro_errcount[i]++; /*sc.gyro_errcount[i]++;*/ // no member named 'gyro_errcount' in 'sensor_combined_s'
while (!appState.exitRequested() && i < 10) { while (!appState.exitRequested() && i < 10) {
@@ -184,8 +184,8 @@ int MuorbTestExample::FileReadTest()
static const char TEST_FILE_PATH[] = "./test.txt"; static const char TEST_FILE_PATH[] = "./test.txt";
FILE *fp; FILE *fp;
char *line = NULL; char *line = NULL;
size_t len = 0; /*size_t len = 0;
ssize_t read; ssize_t read;*/
fp = fopen(TEST_FILE_PATH, "r"); fp = fopen(TEST_FILE_PATH, "r");