diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-09-08 21:50:14 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-09-08 21:50:14 +0200 |
| commit | 8bd018c5611dddd914fd108965526945b31d5944 (patch) | |
| tree | edb065e1a3c64075bbfcb03c5810da72f307748b /src/drivers | |
| parent | 11e4fbc3745193a61f6f56619318dc1bc0b60307 (diff) | |
| parent | d3ac8c9ff31ac609d555613e552b38782a2b2490 (diff) | |
| download | px4-firmware-8bd018c5611dddd914fd108965526945b31d5944.tar.gz px4-firmware-8bd018c5611dddd914fd108965526945b31d5944.tar.bz2 px4-firmware-8bd018c5611dddd914fd108965526945b31d5944.zip | |
Merge branch 'fixedwing_l1' of github.com:PX4/Firmware into fixedwing_l1
Diffstat (limited to 'src/drivers')
| -rw-r--r-- | src/drivers/px4io/px4io.cpp | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/src/drivers/px4io/px4io.cpp b/src/drivers/px4io/px4io.cpp index c88abe59a..78d1d3e63 100644 --- a/src/drivers/px4io/px4io.cpp +++ b/src/drivers/px4io/px4io.cpp @@ -487,25 +487,27 @@ PX4IO::detect() { int ret; - ASSERT(_task == -1); + if (_task == -1) { - /* do regular cdev init */ - ret = CDev::init(); - if (ret != OK) - return ret; + /* do regular cdev init */ + ret = CDev::init(); + if (ret != OK) + return ret; - /* get some parameters */ - unsigned protocol = io_reg_get(PX4IO_PAGE_CONFIG, PX4IO_P_CONFIG_PROTOCOL_VERSION); - if (protocol != PX4IO_PROTOCOL_VERSION) { - if (protocol == _io_reg_get_error) { - log("IO not installed"); - } else { - log("IO version error"); - mavlink_log_emergency(_mavlink_fd, "IO VERSION MISMATCH, PLEASE UPGRADE SOFTWARE!"); + /* get some parameters */ + unsigned protocol = io_reg_get(PX4IO_PAGE_CONFIG, PX4IO_P_CONFIG_PROTOCOL_VERSION); + if (protocol != PX4IO_PROTOCOL_VERSION) { + if (protocol == _io_reg_get_error) { + log("IO not installed"); + } else { + log("IO version error"); + mavlink_log_emergency(_mavlink_fd, "IO VERSION MISMATCH, PLEASE UPGRADE SOFTWARE!"); + } + + return -1; } - - return -1; } + log("IO found"); return 0; |