diff options
| author | Simon Wilks <sjwilks@gmail.com> | 2013-03-05 23:00:39 +0100 |
|---|---|---|
| committer | Simon Wilks <sjwilks@gmail.com> | 2013-03-05 23:00:39 +0100 |
| commit | 07c349382555ff06d749a62e499c34feb8386b76 (patch) | |
| tree | 5e5598a44bdce6c832ceb986b4d48282766dd813 /apps/drivers | |
| parent | 16aa618bb4338899fc5e4c239efc741818d725db (diff) | |
| download | px4-firmware-07c349382555ff06d749a62e499c34feb8386b76.tar.gz px4-firmware-07c349382555ff06d749a62e499c34feb8386b76.tar.bz2 px4-firmware-07c349382555ff06d749a62e499c34feb8386b76.zip | |
Revert "testing"
This reverts commit 16aa618bb4338899fc5e4c239efc741818d725db.
Diffstat (limited to 'apps/drivers')
| -rw-r--r-- | apps/drivers/px4fmu/fmu.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/apps/drivers/px4fmu/fmu.cpp b/apps/drivers/px4fmu/fmu.cpp index 444f28b37..430d18c6d 100644 --- a/apps/drivers/px4fmu/fmu.cpp +++ b/apps/drivers/px4fmu/fmu.cpp @@ -297,7 +297,6 @@ PX4FMU::set_pwm_rate(unsigned rate) if ((rate > 500) || (rate < 10)) return -EINVAL; -<<<<<<< HEAD:apps/drivers/px4fmu/fmu.cpp _update_rate = rate; return OK; } @@ -313,11 +312,6 @@ PX4FMU::task_main() ORB_ID(actuator_controls_1)); /* force a reset of the update rate */ _current_update_rate = 0; -======= - /* subscribe to objects that we are interested in watching */ - _t_actuators = orb_subscribe(ORB_ID_VEHICLE_ATTITUDE_CONTROLS); - orb_set_interval(_t_actuators, 5); /* 200Hz update rate */ ->>>>>>> testing:apps/px4/fmu/fmu.cpp _t_armed = orb_subscribe(ORB_ID(actuator_armed)); orb_set_interval(_t_armed, 200); /* 5Hz update rate */ |