diff options
| author | TickTock- <TjckTock@gmail.com> | 2014-04-28 22:11:02 -0700 |
|---|---|---|
| committer | TickTock- <TjckTock@gmail.com> | 2014-04-28 22:11:02 -0700 |
| commit | ef75bbf2eff602f8142e0579fcc3224244ca3bd2 (patch) | |
| tree | 8c96af7ab0dd9a1870b8a9e1143d3d2b3a85ee67 | |
| parent | 31089a290ba089b2b5cbcc76ed677e3f401ffa36 (diff) | |
| download | px4-firmware-ef75bbf2eff602f8142e0579fcc3224244ca3bd2.tar.gz px4-firmware-ef75bbf2eff602f8142e0579fcc3224244ca3bd2.tar.bz2 px4-firmware-ef75bbf2eff602f8142e0579fcc3224244ca3bd2.zip | |
Updated flight modes diagrams & comments.
| -rw-r--r-- | Documentation/rc_mode_switch.odg | bin | 20160 -> 20920 bytes | |||
| -rw-r--r-- | Documentation/rc_mode_switch.pdf | bin | 39286 -> 27305 bytes | |||
| -rw-r--r-- | mavlink/include/mavlink/v1.0/autoquad/autoquad.h | 4 | ||||
| -rw-r--r-- | src/modules/fixedwing_backside/fixedwing.cpp | 2 |
4 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/rc_mode_switch.odg b/Documentation/rc_mode_switch.odg Binary files differindex 5c4b617e6..3ed379d08 100644 --- a/Documentation/rc_mode_switch.odg +++ b/Documentation/rc_mode_switch.odg diff --git a/Documentation/rc_mode_switch.pdf b/Documentation/rc_mode_switch.pdf Binary files differindex 3254d6140..70e7cb246 100644 --- a/Documentation/rc_mode_switch.pdf +++ b/Documentation/rc_mode_switch.pdf diff --git a/mavlink/include/mavlink/v1.0/autoquad/autoquad.h b/mavlink/include/mavlink/v1.0/autoquad/autoquad.h index bd3fc66e7..05794725a 100644 --- a/mavlink/include/mavlink/v1.0/autoquad/autoquad.h +++ b/mavlink/include/mavlink/v1.0/autoquad/autoquad.h @@ -40,8 +40,8 @@ enum AUTOQUAD_NAV_STATUS AQ_NAV_STATUS_INIT=0, /* System is initializing | */ AQ_NAV_STATUS_STANDBY=1, /* System is standing by, not active | */ AQ_NAV_STATUS_MANUAL=2, /* Stabilized, under full manual control | */ - AQ_NAV_STATUS_ALTCTRL=4, /* Altitude hold engaged | */ - AQ_NAV_STATUS_POSCTRL=8, /* Position hold engaged | */ + AQ_NAV_STATUS_ALTCTRL=4, /* Altitude control engaged | */ + AQ_NAV_STATUS_POSCTRL=8, /* Position control engaged | */ AQ_NAV_STATUS_DVH=16, /* Dynamic Velocity Hold is active | */ AQ_NAV_STATUS_MISSION=32, /* Autonomous mission execution mode | */ AQ_NAV_STATUS_CEILING_REACHED=67108864, /* Craft is at ceiling altitude | */ diff --git a/src/modules/fixedwing_backside/fixedwing.cpp b/src/modules/fixedwing_backside/fixedwing.cpp index dc82ee475..596e286a4 100644 --- a/src/modules/fixedwing_backside/fixedwing.cpp +++ b/src/modules/fixedwing_backside/fixedwing.cpp @@ -230,7 +230,7 @@ void BlockMultiModeBacksideAutopilot::update() _actuators.control[CH_THR] = _manual.throttle; } else if (_status.main_state == MAIN_STATE_ALTCTRL || - _status.main_state == MAIN_STATE_POSCTRL /* TODO, implement easy */) { + _status.main_state == MAIN_STATE_POSCTRL /* TODO, implement pos control */) { // calculate velocity, XXX should be airspeed, but using ground speed for now // for the purpose of control we will limit the velocity feedback between |