fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-14 13:21:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

mavlink: name existing stream headers consistently and add include guards

Browse Source
This commit is contained in:
Daniel Agar
2020-10-09 10:30:30 -04:00
parent 674cd1e3b5
commit b51322e160
6 changed files with 69 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/mavlink/mavlink_messages.cpp
+13 -5
View File
@@ -118,11 +118,11 @@
using matrix::Vector3f;
using matrix::wrap_2pi;
#include "streams/autopilot_version.h"
#include "streams/flight_information.h"
#include "streams/protocol_version.h"
#include "streams/storage_information.h"
#include "streams/AUTOPILOT_VERSION.hpp"
#include "streams/EXTENDED_SYS_STATE.hpp"
#include "streams/FLIGHT_INFORMATION.hpp"
#include "streams/PROTOCOL_VERSION.hpp"
#include "streams/STORAGE_INFORMATION.hpp"
// ensure PX4 rotation enum and MAV_SENSOR_ROTATION align
static_assert(MAV_SENSOR_ROTATION_NONE == static_cast<MAV_SENSOR_ORIENTATION>(ROTATION_NONE),
@@ -5516,7 +5516,7 @@ static const StreamListItem streams_list[] = {
create_stream_list_item<MavlinkStreamCameraTrigger>(),
create_stream_list_item<MavlinkStreamCameraImageCaptured>(),
create_stream_list_item<MavlinkStreamDistanceSensor>(),
#ifdef EXTENDED_SYS_STATE_HPP
#if defined(EXTENDED_SYS_STATE_HPP)
create_stream_list_item<MavlinkStreamExtendedSysState>(),
#endif // EXTENDED_SYS_STATE_HPP
create_stream_list_item<MavlinkStreamAltitude>(),
@@ -5532,10 +5532,18 @@ static const StreamListItem streams_list[] = {
create_stream_list_item<MavlinkStreamObstacleDistance>(),
create_stream_list_item<MavlinkStreamESCInfo>(),
create_stream_list_item<MavlinkStreamESCStatus>(),
#if defined(AUTOPILOT_VERSION_HPP)
create_stream_list_item<MavlinkStreamAutopilotVersion>(),
#endif // AUTOPILOT_VERSION_HPP
#if defined(PROTOCOL_VERSION_HPP)
create_stream_list_item<MavlinkStreamProtocolVersion>(),
#endif // PROTOCOL_VERSION_HPP
#if defined(FLIGHT_INFORMATION_HPP)
create_stream_list_item<MavlinkStreamFlightInformation>(),
#endif // FLIGHT_INFORMATION_HPP
#if defined(STORAGE_INFORMATION_HPP)
create_stream_list_item<MavlinkStreamStorageInformation>(),
#endif // STORAGE_INFORMATION_HPP
create_stream_list_item<MavlinkStreamRawRpm>()
};