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

deprecate df_bmp280_wrapper and replace with in tree bmp280

Browse Source 
- deprecate DriverFramework bmp280 driver (df_bmp280_wrapper)
 - update beaglebone blue and snapdragon flight eagle boards to use in tree bmp280
 - update posix (really just linux) and qurt I2C wrappers
 - tested on beaglebone blue
This commit is contained in:
Daniel Agar
2020-01-05 13:33:12 -05:00
committed by GitHub
parent 1da7209fe1
commit aaf5670e7d
37 changed files with 227 additions and 777 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/drivers/device/posix/I2C.cpp
+11 -15
View File
@@ -1,6 +1,6 @@
/****************************************************************************
*
* Copyright (c) 2012-2019 PX4 Development Team. All rights reserved.
* Copyright (c) 2016-2020 PX4 Development Team. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -32,7 +32,7 @@
****************************************************************************/
/**
* @file i2c.cpp
* @file I2C.cpp
*
* Base class for devices attached via the I2C bus.
*
@@ -109,6 +109,7 @@ out:
if ((ret != OK) && !(_fd < 0)) {
::close(_fd);
_fd = -1;
}
return ret;
@@ -117,19 +118,19 @@ out:
int
I2C::transfer(const uint8_t *send, const unsigned send_len, uint8_t *recv, const unsigned recv_len)
{
struct i2c_msg msgv[2];
unsigned msgs;
int ret = PX4_ERROR;
unsigned retry_count = 0;
if (_fd < 0) {
PX4_ERR("I2C device not opened");
return 1;
return PX4_ERROR;
}
do {
DEVICE_DEBUG("transfer out %p/%u in %p/%u", send, send_len, recv, recv_len);
msgs = 0;
unsigned msgs = 0;
struct i2c_msg msgv[2] {};
if (send_len > 0) {
msgv[msgs].addr = get_device_address();
@@ -151,24 +152,19 @@ I2C::transfer(const uint8_t *send, const unsigned send_len, uint8_t *recv, const
return -EINVAL;
}
struct i2c_rdwr_ioctl_data packets;
i2c_rdwr_ioctl_data packets{};
packets.msgs = msgv;
packets.nmsgs = msgs;
ret = ::ioctl(_fd, I2C_RDWR, (unsigned long)&packets);
int ret_ioctl = ::ioctl(_fd, I2C_RDWR, (unsigned long)&packets);
if (ret == -1) {
if (ret_ioctl == -1) {
DEVICE_DEBUG("I2C transfer failed");
ret = PX4_ERROR;
} else {
// success
ret = PX4_OK;
}
/* success */
if (ret == PX4_OK) {
break;
}
src/lib/drivers/device/posix/I2C.hpp
+2 -7
View File
@@ -1,6 +1,6 @@
/****************************************************************************
*
* Copyright (C) 2012 PX4 Development Team. All rights reserved.
* Copyright (C) 2016-2020 PX4 Development Team. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -32,7 +32,7 @@
****************************************************************************/
/**
* @file i2c.h
* @file I2C.hpp
*
* Base class for devices connected via I2C.
*/
@@ -44,11 +44,6 @@
#include <px4_platform_common/i2c.h>
#ifdef __PX4_LINUX
#include <linux/i2c.h>
#include <linux/i2c-dev.h>
#endif
namespace device __EXPORT
{