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

Revert "linux_pwm_out update orb usage"

Browse Source 
This reverts commit 25acd40ef0.
This commit is contained in:
Daniel Agar
2019-11-30 20:19:02 -05:00
parent 5e95820e14
commit cceec434f2
1 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/drivers/linux_pwm_out/linux_pwm_out.cpp
View File

@@ -42,7 +42,6 @@
#include <px4_platform_common/getopt.h>
#include <px4_platform_common/posix.h>
#include <uORB/PublicationMulti.hpp>
#include <uORB/Subscription.hpp>
#include <uORB/topics/actuator_controls.h>
#include <uORB/topics/actuator_outputs.h>
@@ -77,10 +76,11 @@ static char _mixer_filename[64] = "ROMFS/px4fmu_common/mixers/quad_x.main.mix";
// subscriptions
int _controls_subs[actuator_controls_s::NUM_ACTUATOR_CONTROL_GROUPS];
uORB::Subscription _armed_sub{ORB_ID(actuator_armed)};
int _armed_sub = -1;
// publications
uORB::PublicationMulti<actuator_outputs_s> _outputs_pub{ORB_ID(actuator_outputs)};
orb_advert_t _outputs_pub = nullptr;
orb_advert_t _rc_pub = nullptr;
perf_counter_t _perf_control_latency = nullptr;
@@ -207,6 +207,9 @@ void subscribe()
_poll_fds[_poll_fds_num].events = POLLIN;
_poll_fds_num++;
}
_armed_sub = orb_subscribe(ORB_ID(actuator_armed));
}
}
@@ -269,7 +272,12 @@ void task_main(int argc, char *argv[])
while (!_task_should_exit) {
_armed_sub.update(&_armed);
bool updated;
orb_check(_armed_sub, &updated);
if (updated) {
orb_copy(ORB_ID(actuator_armed), _armed_sub, &_armed);
}
if (_mixer_group) {
_mixer_group->set_airmode(airmode);
@@ -387,7 +395,12 @@ void task_main(int argc, char *argv[])
_outputs.timestamp = hrt_absolute_time();
_outputs_pub.publish(_outputs);
if (_outputs_pub != nullptr) {
orb_publish(ORB_ID(actuator_outputs), _outputs_pub, &_outputs);
} else {
_outputs_pub = orb_advertise(ORB_ID(actuator_outputs), &_outputs);
}
// use first valid timestamp_sample for latency tracking
for (int i = 0; i < actuator_controls_s::NUM_ACTUATOR_CONTROL_GROUPS; i++) {
@@ -424,6 +437,11 @@ void task_main(int argc, char *argv[])
}
}
if (_armed_sub != -1) {
orb_unsubscribe(_armed_sub);
_armed_sub = -1;
}
if (rc_channels_sub != -1) {
orb_unsubscribe(rc_channels_sub);
}