diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-09-08 21:50:14 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-09-08 21:50:14 +0200 |
| commit | 8bd018c5611dddd914fd108965526945b31d5944 (patch) | |
| tree | edb065e1a3c64075bbfcb03c5810da72f307748b /src/modules/commander/state_machine_helper.cpp | |
| parent | 11e4fbc3745193a61f6f56619318dc1bc0b60307 (diff) | |
| parent | d3ac8c9ff31ac609d555613e552b38782a2b2490 (diff) | |
| download | px4-firmware-8bd018c5611dddd914fd108965526945b31d5944.tar.gz px4-firmware-8bd018c5611dddd914fd108965526945b31d5944.tar.bz2 px4-firmware-8bd018c5611dddd914fd108965526945b31d5944.zip | |
Merge branch 'fixedwing_l1' of github.com:PX4/Firmware into fixedwing_l1
Diffstat (limited to 'src/modules/commander/state_machine_helper.cpp')
| -rw-r--r-- | src/modules/commander/state_machine_helper.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/modules/commander/state_machine_helper.cpp b/src/modules/commander/state_machine_helper.cpp index 316b06127..8ce31550f 100644 --- a/src/modules/commander/state_machine_helper.cpp +++ b/src/modules/commander/state_machine_helper.cpp @@ -504,6 +504,8 @@ int hil_state_transition(hil_state_t new_state, int status_pub, struct vehicle_s current_control_mode->timestamp = hrt_absolute_time(); orb_publish(ORB_ID(vehicle_control_mode), control_mode_pub, current_control_mode); + // XXX also set lockdown here + ret = OK; } else { |