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

testing

Browse Source
This commit is contained in:
Simon Wilks
2013-03-05 14:36:45 +01:00
parent 433c954858
commit 16aa618bb4
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/drivers/px4fmu/fmu.cpp
+6
View File
@@ -297,6 +297,7 @@ PX4FMU::set_pwm_rate(unsigned rate)
if ((rate > 500) || (rate < 10)) if ((rate > 500) || (rate < 10))
return -EINVAL; return -EINVAL;
<<<<<<< HEAD:apps/drivers/px4fmu/fmu.cpp
_update_rate = rate; _update_rate = rate;
return OK; return OK;
} }
@@ -312,6 +313,11 @@ PX4FMU::task_main()
ORB_ID(actuator_controls_1)); ORB_ID(actuator_controls_1));
/* force a reset of the update rate */ /* force a reset of the update rate */
_current_update_rate = 0; _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)); _t_armed = orb_subscribe(ORB_ID(actuator_armed));
orb_set_interval(_t_armed, 200); /* 5Hz update rate */ orb_set_interval(_t_armed, 200); /* 5Hz update rate */