diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-05-29 11:26:18 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-05-29 11:26:18 +0200 |
| commit | 6341737384b5bf39ee664c924ee930b875aa19ab (patch) | |
| tree | d3ab6db7962a5d7f5c3eda4f5319df7060477d8d /src/modules/segway/BlockSegwayController.cpp | |
| parent | af1af1e22ddd4bcd55fe9eaaf98f4a640329a4c7 (diff) | |
| parent | 83edab4d593b2cb92dae713d705255aeca4b3040 (diff) | |
| download | px4-firmware-6341737384b5bf39ee664c924ee930b875aa19ab.tar.gz px4-firmware-6341737384b5bf39ee664c924ee930b875aa19ab.tar.bz2 px4-firmware-6341737384b5bf39ee664c924ee930b875aa19ab.zip | |
Merge branch 'master' of github.com:PX4/Firmware into pca8574
Diffstat (limited to 'src/modules/segway/BlockSegwayController.cpp')
| -rw-r--r-- | src/modules/segway/BlockSegwayController.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/segway/BlockSegwayController.cpp b/src/modules/segway/BlockSegwayController.cpp index 96a443c6e..91230a37c 100644 --- a/src/modules/segway/BlockSegwayController.cpp +++ b/src/modules/segway/BlockSegwayController.cpp @@ -35,8 +35,8 @@ void BlockSegwayController::update() { // handle autopilot modes if (_status.main_state == MAIN_STATE_AUTO || - _status.main_state == MAIN_STATE_SEATBELT || - _status.main_state == MAIN_STATE_EASY) { + _status.main_state == MAIN_STATE_ALTCTL || + _status.main_state == MAIN_STATE_POSCTL) { _actuators.control[0] = spdCmd; _actuators.control[1] = spdCmd; |