diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-08-22 10:43:19 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-08-22 10:43:19 +0200 |
| commit | 85eafa323aec397e4ed5c394f25d48ce6d878f9f (patch) | |
| tree | 7ee6faaf1948c861172ff7442b9bfa90b5e899cd | |
| parent | e97c39a125e49e637a309127754c8de0cc3ad7d5 (diff) | |
| download | px4-firmware-85eafa323aec397e4ed5c394f25d48ce6d878f9f.tar.gz px4-firmware-85eafa323aec397e4ed5c394f25d48ce6d878f9f.tar.bz2 px4-firmware-85eafa323aec397e4ed5c394f25d48ce6d878f9f.zip | |
Fix to RC param updates on IO
| -rwxr-xr-x | ROMFS/px4fmu_common/init.d/rcS | 1 | ||||
| -rw-r--r-- | src/modules/px4iofirmware/registers.c | 8 |
2 files changed, 7 insertions, 2 deletions
diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS index 8674c3c04..6b624b278 100755 --- a/ROMFS/px4fmu_common/init.d/rcS +++ b/ROMFS/px4fmu_common/init.d/rcS @@ -187,6 +187,7 @@ if [ $MODE == autostart ] then # Telemetry port is on both FMU boards ttyS1 mavlink start -b 57600 -d /dev/ttyS1 + usleep 5000 # Start commander commander start diff --git a/src/modules/px4iofirmware/registers.c b/src/modules/px4iofirmware/registers.c index 655a0c7a8..9c95fd1c5 100644 --- a/src/modules/px4iofirmware/registers.c +++ b/src/modules/px4iofirmware/registers.c @@ -499,8 +499,12 @@ registers_set_one(uint8_t page, uint8_t offset, uint16_t value) case PX4IO_PAGE_RC_CONFIG: { - /* do not allow a RC config change while outputs armed */ - if ((r_status_flags & PX4IO_P_STATUS_FLAGS_OUTPUTS_ARMED)) { + /** + * do not allow a RC config change while outputs armed + */ + if ((r_status_flags & PX4IO_P_STATUS_FLAGS_SAFETY_OFF) || + (r_status_flags & PX4IO_P_STATUS_FLAGS_OVERRIDE) || + (r_setup_arming & PX4IO_P_SETUP_ARMING_FMU_ARMED)) { break; } |