yemai/bizhang_-obav
1
0
Fork 0
mirror of https://gitee.com/xiaohuolufeihua/bizhang_-obav.git synced 2026-05-22 01:12:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

PWM Sim: Fix merge fail

Browse Source
This commit is contained in:
Lorenz Meier
2015-08-23 11:34:38 +02:00
parent 53d4c5473f
commit 3b7685a8fe
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/drivers/pwm_out_sim/pwm_out_sim.cpp
View File

@@ -234,13 +234,8 @@ PWMSim::init()
_task = px4_task_spawn_cmd("pwm_out_sim", _task = px4_task_spawn_cmd("pwm_out_sim",
SCHED_DEFAULT, SCHED_DEFAULT,
SCHED_PRIORITY_DEFAULT, SCHED_PRIORITY_DEFAULT,
<<<<<<< HEAD:src/drivers/pwm_out_sim/pwm_out_sim.cpp
1200,
(px4_main_t)&PWMSim::task_main_trampoline,
=======
1000, 1000,
(main_t)&HIL::task_main_trampoline, (px4_main_t)&PWMSim::task_main_trampoline,
>>>>>>> beta:src/drivers/hil/hil.cpp
nullptr); nullptr);
if (_task < 0) { if (_task < 0) {