fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-18 23:53:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

update mavlink to master, rename MOUNT_STATUS

Browse Source 
The mavlink message MOUNT_STATUS has been renamed to MOUNT_ORIENTATION.

This changes the Firmware code accordingly.
This commit is contained in:
Julian Oes
2016-11-28 21:01:22 +01:00
committed by Lorenz Meier
parent 780e903d5b
commit 0109f6f549
7 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/vmount/output.cpp
+4 -4
View File
@@ -44,7 +44,7 @@
#include <uORB/topics/vehicle_attitude.h>
#include <uORB/topics/vehicle_attitude.h>
#include <uORB/topics/vehicle_global_position.h>
#include <uORB/topics/mount_status.h>
#include <uORB/topics/mount_orientation.h>
#include <px4_defines.h>
#include <geo/geo.h>
#include <math.h>
@@ -86,13 +86,13 @@ int OutputBase::initialize()
void OutputBase::publish()
{
int instance;
mount_status_s mount_status;
mount_orientation_s mount_orientation;
for (unsigned i = 0; i < 3; ++i) {
mount_status.attitude_euler_angle[i] = _angle_outputs[i];
mount_orientation.attitude_euler_angle[i] = _angle_outputs[i];
}
orb_publish_auto(ORB_ID(mount_status), &_mount_status_pub, &mount_status, &instance, ORB_PRIO_DEFAULT);
orb_publish_auto(ORB_ID(mount_orientation), &_mount_orientation_pub, &mount_orientation, &instance, ORB_PRIO_DEFAULT);
}
float OutputBase::_calculate_pitch(double lon, double lat, float altitude,
src/drivers/vmount/output.h
+2 -2
View File
@@ -80,7 +80,7 @@ public:
/** report status to stdout */
virtual void print_status() = 0;
/** Publish _angle_outputs as a mount_status message. */
/** Publish _angle_outputs as a mount_orientation message. */
void publish();
protected:
@@ -114,7 +114,7 @@ private:
int _vehicle_attitude_sub = -1;
int _vehicle_global_position_sub = -1;
orb_advert_t _mount_status_pub = nullptr;
orb_advert_t _mount_orientation_pub = nullptr;
};