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

Fix RPI2 defines

Browse Source
This commit is contained in:
Kabir Mohammed
2016-05-19 15:41:50 +02:00
committed by Lorenz Meier
parent 529460d573
commit 1bd4dca266
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/sensors/sensors.cpp
+5 -5
View File
@@ -953,7 +953,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(__RPI2) #if !defined(__PX4_QURT) && !defined(__PX4_POSIX_RPI2)
// 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()) {
@@ -1521,7 +1521,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(__RPI2) #if !defined(__PX4_QURT) && !defined(__PX4_POSIX_RPI2)
/* 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. */
const int res = h.ioctl(GYROIOCSSCALE, (long unsigned int)gcal); const int res = h.ioctl(GYROIOCSSCALE, (long unsigned int)gcal);
@@ -1542,7 +1542,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(__RPI2) #if !defined(__PX4_QURT) && !defined(__PX4_POSIX_RPI2)
/* 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. */
const int res = h.ioctl(ACCELIOCSSCALE, (long unsigned int)acal); const int res = h.ioctl(ACCELIOCSSCALE, (long unsigned int)acal);
@@ -1563,7 +1563,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(__RPI2) #if !defined(__PX4_QURT) && !defined(__PX4_POSIX_RPI2)
/* 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. */
const int res = h.ioctl(MAGIOCSSCALE, (long unsigned int)mcal); const int res = h.ioctl(MAGIOCSSCALE, (long unsigned int)mcal);
@@ -2065,7 +2065,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(__RPI2) #if !defined(__PX4_QURT) && !defined(__PX4_POSIX_RPI2)
// 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(__RPI2) #if defined(__PX4_QURT) || defined(__PX4_POSIX_RPI2)
// Sensor initialization is performed automatically when the QuRT sensor drivers // Sensor initialization is performed automatically when the QuRT sensor drivers
// are loaded. // are loaded.