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

cmake: qurt modules now build but do not link

Browse Source 
Managed to get the deps set up to build the qurt modules using a
config file for the list of modules.

NuttX link options are being set somewhere that break the qurt build

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
This commit is contained in:
Mark Charlebois
2015-09-08 13:16:12 -07:00
parent 0de5868ee2
commit eb40a6de77
8 changed files with 145 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/muorb/adsp/CMakeLists.txt
+2
View File
@@ -30,6 +30,8 @@
# POSSIBILITY OF SUCH DAMAGE.
#
############################################################################
include_directories("../../uORB")
px4_add_module(
MODULE modules__muorb__adsp
COMPILE_FLAGS
src/modules/muorb/adsp/px4muorb.cpp
+2 -3
View File
@@ -31,7 +31,7 @@
*
****************************************************************************/
#include "px4muorb.hpp"
#include "qurt.h"
//#include "qurt.h"
#include "uORBFastRpcChannel.hpp"
#include "uORBManager.hpp"
@@ -44,12 +44,11 @@
#include "uORB/topics/sensor_combined.h"
#include "uORB.h"
#include "HAP_power.h"
#define _ENABLE_MUORB 1
extern "C" {
int dspal_main(int argc, const char *argv[]);
void HAP_power_request(int a, int b, int c);
};
src/modules/systemlib/perf_counter.c
+7 -4
View File
@@ -47,6 +47,9 @@
#ifdef __PX4_QURT
#define dprintf(...)
#define ddeclare(...)
#else
#define ddeclare(...) __VA_ARGS_
#endif
/**
@@ -417,8 +420,8 @@ perf_print_counter_fd(int fd, perf_counter_t handle)
break;
case PC_ELAPSED: {
struct perf_ctr_elapsed *pce = (struct perf_ctr_elapsed *)handle;
float rms = sqrtf(pce->M2 / (pce->event_count - 1));
ddeclare(struct perf_ctr_elapsed *pce = (struct perf_ctr_elapsed *)handle;)
ddeclare(float rms = sqrtf(pce->M2 / (pce->event_count - 1));)
dprintf(fd, "%s: %llu events, %llu overruns, %lluus elapsed, %lluus avg, min %lluus max %lluus %5.3fus rms\n",
handle->name,
(unsigned long long)pce->event_count,
@@ -432,8 +435,8 @@ perf_print_counter_fd(int fd, perf_counter_t handle)
}
case PC_INTERVAL: {
struct perf_ctr_interval *pci = (struct perf_ctr_interval *)handle;
float rms = sqrtf(pci->M2 / (pci->event_count - 1));
ddeclare(struct perf_ctr_interval *pci = (struct perf_ctr_interval *)handle;)
ddeclare(float rms = sqrtf(pci->M2 / (pci->event_count - 1));)
dprintf(fd, "%s: %llu events, %lluus avg, min %lluus max %lluus %5.3fus rms\n",
handle->name,