fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-31 01:41:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed in-air timout, bumped protocol version

Browse Source
This commit is contained in:
Lorenz Meier
2013-08-17 15:47:13 +02:00
parent 64145252d4
commit 6c45d9cb5c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/px4io/px4io.cpp
+1 -1
View File
@@ -508,7 +508,7 @@ PX4IO::init()
usleep(10000); usleep(10000);
/* abort after 5s */ /* 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."); log("failed to recover from in-air restart (1), aborting IO driver init.");
return 1; return 1;
} }
src/modules/px4iofirmware/protocol.h
+1 -1
View File
@@ -74,7 +74,7 @@
#define REG_TO_FLOAT(_reg) ((float)REG_TO_SIGNED(_reg) / 10000.0f) #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 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 */ /* static configuration page */
#define PX4IO_PAGE_CONFIG 0 #define PX4IO_PAGE_CONFIG 0