Raspberries/upm
Public Access
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bmx055: remove bmm150, use new bmm150 library

Browse Source 
Signed-off-by: Jon Trulson <jtrulson@ics.com>
This commit is contained in:
Jon Trulson
2017-03-29 14:09:35 -06:00
parent aeaf84ccc6
commit c014ffddcd
15 changed files with 398 additions and 1718 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/bmx055/bmx055.cxx
View File

@@ -50,16 +50,6 @@ BMX055::BMX055(int accelBus, int accelAddr, int accelCS,
if (magBus >= 0)
m_mag = new BMM150(magBus, magAddr, magCS);
// now initialize them...
if (m_accel)
m_accel->init();
if (m_gyro)
m_gyro->init();
if (m_mag)
m_mag->init();
}
BMX055::~BMX055()
@@ -90,7 +80,7 @@ void BMX055::initGyroscope(BMG160_POWER_MODE_T pwr,
m_gyro->init(pwr, range, bw);
}
void BMX055::initMagnetometer(BMM150::USAGE_PRESETS_T usage)
void BMX055::initMagnetometer(BMM150_USAGE_PRESETS_T usage)
{
if (m_mag)
m_mag->init(usage);
@@ -169,13 +159,10 @@ void BMX055::getMagnetometer(float *x, float *y, float *z)
}
}
float *BMX055::getMagnetometer()
std::vector<float> BMX055::getMagnetometer()
{
if (m_mag)
return m_mag->getMagnetometer();
else
{
static float v[3] = {0.0f, 0.0f, 0.0f};
return v;
}
return {0, 0, 0};
}