Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-06-01 02:55:07 +08:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Add missing defines for Bebop sensor drivers

Browse Source
This commit is contained in:
Michael Schaeuble
2016-06-29 16:56:22 +02:00
committed by Julian Oes
parent e73d8d73e1
commit d94bdb0829
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/configs/posix_bebop_default.cmake
+3
View File
@@ -5,6 +5,7 @@ set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/cmake/toolchains/Toolchain-arm-linu
add_definitions( add_definitions(
-D__PX4_POSIX_BEBOP -D__PX4_POSIX_BEBOP
-D__LINUX -D__LINUX
-D__BEBOP
) )
set(CMAKE_PROGRAM_PATH set(CMAKE_PROGRAM_PATH
@@ -22,6 +23,7 @@ set(config_module_list
drivers/device drivers/device
modules/sensors modules/sensors
platforms/posix/drivers/df_ms5607_wrapper platforms/posix/drivers/df_ms5607_wrapper
platforms/posix/drivers/df_mpu6050_wrapper
# #
# System commands # System commands
@@ -99,4 +101,5 @@ set(config_module_list
set(config_df_driver_list set(config_df_driver_list
ms5607 ms5607
mpu6050
) )
src/modules/sensors/sensors.cpp
+5 -5
View File
@@ -1017,7 +1017,7 @@ Sensors::parameters_update()
DevHandle h_baro; DevHandle h_baro;
DevMgr::getHandle(BARO0_DEVICE_PATH, h_baro); DevMgr::getHandle(BARO0_DEVICE_PATH, h_baro);
#if !defined(__PX4_QURT) && !defined(__PX4_POSIX_RPI) #if !defined(__PX4_QURT) && !defined(__PX4_POSIX_RPI) && !defined(__PX4_POSIX_BEBOP)
// TODO: this needs fixing for QURT and Raspberry Pi // TODO: this needs fixing for QURT and Raspberry Pi
if (!h_baro.isValid()) { if (!h_baro.isValid()) {
@@ -1671,7 +1671,7 @@ Sensors::parameter_update_poll(bool forced)
bool bool
Sensors::apply_gyro_calibration(DevHandle &h, const struct gyro_calibration_s *gcal, const int device_id) Sensors::apply_gyro_calibration(DevHandle &h, const struct gyro_calibration_s *gcal, const int device_id)
{ {
#if !defined(__PX4_QURT) && !defined(__PX4_POSIX_RPI) #if !defined(__PX4_QURT) && !defined(__PX4_POSIX_RPI) && !defined(__PX4_POSIX_BEBOP)
/* On most systems, we can just use the IOCTL call to set the calibration params. */ /* On most systems, we can just use the IOCTL call to set the calibration params. */
return !h.ioctl(GYROIOCSSCALE, (long unsigned int)gcal); return !h.ioctl(GYROIOCSSCALE, (long unsigned int)gcal);
@@ -1685,7 +1685,7 @@ Sensors::apply_gyro_calibration(DevHandle &h, const struct gyro_calibration_s *g
bool bool
Sensors::apply_accel_calibration(DevHandle &h, const struct accel_calibration_s *acal, const int device_id) Sensors::apply_accel_calibration(DevHandle &h, const struct accel_calibration_s *acal, const int device_id)
{ {
#if !defined(__PX4_QURT) && !defined(__PX4_POSIX_RPI) #if !defined(__PX4_QURT) && !defined(__PX4_POSIX_RPI) && !defined(__PX4_POSIX_BEBOP)
/* On most systems, we can just use the IOCTL call to set the calibration params. */ /* On most systems, we can just use the IOCTL call to set the calibration params. */
return !h.ioctl(ACCELIOCSSCALE, (long unsigned int)acal); return !h.ioctl(ACCELIOCSSCALE, (long unsigned int)acal);
@@ -1699,7 +1699,7 @@ Sensors::apply_accel_calibration(DevHandle &h, const struct accel_calibration_s
bool bool
Sensors::apply_mag_calibration(DevHandle &h, const struct mag_calibration_s *mcal, const int device_id) Sensors::apply_mag_calibration(DevHandle &h, const struct mag_calibration_s *mcal, const int device_id)
{ {
#if !defined(__PX4_QURT) && !defined(__PX4_POSIX_RPI) #if !defined(__PX4_QURT) && !defined(__PX4_POSIX_RPI) && !defined(__PX4_POSIX_BEBOP)
/* On most systems, we can just use the IOCTL call to set the calibration params. */ /* On most systems, we can just use the IOCTL call to set the calibration params. */
return !h.ioctl(MAGIOCSSCALE, (long unsigned int)mcal); return !h.ioctl(MAGIOCSSCALE, (long unsigned int)mcal);
@@ -2250,7 +2250,7 @@ Sensors::task_main()
/* This calls a sensors_init which can have different implementations on NuttX, POSIX, QURT. */ /* This calls a sensors_init which can have different implementations on NuttX, POSIX, QURT. */
ret = sensors_init(); ret = sensors_init();
#if !defined(__PX4_QURT) && !defined(__PX4_POSIX_RPI) #if !defined(__PX4_QURT) && !defined(__PX4_POSIX_RPI) && !defined(__PX4_POSIX_BEBOP)
// TODO: move adc_init into the sensors_init call. // TODO: move adc_init into the sensors_init call.
ret = ret || adc_init(); ret = ret || adc_init();
#endif #endif
src/modules/sensors/sensors_init.cpp
+1 -1
View File
@@ -52,7 +52,7 @@
using namespace DriverFramework; using namespace DriverFramework;
#if defined(__PX4_QURT) || defined(__PX4_POSIX_RPI) #if defined(__PX4_QURT) || defined(__PX4_POSIX_RPI) || defined(__PX4_POSIX_BEBOP)
// Sensor initialization is performed automatically when the QuRT sensor drivers // Sensor initialization is performed automatically when the QuRT sensor drivers
// are loaded. // are loaded.