fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-07 00:21:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactored debug() and log() in CDev

Browse Source 
These functions used vprintf which is not available on all platforms.
They also do not enable line and file debug output.

Changed to macros that preserve the output format.  Uses new macro that
can be used to implement per object, runtime selectable logging

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
This commit is contained in:
Mark Charlebois
2015-08-11 12:07:06 -07:00
parent be58c6abd3
commit a589d15c52
47 changed files with 202 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/ms5611/ms5611_spi.cpp
+6 -7
View File
@@ -44,7 +44,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <assert.h>
//#include <debug.h>
#include <errno.h>
#include <unistd.h>
@@ -146,21 +145,21 @@ MS5611_SPI::init()
ret = SPI::init();
if (ret != OK) {
debug("SPI init failed");
DEVICE_DEBUG("SPI init failed");
goto out;
}
/* send reset command */
ret = _reset();
if (ret != OK) {
debug("reset failed");
DEVICE_DEBUG("reset failed");
goto out;
}
/* read PROM */
ret = _read_prom();
if (ret != OK) {
debug("prom readout failed");
DEVICE_DEBUG("prom readout failed");
goto out;
}
@@ -251,16 +250,16 @@ MS5611_SPI::_read_prom()
_prom.c[i] = _reg16(cmd);
if (_prom.c[i] != 0)
all_zero = false;
//debug("prom[%u]=0x%x", (unsigned)i, (unsigned)_prom.c[i]);
//DEVICE_DEBUG("prom[%u]=0x%x", (unsigned)i, (unsigned)_prom.c[i]);
}
/* calculate CRC and return success/failure accordingly */
int ret = ms5611::crc4(&_prom.c[0]) ? OK : -EIO;
if (ret != OK) {
debug("crc failed");
DEVICE_DEBUG("crc failed");
}
if (all_zero) {
debug("prom all zero");
DEVICE_DEBUG("prom all zero");
ret = -EIO;
}
return ret;