fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-05-23 09:37:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

pwm_out_sim.cpp: fix initialization of _control_subs

Browse Source 
Note: {-1} initializes only the first element, and sets the others to 0.
This commit is contained in:
Beat Küng
2016-06-07 10:49:07 +02:00
parent 1be3c0fe48
commit d9267a4db5
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/pwm_out_sim/pwm_out_sim.cpp
+9 -6
View File
@@ -182,7 +182,6 @@ PWMSim::PWMSim() :
_mode(MODE_NONE),
_update_rate(50),
_current_update_rate(0),
_control_subs { -1},
_poll_fds{},
_poll_fds_num(0),
_armed_sub(-1),
@@ -201,6 +200,10 @@ PWMSim::PWMSim() :
_control_topics[1] = ORB_ID(actuator_controls_1);
_control_topics[2] = ORB_ID(actuator_controls_2);
_control_topics[3] = ORB_ID(actuator_controls_3);
for (unsigned i = 0; i < actuator_controls_s::NUM_ACTUATOR_CONTROL_GROUPS; i++) {
_control_subs[i] = -1;
}
}
PWMSim::~PWMSim()
@@ -402,7 +405,7 @@ PWMSim::task_main()
}
for (unsigned i = 0; i < actuator_controls_s::NUM_ACTUATOR_CONTROL_GROUPS; i++) {
if (_control_subs[i] > 0) {
if (_control_subs[i] >= 0) {
orb_set_interval(_control_subs[i], update_rate_in_ms);
}
}
@@ -441,7 +444,7 @@ PWMSim::task_main()
unsigned poll_id = 0;
for (unsigned i = 0; i < actuator_controls_s::NUM_ACTUATOR_CONTROL_GROUPS; i++) {
if (_control_subs[i] > 0) {
if (_control_subs[i] >= 0) {
if (_poll_fds[poll_id].revents & POLLIN) {
orb_copy(_control_topics[i], _control_subs[i], &_controls[i]);
}
@@ -527,12 +530,12 @@ PWMSim::task_main()
}
for (unsigned i = 0; i < actuator_controls_s::NUM_ACTUATOR_CONTROL_GROUPS; i++) {
if (_control_subs[i] > 0) {
px4_close(_control_subs[i]);
if (_control_subs[i] >= 0) {
orb_unsubscribe(_control_subs[i]);
}
}
px4_close(_armed_sub);
orb_unsubscribe(_armed_sub);
/* make sure servos are off */
// up_pwm_servo_deinit();