fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-05 06:41:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Removed wrong dependency check

Browse Source
This commit is contained in:
Lorenz Meier
2013-07-18 15:55:06 +02:00
parent 798075c90d
commit da54659b5e
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/sensors/sensors.cpp
-8
View File
@@ -139,14 +139,12 @@ public:
private: private:
static const unsigned _rc_max_chan_count = RC_CHANNELS_MAX; /**< maximum number of r/c channels we handle */ static const unsigned _rc_max_chan_count = RC_CHANNELS_MAX; /**< maximum number of r/c channels we handle */
#if CONFIG_HRT_PPM
hrt_abstime _ppm_last_valid; /**< last time we got a valid ppm signal */ hrt_abstime _ppm_last_valid; /**< last time we got a valid ppm signal */
/** /**
* Gather and publish PPM input data. * Gather and publish PPM input data.
*/ */
void ppm_poll(); void ppm_poll();
#endif
/* XXX should not be here - should be own driver */ /* XXX should not be here - should be own driver */
int _fd_adc; /**< ADC driver handle */ int _fd_adc; /**< ADC driver handle */
@@ -397,9 +395,7 @@ Sensors *g_sensors;
} }
Sensors::Sensors() : Sensors::Sensors() :
#ifdef CONFIG_HRT_PPM
_ppm_last_valid(0), _ppm_last_valid(0),
#endif
_fd_adc(-1), _fd_adc(-1),
_last_adc(0), _last_adc(0),
@@ -1135,7 +1131,6 @@ Sensors::adc_poll(struct sensor_combined_s &raw)
} }
} }
#if CONFIG_HRT_PPM
void void
Sensors::ppm_poll() Sensors::ppm_poll()
{ {
@@ -1335,7 +1330,6 @@ Sensors::ppm_poll()
} }
} }
#endif
void void
Sensors::task_main_trampoline(int argc, char *argv[]) Sensors::task_main_trampoline(int argc, char *argv[])
@@ -1448,10 +1442,8 @@ Sensors::task_main()
if (_publishing) if (_publishing)
orb_publish(ORB_ID(sensor_combined), _sensor_pub, &raw); orb_publish(ORB_ID(sensor_combined), _sensor_pub, &raw);
#ifdef CONFIG_HRT_PPM
/* Look for new r/c input data */ /* Look for new r/c input data */
ppm_poll(); ppm_poll();
#endif
perf_end(_loop_perf); perf_end(_loop_perf);
} }