dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Revert "testing" 

This reverts commit 16aa618bb4.
This commit is contained in:
Simon Wilks 2013-03-05 23:00:39 +01:00
parent 16aa618bb4
commit 07c3493825
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/drivers/px4fmu/fmu.cpp
View File

@ -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 */