diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-02-24 23:05:08 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-02-24 23:05:08 +0100 |
| commit | 1d0431e850bb86c44c90a1e0930c754b076f432a (patch) | |
| tree | 007f8cc8111fb9d01d75874e276eb4500b9f6f44 /apps | |
| parent | 6dd1cfd622f08997147f84076998a452260e0799 (diff) | |
| parent | e818bcbfc2a91b7716ef782d15f2b8bf9f644419 (diff) | |
| download | px4-firmware-1d0431e850bb86c44c90a1e0930c754b076f432a.tar.gz px4-firmware-1d0431e850bb86c44c90a1e0930c754b076f432a.tar.bz2 px4-firmware-1d0431e850bb86c44c90a1e0930c754b076f432a.zip | |
Merge branch 'px4io-i2c-memory-squeeze' of github.com:PX4/Firmware into px4io-i2c-memory-squeeze
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/drivers/px4io/px4io.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/apps/drivers/px4io/px4io.cpp b/apps/drivers/px4io/px4io.cpp index 2f5d4cf89..18350718c 100644 --- a/apps/drivers/px4io/px4io.cpp +++ b/apps/drivers/px4io/px4io.cpp @@ -1211,14 +1211,14 @@ PX4IO::print_status() printf(" %u", io_reg_get(PX4IO_PAGE_SERVOS, i)); printf("\n"); uint16_t raw_inputs = io_reg_get(PX4IO_PAGE_RAW_RC_INPUT, PX4IO_P_RAW_RC_COUNT); - printf("%d R/C inputs", raw_inputs); + printf("%d raw R/C inputs", raw_inputs); for (unsigned i = 0; i < raw_inputs; i++) printf(" %u", io_reg_get(PX4IO_PAGE_RAW_RC_INPUT, PX4IO_P_RAW_RC_BASE + i)); printf("\n"); - uint16_t valid_inputs = io_reg_get(PX4IO_PAGE_RAW_RC_INPUT, PX4IO_P_RC_VALID); - printf("valid R/C inputs 0x%04x", valid_inputs); + uint16_t mapped_inputs = io_reg_get(PX4IO_PAGE_RC_INPUT, PX4IO_P_RC_VALID); + printf("mapped R/C inputs 0x%04x", mapped_inputs); for (unsigned i = 0; i < _max_rc_input; i++) { - if (valid_inputs && (1 << i)) + if (mapped_inputs && (1 << i)) printf(" %u:%u", i, io_reg_get(PX4IO_PAGE_RC_INPUT, PX4IO_P_RC_BASE + i)); } printf("\n"); @@ -1231,11 +1231,12 @@ PX4IO::print_status() /* setup */ printf("features 0x%04x\n", io_reg_get(PX4IO_PAGE_SETUP, PX4IO_P_SETUP_FEATURES)); uint16_t arming = io_reg_get(PX4IO_PAGE_SETUP, PX4IO_P_SETUP_ARMING); - printf("arming 0x%04x%s%s%s\n", - ((arming & PX4IO_P_SETUP_ARMING_ARM_OK) ? "ARM_OK" : ""), - ((arming & PX4IO_P_SETUP_ARMING_MANUAL_OVERRIDE_OK) ? "MANUAL_OVERRIDE_OK" : ""), - ((arming & PX4IO_P_SETUP_ARMING_VECTOR_FLIGHT_OK) ? "VECTOR_FLIGHT_OK" : ""), - ((arming & PX4IO_P_SETUP_ARMING_INAIR_RESTART_OK) ? "INAIR_RESTART_OK" : "")); + printf("arming 0x%04x%s%s%s%s\n", + arming, + ((arming & PX4IO_P_SETUP_ARMING_ARM_OK) ? " ARM_OK" : ""), + ((arming & PX4IO_P_SETUP_ARMING_MANUAL_OVERRIDE_OK) ? " MANUAL_OVERRIDE_OK" : ""), + ((arming & PX4IO_P_SETUP_ARMING_VECTOR_FLIGHT_OK) ? " VECTOR_FLIGHT_OK" : ""), + ((arming & PX4IO_P_SETUP_ARMING_INAIR_RESTART_OK) ? " INAIR_RESTART_OK" : "")); printf("rates 0x%04x lowrate %u highrate %u relays 0x%04x\n", io_reg_get(PX4IO_PAGE_SETUP, PX4IO_P_SETUP_PWM_RATES), io_reg_get(PX4IO_PAGE_SETUP, PX4IO_P_SETUP_PWM_LOWRATE), |