diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-08-17 15:47:13 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-08-17 15:47:13 +0200 |
| commit | 6c45d9cb5cc4e9efb99aff84a1fe10f084a998c9 (patch) | |
| tree | 7ddfee6736e00198d7b551af027870f5f5a76896 /src | |
| parent | 64145252d4133b6df36229f548d02a692c3ec6fb (diff) | |
| download | px4-firmware-6c45d9cb5cc4e9efb99aff84a1fe10f084a998c9.tar.gz px4-firmware-6c45d9cb5cc4e9efb99aff84a1fe10f084a998c9.tar.bz2 px4-firmware-6c45d9cb5cc4e9efb99aff84a1fe10f084a998c9.zip | |
Fixed in-air timout, bumped protocol version
Diffstat (limited to 'src')
| -rw-r--r-- | src/drivers/px4io/px4io.cpp | 2 | ||||
| -rw-r--r-- | src/modules/px4iofirmware/protocol.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/drivers/px4io/px4io.cpp b/src/drivers/px4io/px4io.cpp index 3aecd9b69..045b3ebcb 100644 --- a/src/drivers/px4io/px4io.cpp +++ b/src/drivers/px4io/px4io.cpp @@ -508,7 +508,7 @@ PX4IO::init() usleep(10000); /* abort after 5s */ - if ((hrt_absolute_time() - try_start_time)/1000 > 50000) { + if ((hrt_absolute_time() - try_start_time)/1000 > 3000) { log("failed to recover from in-air restart (1), aborting IO driver init."); return 1; } diff --git a/src/modules/px4iofirmware/protocol.h b/src/modules/px4iofirmware/protocol.h index 02df76068..97809d9c2 100644 --- a/src/modules/px4iofirmware/protocol.h +++ b/src/modules/px4iofirmware/protocol.h @@ -74,7 +74,7 @@ #define REG_TO_FLOAT(_reg) ((float)REG_TO_SIGNED(_reg) / 10000.0f) #define FLOAT_TO_REG(_float) SIGNED_TO_REG((int16_t)((_float) * 10000.0f)) -#define PX4IO_PROTOCOL_VERSION 2 +#define PX4IO_PROTOCOL_VERSION 3 /* static configuration page */ #define PX4IO_PAGE_CONFIG 0 |