aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2013-07-18 15:55:06 +0200
committerLorenz Meier <lm@inf.ethz.ch>2013-07-18 15:55:06 +0200
commitda54659b5e2c883c504cc48b82a03504cdaae6af (patch)
treef58a186e104dd8d463ed08ee2c1a1321988e516e
parent798075c90d0bf1d271ce9758f1649f160b7373ec (diff)
downloadpx4-firmware-da54659b5e2c883c504cc48b82a03504cdaae6af.tar.gz
px4-firmware-da54659b5e2c883c504cc48b82a03504cdaae6af.tar.bz2
px4-firmware-da54659b5e2c883c504cc48b82a03504cdaae6af.zip
Removed wrong dependency check
-rw-r--r--src/modules/sensors/sensors.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/modules/sensors/sensors.cpp b/src/modules/sensors/sensors.cpp
index be87c752d..e4fb7416f 100644
--- a/src/modules/sensors/sensors.cpp
+++ b/src/modules/sensors/sensors.cpp
@@ -139,14 +139,12 @@ public:
private:
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 */
/**
* Gather and publish PPM input data.
*/
void ppm_poll();
-#endif
/* XXX should not be here - should be own driver */
int _fd_adc; /**< ADC driver handle */
@@ -397,9 +395,7 @@ Sensors *g_sensors;
}
Sensors::Sensors() :
-#ifdef CONFIG_HRT_PPM
_ppm_last_valid(0),
-#endif
_fd_adc(-1),
_last_adc(0),
@@ -1135,7 +1131,6 @@ Sensors::adc_poll(struct sensor_combined_s &raw)
}
}
-#if CONFIG_HRT_PPM
void
Sensors::ppm_poll()
{
@@ -1335,7 +1330,6 @@ Sensors::ppm_poll()
}
}
-#endif
void
Sensors::task_main_trampoline(int argc, char *argv[])
@@ -1448,10 +1442,8 @@ Sensors::task_main()
if (_publishing)
orb_publish(ORB_ID(sensor_combined), _sensor_pub, &raw);
-#ifdef CONFIG_HRT_PPM
/* Look for new r/c input data */
ppm_poll();
-#endif
perf_end(_loop_perf);
}