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

refactor rm3100: use driver base class

Browse Source
This commit is contained in:
Beat Küng
2020-03-24 09:46:20 -04:00
committed by Daniel Agar
parent 2fa289bbad
commit 00280d55c2
12 changed files with 101 additions and 482 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/magnetometer/rm3100/rm3100_i2c.cpp
+6 -10
View File
@@ -57,14 +57,12 @@
#include "board_config.h"
#include "rm3100.h"
#if defined(PX4_I2C_BUS_ONBOARD) || defined(PX4_I2C_BUS_EXPANSION)
#define RM3100_ADDRESS 0x20
class RM3100_I2C : public device::I2C
{
public:
RM3100_I2C(int bus);
RM3100_I2C(int bus, int bus_frequency);
virtual ~RM3100_I2C() = default;
virtual int init();
@@ -78,16 +76,16 @@ protected:
};
device::Device *
RM3100_I2C_interface(int bus);
RM3100_I2C_interface(int bus, int bus_frequency);
device::Device *
RM3100_I2C_interface(int bus)
RM3100_I2C_interface(int bus, int bus_frequency)
{
return new RM3100_I2C(bus);
return new RM3100_I2C(bus, bus_frequency);
}
RM3100_I2C::RM3100_I2C(int bus) :
I2C("RM300_I2C", nullptr, bus, RM3100_ADDRESS, 400000)
RM3100_I2C::RM3100_I2C(int bus, int bus_frequency) :
I2C("RM300_I2C", nullptr, bus, RM3100_ADDRESS, bus_frequency)
{
_device_id.devid_s.devtype = DRV_MAG_DEVTYPE_RM3100;
}
@@ -170,5 +168,3 @@ RM3100_I2C::write(unsigned address, void *data, unsigned count)
return transfer(&buf[0], count + 1, nullptr, 0);
}
#endif /* PX4_I2C_OBDEV_RM3100 */