diff options
| author | Simon Wilks <sjwilks@gmail.com> | 2012-12-15 08:38:13 +0100 |
|---|---|---|
| committer | Simon Wilks <sjwilks@gmail.com> | 2013-03-05 14:36:45 +0100 |
| commit | 16aa618bb4338899fc5e4c239efc741818d725db (patch) | |
| tree | 5e86275803d88327066f2f6cceac2700c2bb5b8a /apps/drivers | |
| parent | 433c9548589ebdc1ed40ab9f478b00f531b7bb47 (diff) | |
| download | px4-firmware-16aa618bb4338899fc5e4c239efc741818d725db.tar.gz px4-firmware-16aa618bb4338899fc5e4c239efc741818d725db.tar.bz2 px4-firmware-16aa618bb4338899fc5e4c239efc741818d725db.zip | |
testing
Diffstat (limited to 'apps/drivers')
| -rw-r--r-- | apps/drivers/px4fmu/fmu.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/apps/drivers/px4fmu/fmu.cpp b/apps/drivers/px4fmu/fmu.cpp index 430d18c6d..444f28b37 100644 --- a/apps/drivers/px4fmu/fmu.cpp +++ b/apps/drivers/px4fmu/fmu.cpp @@ -297,6 +297,7 @@ PX4FMU::set_pwm_rate(unsigned rate) if ((rate > 500) || (rate < 10)) return -EINVAL; +<<<<<<< HEAD:apps/drivers/px4fmu/fmu.cpp _update_rate = rate; return OK; } @@ -312,6 +313,11 @@ 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 */ |