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

Fixes https://github.com/PX4/Firmware/issues/3658

Browse Source
This commit is contained in:
sander
2016-02-03 11:48:42 +01:00
parent 0aff2e6c09
commit f0bad06bfd
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/mavlink/mavlink_mission.cpp
+8
View File
@@ -856,15 +856,23 @@ MavlinkMissionManager::format_mavlink_mission_item(const struct mission_item_s *
break; break;
case NAV_CMD_DO_SET_SERVO: case NAV_CMD_DO_SET_SERVO:
mavlink_mission_item->frame = MAV_FRAME_MISSION;
mavlink_mission_item->param1 = mission_item->actuator_num; mavlink_mission_item->param1 = mission_item->actuator_num;
mavlink_mission_item->param2 = mission_item->actuator_value; mavlink_mission_item->param2 = mission_item->actuator_value;
break; break;
case NAV_CMD_DO_JUMP: case NAV_CMD_DO_JUMP:
mavlink_mission_item->frame = MAV_FRAME_MISSION;
mavlink_mission_item->param1 = mission_item->do_jump_mission_index; mavlink_mission_item->param1 = mission_item->do_jump_mission_index;
mavlink_mission_item->param2 = mission_item->do_jump_repeat_count - mission_item->do_jump_current_count; mavlink_mission_item->param2 = mission_item->do_jump_repeat_count - mission_item->do_jump_current_count;
break; break;
case NAV_CMD_DO_VTOL_TRANSITION:
mavlink_mission_item->frame = MAV_FRAME_MISSION;
mavlink_mission_item->param1 = mission_item->params[0];
break;
default: default:
mavlink_mission_item->param2 = mission_item->acceptance_radius; mavlink_mission_item->param2 = mission_item->acceptance_radius;
mavlink_mission_item->param1 = mission_item->time_inside; mavlink_mission_item->param1 = mission_item->time_inside;
src/modules/navigator/navigation.h
+1
View File
@@ -64,6 +64,7 @@ enum NAV_CMD {
NAV_CMD_DO_JUMP = 177, NAV_CMD_DO_JUMP = 177,
NAV_CMD_DO_SET_SERVO=183, NAV_CMD_DO_SET_SERVO=183,
NAV_CMD_DO_REPEAT_SERVO=184, NAV_CMD_DO_REPEAT_SERVO=184,
NAV_CMD_DO_VTOL_TRANSITION=3000,
NAV_CMD_INVALID=UINT16_MAX /* ensure that casting a large number results in a specific error */ NAV_CMD_INVALID=UINT16_MAX /* ensure that casting a large number results in a specific error */
}; };