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

ms5611: give cleaner SPI traces

Browse Source 
this makes logic traces cleaner by zeroing extra bytes written
This commit is contained in:
Andrew Tridgell
2013-12-10 11:01:20 +01:00
committed by Lorenz Meier
parent 264ef47197
commit 3f0f34a4c7
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/ms5611/ms5611_spi.cpp
+8 -6
View File
@@ -167,10 +167,9 @@ MS5611_SPI::read(unsigned offset, void *data, unsigned count)
uint8_t b[4]; uint8_t b[4];
uint32_t w; uint32_t w;
} *cvt = (_cvt *)data; } *cvt = (_cvt *)data;
uint8_t buf[4]; uint8_t buf[4] = { 0 | DIR_WRITE, 0, 0, 0 };
/* read the most recent measurement */ /* read the most recent measurement */
buf[0] = 0 | DIR_WRITE;
int ret = _transfer(&buf[0], &buf[0], sizeof(buf)); int ret = _transfer(&buf[0], &buf[0], sizeof(buf));
if (ret == OK) { if (ret == OK) {
@@ -241,18 +240,21 @@ MS5611_SPI::_read_prom()
for (int i = 0; i < 8; i++) { for (int i = 0; i < 8; i++) {
uint8_t cmd = (ADDR_PROM_SETUP + (i * 2)); uint8_t cmd = (ADDR_PROM_SETUP + (i * 2));
_prom.c[i] = _reg16(cmd); _prom.c[i] = _reg16(cmd);
//debug("prom[%u]=0x%x", (unsigned)i, (unsigned)_prom.c[i]);
} }
/* calculate CRC and return success/failure accordingly */ /* calculate CRC and return success/failure accordingly */
return ms5611::crc4(&_prom.c[0]) ? OK : -EIO; int ret = ms5611::crc4(&_prom.c[0]) ? OK : -EIO;
if (ret != OK) {
debug("crc failed");
}
return ret;
} }
uint16_t uint16_t
MS5611_SPI::_reg16(unsigned reg) MS5611_SPI::_reg16(unsigned reg)
{ {
uint8_t cmd[3]; uint8_t cmd[3] = { (uint8_t)(reg | DIR_READ), 0, 0 };
cmd[0] = reg | DIR_READ;
_transfer(cmd, cmd, sizeof(cmd)); _transfer(cmd, cmd, sizeof(cmd));