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

mavlink: use px4::atomic instead of volatile

Browse Source
This commit is contained in:
Julian Oes
2021-04-21 15:24:01 +02:00
committed by Daniel Agar
parent 4498509426
commit 370d9ee409
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/mavlink/mavlink_main.cpp
View File

@@ -2417,10 +2417,10 @@ Mavlink::task_main(int argc, char *argv[])
/* check for ulog streaming messages */ /* check for ulog streaming messages */
if (_mavlink_ulog) { if (_mavlink_ulog) {
if (_mavlink_ulog_stop_requested) { if (_mavlink_ulog_stop_requested.load()) {
_mavlink_ulog->stop(); _mavlink_ulog->stop();
_mavlink_ulog = nullptr; _mavlink_ulog = nullptr;
_mavlink_ulog_stop_requested = false; _mavlink_ulog_stop_requested.store(false);
} else { } else {
if (cmd_logging_start_acknowledgement) { if (cmd_logging_start_acknowledgement) {

4
src/modules/mavlink/mavlink_main.h
View File

@@ -497,7 +497,7 @@ public:
} }
void request_stop_ulog_streaming() void request_stop_ulog_streaming()
{ {
if (_mavlink_ulog) { _mavlink_ulog_stop_requested = true; } if (_mavlink_ulog) { _mavlink_ulog_stop_requested.store(true); }
} }
bool ftp_enabled() const { return _ftp_on; } bool ftp_enabled() const { return _ftp_on; }
@@ -569,7 +569,7 @@ private:
MavlinkShell *_mavlink_shell{nullptr}; MavlinkShell *_mavlink_shell{nullptr};
MavlinkULog *_mavlink_ulog{nullptr}; MavlinkULog *_mavlink_ulog{nullptr};
volatile bool _mavlink_ulog_stop_requested{false}; px4::atomic_bool _mavlink_ulog_stop_requested{false};
MAVLINK_MODE _mode{MAVLINK_MODE_NORMAL}; MAVLINK_MODE _mode{MAVLINK_MODE_NORMAL};