diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2013-03-09 13:20:05 +0100 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-03-09 13:20:05 +0100 |
commit | 74bcf29c698ee9b6f8a7859d59c28f4a69a54e02 (patch) | |
tree | 6cdb1b2e071807089c5b11bb5dc5860d632c17ad /apps/px4io/registers.c | |
parent | 5335de4cc71aa283366b683d169e8f90af78569d (diff) | |
download | px4-firmware-74bcf29c698ee9b6f8a7859d59c28f4a69a54e02.tar.gz px4-firmware-74bcf29c698ee9b6f8a7859d59c28f4a69a54e02.tar.bz2 px4-firmware-74bcf29c698ee9b6f8a7859d59c28f4a69a54e02.zip |
Refactored debug level into proper register, px4io status now correctly reads it. Added more of the missing alarms clear logic, alarms reporting now consistent. Adding missing sign change on mode switch, fixes override issue when attempting to switch to auto mode. Pending outdoor tests
Diffstat (limited to 'apps/px4io/registers.c')
-rw-r--r-- | apps/px4io/registers.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/apps/px4io/registers.c b/apps/px4io/registers.c index 511a47f8d..645c1565d 100644 --- a/apps/px4io/registers.c +++ b/apps/px4io/registers.c @@ -137,7 +137,8 @@ volatile uint16_t r_page_setup[] = [PX4IO_P_SETUP_RELAYS] = 0, [PX4IO_P_SETUP_VBATT_SCALE] = 10000, [PX4IO_P_SETUP_IBATT_SCALE] = 0, - [PX4IO_P_SETUP_IBATT_BIAS] = 0 + [PX4IO_P_SETUP_IBATT_BIAS] = 0, + [PX4IO_P_SETUP_SET_DEBUG] = 0, }; #define PX4IO_P_SETUP_FEATURES_VALID (0) @@ -201,6 +202,7 @@ registers_set(uint8_t page, uint8_t offset, const uint16_t *values, unsigned num system_state.fmu_data_received_time = hrt_absolute_time(); r_status_flags |= PX4IO_P_STATUS_FLAGS_FMU_OK; + r_status_alarms &= ~PX4IO_P_STATUS_ALARMS_FMU_LOST; r_status_flags &= ~PX4IO_P_STATUS_FLAGS_RAW_PWM; break; @@ -351,8 +353,8 @@ registers_set_one(uint8_t page, uint8_t offset, uint16_t value) break; case PX4IO_P_SETUP_SET_DEBUG: - debug_level = value; - isr_debug(0, "set debug %u\n", (unsigned)debug_level); + r_page_setup[PX4IO_P_SETUP_SET_DEBUG] = value; + isr_debug(0, "set debug %u\n", (unsigned)r_page_setup[PX4IO_P_SETUP_SET_DEBUG]); break; default: |