diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-08-18 12:42:24 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-08-18 12:42:24 +0200 |
| commit | e5f1a7c2c3a67648829ec0dff5bf290dddc25847 (patch) | |
| tree | bd4ea16fa97f6aa4c4fe446d0e7bf87cc0a64397 /src/drivers/px4io/px4io.cpp | |
| parent | e597f979824074e971aef19814951d87c8b6a8b5 (diff) | |
| download | px4-firmware-e5f1a7c2c3a67648829ec0dff5bf290dddc25847.tar.gz px4-firmware-e5f1a7c2c3a67648829ec0dff5bf290dddc25847.tar.bz2 px4-firmware-e5f1a7c2c3a67648829ec0dff5bf290dddc25847.zip | |
Better transparency in IO mode display, fixes to commander arming, minimum publishing rate for arming
Diffstat (limited to 'src/drivers/px4io/px4io.cpp')
| -rw-r--r-- | src/drivers/px4io/px4io.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/drivers/px4io/px4io.cpp b/src/drivers/px4io/px4io.cpp index 8318238e2..0f90db858 100644 --- a/src/drivers/px4io/px4io.cpp +++ b/src/drivers/px4io/px4io.cpp @@ -1519,8 +1519,8 @@ PX4IO::print_status() uint16_t arming = io_reg_get(PX4IO_PAGE_SETUP, PX4IO_P_SETUP_ARMING); printf("arming 0x%04x%s%s%s%s%s%s\n", arming, - ((arming & PX4IO_P_SETUP_ARMING_FMU_ARMED) ? " FMU_ARMED" : ""), - ((arming & PX4IO_P_SETUP_ARMING_IO_ARM_OK) ? " IO_ARM_OK" : ""), + ((arming & PX4IO_P_SETUP_ARMING_FMU_ARMED) ? " FMU_ARMED" : " FMU_DISARMED"), + ((arming & PX4IO_P_SETUP_ARMING_IO_ARM_OK) ? " IO_ARM_OK" : " IO_ARM_DENIED"), ((arming & PX4IO_P_SETUP_ARMING_MANUAL_OVERRIDE_OK) ? " MANUAL_OVERRIDE_OK" : ""), ((arming & PX4IO_P_SETUP_ARMING_FAILSAFE_CUSTOM) ? " FAILSAFE_CUSTOM" : ""), ((arming & PX4IO_P_SETUP_ARMING_INAIR_RESTART_OK) ? " INAIR_RESTART_OK" : ""), |