fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-15 18:43:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

MS5611: Fix breakage introduced by failed Qualcomm MS5611 port

Browse Source
This commit is contained in:
Lorenz Meier
2015-10-11 15:43:45 +02:00
parent ad0e1fe2d7
commit 67087c6428
2 changed files with 8 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/ms5611/ms5611_i2c.cpp
+7 -21
View File
@@ -45,7 +45,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <assert.h>
//#include <debug.h>
#include <errno.h>
#include <unistd.h>
@@ -71,20 +70,16 @@ public:
virtual ~MS5611_I2C();
virtual int init();
virtual ssize_t read(device::file_t *handlep, char *data, size_t count);
virtual int ioctl(device::file_t *handlep, int cmd, unsigned long arg);
virtual int read(unsigned offset, void *data, unsigned count);
virtual int ioctl(unsigned operation, unsigned &arg);
#ifdef __PX4_NUTTX
protected:
virtual int probe();
#endif
private:
ms5611::prom_u &_prom;
#ifdef __PX4_NUTTX
int _probe_address(uint8_t address);
#endif
/**
* Send a reset command to the MS5611.
@@ -116,13 +111,7 @@ MS5611_i2c_interface(ms5611::prom_u &prom_buf, uint8_t busnum)
}
MS5611_I2C::MS5611_I2C(uint8_t bus, ms5611::prom_u &prom) :
I2C("MS5611_I2C",
#ifdef __PX4_NUTTX
nullptr, bus, 0, 400000
#else
"/dev/MS5611_I2C", bus, 0
#endif
),
I2C("MS5611_I2C", nullptr, bus, 0, 400000),
_prom(prom)
{
}
@@ -138,8 +127,8 @@ MS5611_I2C::init()
return I2C::init();
}
ssize_t
MS5611_I2C::read(device::file_t *handlep, char *data, size_t buflen)
int
MS5611_I2C::read(unsigned offset, void *data, unsigned count)
{
union _cvt {
uint8_t b[4];
@@ -163,11 +152,11 @@ MS5611_I2C::read(device::file_t *handlep, char *data, size_t buflen)
}
int
MS5611_I2C::ioctl(device::file_t *handlep, int cmd, unsigned long arg)
MS5611_I2C::ioctl(unsigned operation, unsigned &arg)
{
int ret;
switch (cmd) {
switch (operation) {
case IOCTL_RESET:
ret = _reset();
break;
@@ -183,7 +172,6 @@ MS5611_I2C::ioctl(device::file_t *handlep, int cmd, unsigned long arg)
return ret;
}
#ifdef __PX4_NUTTX
int
MS5611_I2C::probe()
{
@@ -220,8 +208,6 @@ MS5611_I2C::_probe_address(uint8_t address)
return PX4_OK;
}
#endif
int
MS5611_I2C::_reset()
src/drivers/ms5611/ms5611_nuttx.cpp
+1 -1
View File
@@ -963,7 +963,7 @@ start(enum MS5611_BUS busid)
continue;
}
started |= start_bus(bus_options[i]);
started = started || start_bus(bus_options[i]);
}
if (!started) {