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

minor cosmetic changes

Browse Source
This commit is contained in:
Diogo Machado
2014-02-14 12:37:10 +00:00
parent 59a5f37b7f
commit 15ea9cd401
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/commander/commander.cpp
-1
View File
@@ -1491,7 +1491,6 @@ check_main_state_machine(struct vehicle_status_s *current_status)
{ {
/* evaluate the main state machine */ /* evaluate the main state machine */
transition_result_t res = TRANSITION_DENIED; transition_result_t res = TRANSITION_DENIED;
if (current_status->offboard_switch == OFFBOARD_SWITCH_OFFBOARD) { if (current_status->offboard_switch == OFFBOARD_SWITCH_OFFBOARD) {
/* offboard switch overrides main switch */ /* offboard switch overrides main switch */
res = main_state_transition(current_status, MAIN_STATE_OFFBOARD); res = main_state_transition(current_status, MAIN_STATE_OFFBOARD);
src/modules/mavlink/mavlink_receiver.cpp
+4 -6
View File
@@ -288,23 +288,21 @@ handle_message(mavlink_message_t *msg)
ml_armed = false; ml_armed = false;
break; break;
case 1: case OFFBOARD_CONTROL_MODE_DIRECT_RATES:
ml_mode = OFFBOARD_CONTROL_MODE_DIRECT_RATES; ml_mode = OFFBOARD_CONTROL_MODE_DIRECT_RATES;
ml_armed = true; ml_armed = true;
break; break;
case 2: case OFFBOARD_CONTROL_MODE_DIRECT_ATTITUDE:
ml_mode = OFFBOARD_CONTROL_MODE_DIRECT_ATTITUDE; ml_mode = OFFBOARD_CONTROL_MODE_DIRECT_ATTITUDE;
ml_armed = true; ml_armed = true;
break; break;
case 3: case OFFBOARD_CONTROL_MODE_DIRECT_VELOCITY:
ml_mode = OFFBOARD_CONTROL_MODE_DIRECT_VELOCITY; ml_mode = OFFBOARD_CONTROL_MODE_DIRECT_VELOCITY;
break; break;
case 4: case OFFBOARD_CONTROL_MODE_DIRECT_POSITION:
ml_mode = OFFBOARD_CONTROL_MODE_DIRECT_POSITION; ml_mode = OFFBOARD_CONTROL_MODE_DIRECT_POSITION;
break; break;
} }