diff options
author | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-26 12:31:27 +0100 |
---|---|---|
committer | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-26 12:35:05 +0100 |
commit | 0ac294db170c5e929d61fc5e2e3f4ae3dbc562d1 (patch) | |
tree | 69974721878110113c52eecb834b6e0d44b2429f /ROMFS | |
parent | ecc44c263c76fee88e0c2c3137f1b02c97ba76be (diff) | |
parent | b1b1ad9393add9294d800e533b0b6201c3b70aa5 (diff) | |
download | px4-firmware-0ac294db170c5e929d61fc5e2e3f4ae3dbc562d1.tar.gz px4-firmware-0ac294db170c5e929d61fc5e2e3f4ae3dbc562d1.tar.bz2 px4-firmware-0ac294db170c5e929d61fc5e2e3f4ae3dbc562d1.zip |
Merge remote-tracking branch 'upstream/nuttx_bringup' into ros_messagelayer_merge_attctl_stdbind_nuttx_bringup
Conflicts:
NuttX
makefiles/config_px4fmu-v2_default.mk
Diffstat (limited to 'ROMFS')
-rw-r--r-- | ROMFS/px4fmu_common/init.d/rcS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS index 2c9387ff0..043e0bc17 100644 --- a/ROMFS/px4fmu_common/init.d/rcS +++ b/ROMFS/px4fmu_common/init.d/rcS @@ -214,7 +214,7 @@ then if px4io forceupdate 14662 $IO_FILE then - usleep 500000 + usleep 10000 if px4io checkcrc $IO_FILE then echo "PX4IO CRC OK after updating" >> $LOG_FILE |