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

Merge branch 'master' into mavlink_stack

Browse Source
This commit is contained in:
Anton Babushkin
2014-06-10 15:12:09 +02:00
parent 7bfcaafc16 92766a8626
commit fb4bcf87ba
97 changed files with 2338 additions and 1444 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/mavlink/mavlink_messages.cpp
+6 -2
View File
@@ -138,6 +138,10 @@ void get_mavlink_mode_state(struct vehicle_status_s *status, struct position_set
*mavlink_base_mode |= MAV_MODE_FLAG_AUTO_ENABLED | MAV_MODE_FLAG_STABILIZE_ENABLED | MAV_MODE_FLAG_GUIDED_ENABLED;
custom_mode.main_mode = PX4_CUSTOM_MAIN_MODE_AUTO;
custom_mode.sub_mode = PX4_CUSTOM_SUB_MODE_AUTO_READY;
} else if (status->main_state == MAIN_STATE_ACRO) {
*mavlink_base_mode |= MAV_MODE_FLAG_MANUAL_INPUT_ENABLED;
custom_mode.main_mode = PX4_CUSTOM_MAIN_MODE_ACRO;
}
} else {
@@ -290,7 +294,7 @@ protected:
status.onboard_control_sensors_health,
status.load * 1000.0f,
status.battery_voltage * 1000.0f,
status.battery_current * 1000.0f,
status.battery_current * 100.0f,
status.battery_remaining * 100.0f,
status.drop_rate_comm,
status.errors_comm,
@@ -305,7 +309,7 @@ protected:
class MavlinkStreamHighresIMU : public MavlinkStream
{
public:
~MavlinkStreamHighresIMU();
~MavlinkStreamHighresIMU() {};
const char *get_name() const
{