From 5922e08f5e052d455b5aadc0a6bd601843ccd12b Mon Sep 17 00:00:00 2001 From: David Sidrane Date: Fri, 31 Mar 2017 11:43:15 -1000 Subject: [PATCH] nxphlite-v1:incorperate master's led changes and fit --- cmake/configs/nuttx_nxphlite-v1_default.cmake | 23 +++++++++++-------- .../boards/nxphlite-v1/nxphlite_init.c | 4 +++- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/cmake/configs/nuttx_nxphlite-v1_default.cmake b/cmake/configs/nuttx_nxphlite-v1_default.cmake index ce8b4886f9..4ab09e6c08 100644 --- a/cmake/configs/nuttx_nxphlite-v1_default.cmake +++ b/cmake/configs/nuttx_nxphlite-v1_default.cmake @@ -34,10 +34,10 @@ set(config_module_list ##SPACE drivers/hott/hott_telemetry ##SPACE drivers/hott/hott_sensors ##SPACE drivers/blinkm - drivers/airspeed +#SPACE drivers/airspeed ##SPACE drivers/ets_airspeed ##SPACE drivers/meas_airspeed - drivers/frsky_telemetry +#SPACE drivers/frsky_telemetry modules/sensors ##SPACE drivers/mkblctrl ##SPACE drivers/px4flow @@ -134,24 +134,27 @@ set(config_module_list # Libraries # lib/controllib - lib/mathlib - lib/mathlib/math/filter - lib/rc + lib/conversion + lib/DriverFramework/framework lib/ecl lib/external_lgpl lib/geo lib/geo_lookup - lib/conversion lib/launchdetection - lib/terrain_estimation + lib/led + lib/mathlib + lib/mathlib/math/filter + lib/rc lib/runway_takeoff lib/tailsitter_recovery + lib/terrain_estimation lib/version - lib/DriverFramework/framework - platforms/nuttx - # had to add for cmake, not sure why wasn't in original config + # + # Platform + # platforms/common + platforms/nuttx platforms/nuttx/px4_layer # diff --git a/src/drivers/boards/nxphlite-v1/nxphlite_init.c b/src/drivers/boards/nxphlite-v1/nxphlite_init.c index ba5665e99f..a0f2937e32 100644 --- a/src/drivers/boards/nxphlite-v1/nxphlite_init.c +++ b/src/drivers/boards/nxphlite-v1/nxphlite_init.c @@ -67,7 +67,7 @@ #include #include -#include +#include #include #include @@ -282,6 +282,8 @@ __EXPORT int board_app_initialize(uintptr_t arg) # error platform is dependent on c++ both CONFIG_HAVE_CXX and CONFIG_HAVE_CXXINITIALIZE must be defined. #endif + param_init(); + /* configure the high-resolution time/callout interface */ hrt_init();