Merge beta in master

2026-10-28 12:43:33 +08:00 · 2015-08-23 11:21:38 +02:00
parent bfef24bf72 b235420f17
commit 53d4c5473f
10 changed files with 134 additions and 70 deletions
@@ -234,8 +234,13 @@ PWMSim::init()
 	_task = px4_task_spawn_cmd("pwm_out_sim",
 			   SCHED_DEFAULT,
 			   SCHED_PRIORITY_DEFAULT,
+<<<<<<< HEAD:src/drivers/pwm_out_sim/pwm_out_sim.cpp
 			   1200,
 			   (px4_main_t)&PWMSim::task_main_trampoline,
+=======
+			   1000,
+			   (main_t)&HIL::task_main_trampoline,
+>>>>>>> beta:src/drivers/hil/hil.cpp
 			   nullptr);

 	if (_task < 0) {